Introduce HTMLParserOptions to encapsulate HTML parser options
authorabarth@webkit.org <abarth@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 8 Jan 2013 00:20:20 +0000 (00:20 +0000)
committerabarth@webkit.org <abarth@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 8 Jan 2013 00:20:20 +0000 (00:20 +0000)
https://bugs.webkit.org/show_bug.cgi?id=106251

Reviewed by Eric Seidel.

Currently, the HTMLTreeBuilder (and potentially other parts of the
parser) use their Document* to read configuration information from the
Document (such as Settings). This patch introduces the
HTMLParserOptions class to encapsulate that information, making it
easier to move the HTML parser to a background thread (because the
HTMLTreeBuilder won't need to talk to the Document directly).

* CMakeLists.txt:
* GNUmakefile.list.am:
* Target.pri:
* WebCore.gypi:
* WebCore.vcproj/WebCore.vcproj:
* html/parser/HTMLDocumentParser.cpp:
(WebCore::HTMLDocumentParser::HTMLDocumentParser):
(WebCore::HTMLDocumentParser::pumpTokenizer):
(WebCore::HTMLDocumentParser::insert):
* html/parser/HTMLDocumentParser.h:
(HTMLDocumentParser):
* html/parser/HTMLPreloadScanner.cpp:
(WebCore::HTMLPreloadScanner::HTMLPreloadScanner):
* html/parser/HTMLPreloadScanner.h:
(WebCore):
(HTMLPreloadScanner):
* html/parser/HTMLTreeBuilder.cpp:
(WebCore::HTMLTreeBuilder::HTMLTreeBuilder):
(WebCore::HTMLTreeBuilder::processEndTag):
(WebCore::HTMLTreeBuilder::processStartTagForInHead):
* html/parser/HTMLTreeBuilder.h:
(WebCore::HTMLTreeBuilder::create):
(HTMLTreeBuilder):
* html/parser/HTMLViewSourceParser.cpp:
(WebCore::HTMLViewSourceParser::HTMLViewSourceParser):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@139008 268f45cc-cd09-0410-ab3c-d52691b4dbfc

16 files changed:
Source/WebCore/CMakeLists.txt
Source/WebCore/ChangeLog
Source/WebCore/GNUmakefile.list.am
Source/WebCore/Target.pri
Source/WebCore/WebCore.gypi
Source/WebCore/WebCore.vcproj/WebCore.vcproj
Source/WebCore/WebCore.xcodeproj/project.pbxproj
Source/WebCore/html/parser/HTMLDocumentParser.cpp
Source/WebCore/html/parser/HTMLDocumentParser.h
Source/WebCore/html/parser/HTMLParserOptions.cpp [new file with mode: 0644]
Source/WebCore/html/parser/HTMLParserOptions.h [new file with mode: 0644]
Source/WebCore/html/parser/HTMLPreloadScanner.cpp
Source/WebCore/html/parser/HTMLPreloadScanner.h
Source/WebCore/html/parser/HTMLTreeBuilder.cpp
Source/WebCore/html/parser/HTMLTreeBuilder.h
Source/WebCore/html/parser/HTMLViewSourceParser.cpp

index af33fa0..8e64a3f 100644 (file)
@@ -1528,6 +1528,7 @@ set(WebCore_SOURCES
     html/parser/HTMLEntityParser.cpp
     html/parser/HTMLEntitySearch.cpp
     html/parser/HTMLParserIdioms.cpp
+    html/parser/HTMLParserOptions.cpp
     html/parser/HTMLParserScheduler.cpp
     html/parser/HTMLFormattingElementList.cpp
     html/parser/HTMLMetaCharsetParser.cpp
index 1b3f094..bb83005 100644 (file)
@@ -1,3 +1,43 @@
+2013-01-07  Adam Barth  <abarth@webkit.org>
+
+        Introduce HTMLParserOptions to encapsulate HTML parser options
+        https://bugs.webkit.org/show_bug.cgi?id=106251
+
+        Reviewed by Eric Seidel.
+
+        Currently, the HTMLTreeBuilder (and potentially other parts of the
+        parser) use their Document* to read configuration information from the
+        Document (such as Settings). This patch introduces the
+        HTMLParserOptions class to encapsulate that information, making it
+        easier to move the HTML parser to a background thread (because the
+        HTMLTreeBuilder won't need to talk to the Document directly).
+
+        * CMakeLists.txt:
+        * GNUmakefile.list.am:
+        * Target.pri:
+        * WebCore.gypi:
+        * WebCore.vcproj/WebCore.vcproj:
+        * html/parser/HTMLDocumentParser.cpp:
+        (WebCore::HTMLDocumentParser::HTMLDocumentParser):
+        (WebCore::HTMLDocumentParser::pumpTokenizer):
+        (WebCore::HTMLDocumentParser::insert):
+        * html/parser/HTMLDocumentParser.h:
+        (HTMLDocumentParser):
+        * html/parser/HTMLPreloadScanner.cpp:
+        (WebCore::HTMLPreloadScanner::HTMLPreloadScanner):
+        * html/parser/HTMLPreloadScanner.h:
+        (WebCore):
+        (HTMLPreloadScanner):
+        * html/parser/HTMLTreeBuilder.cpp:
+        (WebCore::HTMLTreeBuilder::HTMLTreeBuilder):
+        (WebCore::HTMLTreeBuilder::processEndTag):
+        (WebCore::HTMLTreeBuilder::processStartTagForInHead):
+        * html/parser/HTMLTreeBuilder.h:
+        (WebCore::HTMLTreeBuilder::create):
+        (HTMLTreeBuilder):
+        * html/parser/HTMLViewSourceParser.cpp:
+        (WebCore::HTMLViewSourceParser::HTMLViewSourceParser):
+
 2013-01-07  Joseph Pecoraro  <pecoraro@apple.com>
 
         Minor improvements to HTMLMediaElement
index d76de80..016b9b6 100644 (file)
@@ -3534,6 +3534,8 @@ webcore_sources += \
        Source/WebCore/html/parser/HTMLMetaCharsetParser.h \
        Source/WebCore/html/parser/HTMLParserIdioms.cpp \
        Source/WebCore/html/parser/HTMLParserIdioms.h \
+       Source/WebCore/html/parser/HTMLParserOptions.cpp \
+       Source/WebCore/html/parser/HTMLParserOptions.h \
        Source/WebCore/html/parser/HTMLParserScheduler.cpp \
        Source/WebCore/html/parser/HTMLParserScheduler.h \
        Source/WebCore/html/parser/HTMLPreloadScanner.cpp \
index f064c06..b456e57 100644 (file)
@@ -710,6 +710,7 @@ SOURCES += \
     html/parser/HTMLFormattingElementList.cpp \
     html/parser/HTMLMetaCharsetParser.cpp \
     html/parser/HTMLParserIdioms.cpp \
+    html/parser/HTMLParserOptions.cpp \
     html/parser/HTMLParserScheduler.cpp \
     html/parser/HTMLPreloadScanner.cpp \
     html/parser/HTMLScriptRunner.cpp \
index 51fbd77..86f8620 100644 (file)
             'html/parser/HTMLMetaCharsetParser.cpp',
             'html/parser/HTMLMetaCharsetParser.h',
             'html/parser/HTMLParserIdioms.cpp',
+            'html/parser/HTMLParserOptions.cpp',
+            'html/parser/HTMLParserOptions.h',
             'html/parser/HTMLParserScheduler.cpp',
             'html/parser/HTMLParserScheduler.h',
             'html/parser/HTMLPreloadScanner.cpp',
index 2b068df..5b9dccf 100755 (executable)
                                        >
                                </File>
                                <File
+                                       RelativePath="..\html\parser\HTMLParserOptions.cpp"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\html\parser\HTMLParserOptions.h"
+                                       >
+                               </File>
+                               <File
                                        RelativePath="..\html\parser\HTMLParserScheduler.cpp"
                                        >
                                </File>
index 2b74c51..3041ca5 100644 (file)
                973DC640145A9409002842C2 /* ExceptionCodeDescription.h in Headers */ = {isa = PBXBuildFile; fileRef = 973DC63E145A9409002842C2 /* ExceptionCodeDescription.h */; settings = {ATTRIBUTES = (Private, ); }; };
                973E325610883B7C005BC493 /* ResourceLoadNotifier.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 973E325410883B7C005BC493 /* ResourceLoadNotifier.cpp */; };
                973E325710883B7C005BC493 /* ResourceLoadNotifier.h in Headers */ = {isa = PBXBuildFile; fileRef = 973E325510883B7C005BC493 /* ResourceLoadNotifier.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               973F418A169B95FF0006BF60 /* HTMLParserOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = 973F4188169B95EF0006BF60 /* HTMLParserOptions.h */; };
+               973F418B169B96030006BF60 /* HTMLParserOptions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 973F4187169B95EF0006BF60 /* HTMLParserOptions.cpp */; };
                9746AF2314F4DDE6003E7A70 /* Geolocation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9746AF1314F4DDE6003E7A70 /* Geolocation.cpp */; };
                9746AF2414F4DDE6003E7A70 /* Geolocation.h in Headers */ = {isa = PBXBuildFile; fileRef = 9746AF1414F4DDE6003E7A70 /* Geolocation.h */; settings = {ATTRIBUTES = (Private, ); }; };
                9746AF2614F4DDE6003E7A70 /* GeolocationController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9746AF1614F4DDE6003E7A70 /* GeolocationController.cpp */; };
                A73F95FF12C97BFE0031AAF9 /* RoundedRect.h in Headers */ = {isa = PBXBuildFile; fileRef = A73F95FD12C97BFE0031AAF9 /* RoundedRect.h */; settings = {ATTRIBUTES = (Private, ); }; };
                A740B59514C935AB00A77FA4 /* JSMallocStatistics.h in Headers */ = {isa = PBXBuildFile; fileRef = A7B4EA6914C9348400C8F5BF /* JSMallocStatistics.h */; };
                A740B59714C935AF00A77FA4 /* JSMallocStatistics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A7B4EA6814C9348400C8F5BF /* JSMallocStatistics.cpp */; };
-               EBF5121D1696496C0056BD25 /* JSTypeConversions.h in Headers */ = {isa = PBXBuildFile; fileRef = EBF5121B1696496C0056BD25 /* JSTypeConversions.h */; };
-               EBF5121C1696496C0056BD25 /* JSTypeConversions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EBF5121A1696496C0056BD25 /* JSTypeConversions.cpp */; };
                A740B5A514C935AB00A77FA4 /* JSInternalSettings.h in Headers */ = {isa = PBXBuildFile; fileRef = A7B4EA7914C9348400C8F5BF /* JSInternalSettings.h */; };
                A740B5A714C935AF00A77FA4 /* JSInternalSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A7B4EA7814C9348400C8F5BF /* JSInternalSettings.cpp */; };
                A74BB76B13BDA86300FF7BF0 /* ExceptionCodePlaceholder.h in Headers */ = {isa = PBXBuildFile; fileRef = A74BB76A13BDA86300FF7BF0 /* ExceptionCodePlaceholder.h */; settings = {ATTRIBUTES = (Private, ); }; };
                E4F9EEF3156DA00700D23E7E /* StyleSheetContents.h in Headers */ = {isa = PBXBuildFile; fileRef = E4F9EEF1156D84C400D23E7E /* StyleSheetContents.h */; };
                E55F497A151B888000BB67DB /* LengthFunctions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E55F4979151B888000BB67DB /* LengthFunctions.cpp */; };
                E5BA7D63151437CA00FE1E3F /* LengthFunctions.h in Headers */ = {isa = PBXBuildFile; fileRef = E5BA7D62151437CA00FE1E3F /* LengthFunctions.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               EBF5121C1696496C0056BD25 /* JSTypeConversions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EBF5121A1696496C0056BD25 /* JSTypeConversions.cpp */; };
+               EBF5121D1696496C0056BD25 /* JSTypeConversions.h in Headers */ = {isa = PBXBuildFile; fileRef = EBF5121B1696496C0056BD25 /* JSTypeConversions.h */; };
                ED2BA83C09A24B91006C0AC4 /* DocumentMarker.h in Headers */ = {isa = PBXBuildFile; fileRef = ED2BA83B09A24B91006C0AC4 /* DocumentMarker.h */; settings = {ATTRIBUTES = (Private, ); }; };
                ED501DC60B249F2900AE18D9 /* EditorMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = ED501DC50B249F2900AE18D9 /* EditorMac.mm */; };
                EDE3A5000C7A430600956A37 /* ColorMac.h in Headers */ = {isa = PBXBuildFile; fileRef = EDE3A4FF0C7A430600956A37 /* ColorMac.h */; settings = {ATTRIBUTES = (Private, ); }; };
                        dstPath = Versions/A/PrivateHeaders;
                        dstSubfolderSpec = 1;
                        files = (
-                               53EF766C16531994004CBE49 /* SettingsMacros.h in Copy Generated Headers */,
                                5DF7F5C20F01F92A00526B4B /* CSSPropertyNames.h in Copy Generated Headers */,
                                8538F0300AD71CDB006A81D1 /* DOMAbstractView.h in Copy Generated Headers */,
                                1C11CCBC0AA6093700DADB20 /* DOMAttr.h in Copy Generated Headers */,
                                A8D06B390A265DCD005E7203 /* HTMLNames.h in Copy Generated Headers */,
                                1403BA0F09EB18F900797C7F /* JSDOMWindow.h in Copy Generated Headers */,
                                14DC0D3809FED073007B0235 /* JSNode.h in Copy Generated Headers */,
+                               53EF766C16531994004CBE49 /* SettingsMacros.h in Copy Generated Headers */,
                                08C7A2C710DC7462002D368B /* SVGNames.h in Copy Generated Headers */,
                                1A1414B613A0F0500019996C /* WebKitFontFamilyNames.h in Copy Generated Headers */,
                        );
                973DC63E145A9409002842C2 /* ExceptionCodeDescription.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ExceptionCodeDescription.h; sourceTree = "<group>"; };
                973E325410883B7C005BC493 /* ResourceLoadNotifier.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ResourceLoadNotifier.cpp; sourceTree = "<group>"; };
                973E325510883B7C005BC493 /* ResourceLoadNotifier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ResourceLoadNotifier.h; sourceTree = "<group>"; };
+               973F4187169B95EF0006BF60 /* HTMLParserOptions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = HTMLParserOptions.cpp; path = parser/HTMLParserOptions.cpp; sourceTree = "<group>"; };
+               973F4188169B95EF0006BF60 /* HTMLParserOptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HTMLParserOptions.h; path = parser/HTMLParserOptions.h; sourceTree = "<group>"; };
                9746AF1314F4DDE6003E7A70 /* Geolocation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Geolocation.cpp; path = Modules/geolocation/Geolocation.cpp; sourceTree = "<group>"; };
                9746AF1414F4DDE6003E7A70 /* Geolocation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Geolocation.h; path = Modules/geolocation/Geolocation.h; sourceTree = "<group>"; };
                9746AF1514F4DDE6003E7A70 /* Geolocation.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Geolocation.idl; path = Modules/geolocation/Geolocation.idl; sourceTree = "<group>"; };
                A7B070D1130A409C00A3763C /* FrameActionScheduler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FrameActionScheduler.h; sourceTree = "<group>"; };
                A7B4EA6814C9348400C8F5BF /* JSMallocStatistics.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSMallocStatistics.cpp; sourceTree = "<group>"; };
                A7B4EA6914C9348400C8F5BF /* JSMallocStatistics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSMallocStatistics.h; sourceTree = "<group>"; };
-               EBF5121A1696496C0056BD25 /* JSTypeConversions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSTypeConversions.cpp; sourceTree = "<group>"; };
-               EBF5121B1696496C0056BD25 /* JSTypeConversions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSTypeConversions.h; sourceTree = "<group>"; };
                A7B4EA7814C9348400C8F5BF /* JSInternalSettings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSInternalSettings.cpp; sourceTree = "<group>"; };
                A7B4EA7914C9348400C8F5BF /* JSInternalSettings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSInternalSettings.h; sourceTree = "<group>"; };
                A7B6E69D0B291A9600D0529F /* DragData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DragData.h; sourceTree = "<group>"; };
                E5BA7D62151437CA00FE1E3F /* LengthFunctions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LengthFunctions.h; sourceTree = "<group>"; };
                EB081CD81696084400553730 /* TypeConversions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TypeConversions.h; sourceTree = "<group>"; };
                EB081CD91696084400553730 /* TypeConversions.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = TypeConversions.idl; sourceTree = "<group>"; };
+               EBF5121A1696496C0056BD25 /* JSTypeConversions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSTypeConversions.cpp; sourceTree = "<group>"; };
+               EBF5121B1696496C0056BD25 /* JSTypeConversions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSTypeConversions.h; sourceTree = "<group>"; };
                ED2BA83B09A24B91006C0AC4 /* DocumentMarker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DocumentMarker.h; sourceTree = "<group>"; };
                ED501DC50B249F2900AE18D9 /* EditorMac.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; name = EditorMac.mm; path = mac/EditorMac.mm; sourceTree = "<group>"; };
                EDE3A4FF0C7A430600956A37 /* ColorMac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ColorMac.h; sourceTree = "<group>"; };
                076F0D0812B8192700C26AA4 /* avfoundation */ = {
                        isa = PBXGroup;
                        children = (
+                               DF9AFD6F13FC31B00015FEB7 /* objc */,
                                07B442D4166C70B000556CAD /* InbandTextTrackPrivateAVF.cpp */,
                                07B442D5166C70B000556CAD /* InbandTextTrackPrivateAVF.h */,
-                               DF9AFD6F13FC31B00015FEB7 /* objc */,
                                076F0D0912B8192700C26AA4 /* MediaPlayerPrivateAVFoundation.cpp */,
                                076F0D0A12B8192700C26AA4 /* MediaPlayerPrivateAVFoundation.h */,
                        );
                                AA73183C159255B900A93E6E /* InjectedScriptCanvasModule.cpp */,
                                AA73183D159255B900A93E6E /* InjectedScriptCanvasModule.h */,
                                AA9030FE157E16A000276247 /* InjectedScriptCanvasModuleSource.js */,
-                               71B1E123164048CC00B1880A /* InspectorLayerTreeAgent.cpp */,
-                               71B1E124164048CC00B1880A /* InspectorLayerTreeAgent.h */,
                                7A0E76F610BF08ED00A0276E /* InjectedScriptHost.cpp */,
                                7A0E76F710BF08ED00A0276E /* InjectedScriptHost.h */,
                                7A0E76F810BF08ED00A0276E /* InjectedScriptHost.idl */,
                                4D273CF81669420800259CA1 /* InspectorInputAgent.h */,
                                20D629241253690B00081543 /* InspectorInstrumentation.cpp */,
                                20D629251253690B00081543 /* InspectorInstrumentation.h */,
+                               71B1E123164048CC00B1880A /* InspectorLayerTreeAgent.cpp */,
+                               71B1E124164048CC00B1880A /* InspectorLayerTreeAgent.h */,
                                7AA51DD3148506A900AD2752 /* InspectorMemoryAgent.cpp */,
                                7AA51DD4148506A900AD2752 /* InspectorMemoryAgent.h */,
                                7C522D4915B477E8009B7C95 /* InspectorOverlay.cpp */,
                                572145CC15A51DA700AD119C /* ImageInnerElement.h */,
                                57CF497214EE36D700ECFF14 /* InsertionPoint.cpp */,
                                57CF497314EE36D700ECFF14 /* InsertionPoint.h */,
-                               DE49B2FF165F2FC60010338D /* MediaControlElementTypes.cpp */,
-                               DE49B300165F2FC60010338D /* MediaControlElementTypes.h */,
                                417253A81354BBBC00360F2A /* MediaControlElements.cpp */,
                                417253A91354BBBC00360F2A /* MediaControlElements.h */,
-                               4157AF7F12F1FB0400A8C6F5 /* MediaControlsApple.cpp */,
-                               4157AF7E12F1FB0400A8C6F5 /* MediaControlsApple.h */,
+                               DE49B2FF165F2FC60010338D /* MediaControlElementTypes.cpp */,
+                               DE49B300165F2FC60010338D /* MediaControlElementTypes.h */,
                                1F3C3BE8135CAF3C00B8C1AC /* MediaControls.cpp */,
                                1F3C3BE9135CAF3C00B8C1AC /* MediaControls.h */,
+                               4157AF7F12F1FB0400A8C6F5 /* MediaControlsApple.cpp */,
+                               4157AF7E12F1FB0400A8C6F5 /* MediaControlsApple.h */,
                                A78E526D1346BD1700AD9C31 /* MeterShadowElement.cpp */,
                                A78E526E1346BD1700AD9C31 /* MeterShadowElement.h */,
                                A715E650134BBBEC00D8E713 /* ProgressShadowElement.cpp */,
                        isa = PBXGroup;
                        children = (
                                2917B565147349950052C9D0 /* LayerFlushSchedulerMac.cpp */,
+                               93F72AF11666EDFC002A02BD /* LayerPool.h */,
+                               93F72AF21666EDFC002A02BD /* LayerPool.mm */,
                                4958781F12A57DDF007238AC /* PlatformCAAnimationMac.mm */,
                                4958782012A57DDF007238AC /* PlatformCALayerMac.mm */,
                                1AA71609149BC4DB0016EC19 /* TileCache.h */,
                                1AA71608149BC4DA0016EC19 /* TileCache.mm */,
-                               93F72AF11666EDFC002A02BD /* LayerPool.h */,
-                               93F72AF21666EDFC002A02BD /* LayerPool.mm */,
                                0F580FA11496939100FB5BD8 /* WebTileCacheLayer.h */,
                                0F580FA21496939100FB5BD8 /* WebTileCacheLayer.mm */,
                                1AA71625149BFFB20016EC19 /* WebTileLayer.h */,
                                37DDCD9213844FD50008B793 /* MIMEHeader.cpp */,
                                37DDCD9313844FD50008B793 /* MIMEHeader.h */,
                                628D214B12131ED10055DCFC /* NetworkingContext.h */,
-                               E13EF3421684ECF40034C83F /* NetworkStorageSession.h */,
                                1A7FA61A0DDA3BBE0028F8A5 /* NetworkStateNotifier.cpp */,
                                1A7FA6180DDA3B3A0028F8A5 /* NetworkStateNotifier.h */,
+                               E13EF3421684ECF40034C83F /* NetworkStorageSession.h */,
                                447958021643B47B001E0A7F /* ParsedContentType.cpp */,
                                447958031643B47B001E0A7F /* ParsedContentType.h */,
                                514C765F0CE923A1007EF3CD /* ProtectionSpace.cpp */,
                        children = (
                                514C76420CE9234E007EF3CD /* AuthenticationMac.h */,
                                514C76430CE9234E007EF3CD /* AuthenticationMac.mm */,
+                               E1424C8F164B460B00F32D40 /* CookieJarMac.mm */,
                                E13F01F01270E19000DFBA71 /* CookieStorageMac.mm */,
                                E1B4CD2410B322E200BFFD7E /* CredentialStorageMac.mm */,
                                514C76440CE9234E007EF3CD /* FormDataStreamMac.h */,
                                514C76450CE9234E007EF3CD /* FormDataStreamMac.mm */,
                                1A7FA6470DDA3CBA0028F8A5 /* NetworkStateNotifierMac.cpp */,
-                               E1424C8F164B460B00F32D40 /* CookieJarMac.mm */,
                                514C76460CE9234E007EF3CD /* ResourceErrorMac.mm */,
                                514C76470CE9234E007EF3CD /* ResourceHandleMac.mm */,
                                514C76490CE9234E007EF3CD /* ResourceRequestMac.mm */,
                                A8CFF7980A156978000A4234 /* HTMLFontElement.cpp */,
                                A8CFF79C0A156978000A4234 /* HTMLFontElement.h */,
                                1AE2A9F50A1CDA5700B42B25 /* HTMLFontElement.idl */,
-                               A8DF3FC7097FA0FB0052981B /* HTMLFormControlsCollection.cpp */,
-                               A8DF3FC6097FA0FB0052981B /* HTMLFormControlsCollection.h */,
-                               9B1AB0791648C69D0051F3F2 /* HTMLFormControlsCollection.idl */,
                                A81369B3097374F500D74463 /* HTMLFormControlElement.cpp */,
                                A81369B2097374F500D74463 /* HTMLFormControlElement.h */,
                                E14F1C4214B5DAC600EA9009 /* HTMLFormControlElementWithState.cpp */,
                                E14F1C4314B5DAC600EA9009 /* HTMLFormControlElementWithState.h */,
+                               A8DF3FC7097FA0FB0052981B /* HTMLFormControlsCollection.cpp */,
+                               A8DF3FC6097FA0FB0052981B /* HTMLFormControlsCollection.h */,
+                               9B1AB0791648C69D0051F3F2 /* HTMLFormControlsCollection.idl */,
                                A81369B5097374F500D74463 /* HTMLFormElement.cpp */,
                                A81369B4097374F500D74463 /* HTMLFormElement.h */,
                                A8D064EF0A23BFEA005E7203 /* HTMLFormElement.idl */,
                                9712A55715004EDA0048AF10 /* IDBAny.cpp */,
                                9712A55815004EDA0048AF10 /* IDBAny.h */,
                                9712A55915004EDA0048AF10 /* IDBAny.idl */,
-                               9712A55A15004EDA0048AF10 /* IDBBackingStore.h */,
                                9712A58C15004EDA0048AF10 /* IDBBackingStore.cpp */,
+                               9712A55A15004EDA0048AF10 /* IDBBackingStore.h */,
                                9712A55B15004EDA0048AF10 /* IDBCallbacks.h */,
                                9712A55C15004EDA0048AF10 /* IDBCursor.cpp */,
                                9712A55D15004EDA0048AF10 /* IDBCursor.h */,
                                2BE8E2C612A589EC00FAD550 /* HTMLMetaCharsetParser.h */,
                                93E2A304123E9DC0009FE12A /* HTMLParserIdioms.cpp */,
                                93E2A305123E9DC0009FE12A /* HTMLParserIdioms.h */,
+                               973F4187169B95EF0006BF60 /* HTMLParserOptions.cpp */,
+                               973F4188169B95EF0006BF60 /* HTMLParserOptions.h */,
                                977B3857122883E900B81FF8 /* HTMLParserScheduler.cpp */,
                                977B3858122883E900B81FF8 /* HTMLParserScheduler.h */,
                                977B3859122883E900B81FF8 /* HTMLPreloadScanner.cpp */,
                A75E8B7F0E1DE2B0007F2481 /* filters */ = {
                        isa = PBXGroup;
                        children = (
-                               5093334D163B0E4300099A60 /* CustomFilterParameterList.cpp */,
-                               5093334E163B0E4300099A60 /* CustomFilterParameterList.h */,
-                               50D32855163B313F0016111E /* ValidatedCustomFilterOperation.cpp */,
-                               50D32856163B313F0016111E /* ValidatedCustomFilterOperation.h */,
                                15B3FC1715FB217800A81BCB /* CustomFilterArrayParameter.h */,
                                50D4060F147D49DE00D30BB5 /* CustomFilterCompiledProgram.cpp */,
                                50D40610147D49DE00D30BB5 /* CustomFilterCompiledProgram.h */,
                                50CC0A3814C6F5B10017AB51 /* CustomFilterOperation.cpp */,
                                50ACE2CA14B5D79300446666 /* CustomFilterOperation.h */,
                                509CC9FA14C069ED00BBECBD /* CustomFilterParameter.h */,
+                               5093334D163B0E4300099A60 /* CustomFilterParameterList.cpp */,
+                               5093334E163B0E4300099A60 /* CustomFilterParameterList.h */,
                                503D0CA714B5B08700F32F57 /* CustomFilterProgram.cpp */,
                                503D0CA814B5B08700F32F57 /* CustomFilterProgram.h */,
                                503D0CA914B5B08700F32F57 /* CustomFilterProgramClient.h */,
                                84A81F400FC7E02700955300 /* SourceGraphic.h */,
                                A1E1154713015C5D0054AC8C /* SpotLightSource.cpp */,
                                84730D761248F0B300D3A9C9 /* SpotLightSource.h */,
+                               50D32855163B313F0016111E /* ValidatedCustomFilterOperation.cpp */,
+                               50D32856163B313F0016111E /* ValidatedCustomFilterOperation.h */,
                        );
                        name = filters;
                        sourceTree = "<group>";
                B2A015910AF6CD53006BCE0E /* graphics */ = {
                        isa = PBXGroup;
                        children = (
-                               9332AB3B16515D7700D827EC /* cpu */,
                                076F0D0812B8192700C26AA4 /* avfoundation */,
                                499B3EC0128CCC1800E726C2 /* ca */,
                                B27535290B053814002CE64F /* cg */,
                                B5320D68122A24E9002D1440 /* cocoa */,
+                               9332AB3B16515D7700D827EC /* cpu */,
                                A75E8B7F0E1DE2B0007F2481 /* filters */,
                                498770C11242C50D002226BA /* gpu */,
                                B27535490B053814002CE64F /* mac */,
                                37202198106213C600F25C4B /* FontSmoothingMode.h */,
                                3784C34A0E11AA34007D8D48 /* FontTraitsMask.h */,
                                BCE4413512F7490B009B84B8 /* FontWidthVariant.h */,
-                               141DC049164834B900371E5A /* LayoutBoxExtent.cpp */,
-                               141DC04A164834B900371E5A /* LayoutBoxExtent.h */,
-                               141DC04B164834B900371E5A /* LayoutPoint.h */,
-                               141DC04C164834B900371E5A /* LayoutRect.cpp */,
-                               141DC04D164834B900371E5A /* LayoutRect.h */,
-                               141DC04E164834B900371E5A /* LayoutSize.h */,
                                4FB390AC15EF61F3007AD51F /* GeneratedImage.cpp */,
                                BC23F0DA0DAFF4A4009FDC91 /* GeneratedImage.h */,
                                BCE04C890DAFF7A0007A0F41 /* Generator.h */,
                                A8748D7412CC3F89001FBA41 /* ImageOrientation.cpp */,
                                A8748D6612CC3763001FBA41 /* ImageOrientation.h */,
                                49291E4A134172C800E753DE /* ImageRenderingMode.h */,
+                               B27535430B053814002CE64F /* ImageSource.h */,
                                07941793166EA04E009416C2 /* InbandTextTrackPrivate.h */,
                                07CE77D416712A6A00C55A47 /* InbandTextTrackPrivateClient.h */,
-                               B27535430B053814002CE64F /* ImageSource.h */,
                                B27535440B053814002CE64F /* IntPoint.h */,
                                E462A4A0113E71BE004A4220 /* IntPointHash.h */,
                                B27535450B053814002CE64F /* IntRect.cpp */,
                                B27535470B053814002CE64F /* IntSize.h */,
                                B27535480B053814002CE64F /* IntSizeHash.h */,
                                65CC6BED16014EC0000ED27D /* Latin1TextIterator.h */,
+                               141DC049164834B900371E5A /* LayoutBoxExtent.cpp */,
+                               141DC04A164834B900371E5A /* LayoutBoxExtent.h */,
+                               141DC04B164834B900371E5A /* LayoutPoint.h */,
+                               141DC04C164834B900371E5A /* LayoutRect.cpp */,
+                               141DC04D164834B900371E5A /* LayoutRect.h */,
+                               141DC04E164834B900371E5A /* LayoutSize.h */,
                                E4B41E0C0CBF90BD00AF2ECE /* MediaPlayer.cpp */,
                                E4B41E0D0CBF90BD00AF2ECE /* MediaPlayer.h */,
                                079F5E4B0F3BEBEA005E0782 /* MediaPlayerPrivate.h */,
                                087E0AF413606D0B00FA4BA8 /* SVGGlyph.cpp */,
                                087E0AF513606D0B00FA4BA8 /* SVGGlyph.h */,
                                930FC6891072B9280045293E /* TextRenderingMode.h */,
-                               CDD1E525167BA56400CE820B /* TextTrackRepresentation.h */,
-                               CD1E7346167BC78E009A885D /* TextTrackRepresentation.cpp */,
                                376DCCE013B4F966002EBEFC /* TextRun.cpp */,
                                A824B4640E2EF2EA0081A7B7 /* TextRun.h */,
+                               CD1E7346167BC78E009A885D /* TextTrackRepresentation.cpp */,
+                               CDD1E525167BA56400CE820B /* TextTrackRepresentation.h */,
                                1AF89A411518FDEA00E547B5 /* TiledBacking.h */,
                                37C28A6710F659CC008C7813 /* TypesettingFeatures.h */,
                                E4AFCFA40DAF29A300F5F55C /* UnitBezier.h */,
                B2B264590D00A77E000ACC1D /* cf */ = {
                        isa = PBXGroup;
                        children = (
+                               1AA2124F163F0DA80000E63F /* AtomicStringCF.cpp */,
                                371A67CA11C6C7DB00047B8B /* HyphenationCF.cpp */,
                                B2B2645A0D00A77E000ACC1D /* StringCF.cpp */,
                                B2B2645B0D00A77E000ACC1D /* StringImplCF.cpp */,
-                               1AA2124F163F0DA80000E63F /* AtomicStringCF.cpp */,
                        );
                        path = cf;
                        sourceTree = "<group>";
                BC4EDEF70C08F414007EDD49 /* Custom */ = {
                        isa = PBXGroup;
                        children = (
-                               209B456A16796A7E00E54E4E /* JSCryptoCustom.cpp */,
                                BC275CB211C5E85C00C9206C /* JSArrayBufferCustom.cpp */,
                                86243D0011BC31F700CC006A /* JSArrayBufferViewHelper.h */,
                                BC2ED6BB0C6BD2F000920BFF /* JSAttrCustom.cpp */,
                                BCA83E510D7CE205003421A8 /* JSClipboardCustom.cpp */,
                                C0DFC86F0DB6841A003EAE7C /* JSConsoleCustom.cpp */,
                                FE700DD00F92D81A008E2BFE /* JSCoordinatesCustom.cpp */,
+                               209B456A16796A7E00E54E4E /* JSCryptoCustom.cpp */,
                                E1AD14901297337400ACA989 /* JSCSSFontFaceRuleCustom.cpp */,
                                E1AD147B1297307E00ACA989 /* JSCSSImportRuleCustom.cpp */,
                                E1AD14A21297345300ACA989 /* JSCSSMediaRuleCustom.cpp */,
                                BC5EB69C0E81DAEB00B25965 /* FillLayer.cpp */,
                                BC5EB69D0E81DAEB00B25965 /* FillLayer.h */,
                                A12705C21656BD6500C2E27C /* GridPosition.h */,
+                               A12A104E166444DC008FA311 /* GridTrackSize.h */,
                                BC5EBA0E0E823E4700B25965 /* KeyframeList.cpp */,
                                BC5EBA0F0E823E4700B25965 /* KeyframeList.h */,
                                AB31C91D10AE1B8E000C7B92 /* LineClampValue.h */,
                                BC2274750E8366E200E7F975 /* SVGRenderStyle.h */,
                                BC2274760E8366E200E7F975 /* SVGRenderStyleDefs.cpp */,
                                BC2274770E8366E200E7F975 /* SVGRenderStyleDefs.h */,
-                               A12A104E166444DC008FA311 /* GridTrackSize.h */,
                        );
                        name = style;
                        sourceTree = "<group>";
                                7EE6847312D26E5500E79415 /* cf */,
                                5126E6B60A2E3AEF005C29FA /* icon */,
                                93A1EAA20A5634D8006960A0 /* mac */,
-                               E1C416160F6563180092D2FB /* CrossOriginAccessControl.cpp */,
                                4FC853491644271B00D1C275 /* CachedMetadata.cpp */,
                                4FC8534A1644271B00D1C275 /* CachedMetadata.h */,
                                E1424C91164B52C800F32D40 /* CookieJar.cpp */,
                                E1424C92164B52C800F32D40 /* CookieJar.h */,
+                               E1C416160F6563180092D2FB /* CrossOriginAccessControl.cpp */,
                                E1C416110F6562FD0092D2FB /* CrossOriginAccessControl.h */,
                                E1C415DD0F655D7C0092D2FB /* CrossOriginPreflightResultCache.cpp */,
                                E1C415D90F655D6F0092D2FB /* CrossOriginPreflightResultCache.h */,
                                98CE4325129E00BD005821DC /* LinkLoader.cpp */,
                                98CE4329129E00E5005821DC /* LinkLoader.h */,
                                984264EF12D5280A000D88A4 /* LinkLoaderClient.h */,
-                               51E6820F16387302003BBF3C /* LoaderStrategy.h */,
                                51ABF64C16392E2800132A7A /* LoaderStrategy.cpp */,
+                               51E6820F16387302003BBF3C /* LoaderStrategy.h */,
                                93E227DC0AF589AD00D48324 /* MainResourceLoader.cpp */,
                                656D37290ADBA5DE00A4554D /* MainResourceLoader.h */,
                                52F10862162B6D82009AC81E /* MixedContentChecker.cpp */,
                                C57FEDE01212EE9C0097BE65 /* FileSystem.cpp */,
                                514B3F720C722047000530DF /* FileSystem.h */,
                                BC073BA90C399B1F000F5979 /* FloatConversion.h */,
-                               141DC0471648348F00371E5A /* LayoutUnit.h */,
                                A8748BDF12CBF2DC001FBA41 /* HashTools.h */,
                                D6FDAEF2149C06190037B1E1 /* HistogramSupport.cpp */,
                                D630E2AB149BF344005B2F93 /* HistogramSupport.h */,
                                85EC9AF90A71A2C600EEEAED /* Language.h */,
                                D6FDAEF2149C06190037B1E5 /* LayoutTestSupport.cpp */,
                                D630E2AB149BF344005B2F97 /* LayoutTestSupport.h */,
+                               141DC0471648348F00371E5A /* LayoutUnit.h */,
                                BCE65BE80EACDF16007E4533 /* Length.cpp */,
                                BCE65BE90EACDF16007E4533 /* Length.h */,
                                146CC113156988BD00109E37 /* LengthBox.cpp */,
                                D630E2AB149BF344005B2F95 /* MemoryUsageSupport.h */,
                                BC772C4C0C4EB3040083285F /* MIMETypeRegistry.cpp */,
                                BC772C4D0C4EB3040083285F /* MIMETypeRegistry.h */,
-                               98EB1F941313FE0500D0E1EA /* NotImplemented.h */,
                                E1513D501677F08800149FCB /* NotImplemented.cpp */,
+                               98EB1F941313FE0500D0E1EA /* NotImplemented.h */,
                                4B2708C50AF19EE40065127F /* Pasteboard.h */,
                                C5F765B414E1D414006C899B /* PasteboardStrategy.h */,
                                E1424C89164B3B4E00F32D40 /* PlatformCookieJar.h */,
                                0F56028D0E4B76580065B038 /* RenderMarquee.h */,
                                E4C279560CF9741900E97B98 /* RenderMedia.cpp */,
                                E4C279570CF9741900E97B98 /* RenderMedia.h */,
-                               41FA303C1316C29C00C0BFC5 /* RenderMediaControls.cpp */,
-                               41FA303D1316C29C00C0BFC5 /* RenderMediaControls.h */,
                                DE49B307165F2FE10010338D /* RenderMediaControlElements.cpp */,
                                DE49B308165F2FE10010338D /* RenderMediaControlElements.h */,
+                               41FA303C1316C29C00C0BFC5 /* RenderMediaControls.cpp */,
+                               41FA303D1316C29C00C0BFC5 /* RenderMediaControls.h */,
                                ABDDFE730A5C6E6F00A3E11D /* RenderMenuList.cpp */,
                                ABDDFE740A5C6E7000A3E11D /* RenderMenuList.h */,
                                A454424C119B3687009BE912 /* RenderMeter.cpp */,
                                14947FFC12F80CD200A0F631 /* DocumentOrderedMap.h */,
                                A8C2280D11D4A59700D5A7D3 /* DocumentParser.cpp */,
                                BCCFBAE70B5152ED0001F1D7 /* DocumentParser.h */,
+                               AD6E71AA1668899D00320C13 /* DocumentSharedObjectPool.cpp */,
+                               AD6E71AB1668899D00320C13 /* DocumentSharedObjectPool.h */,
                                E47E276716036EDC00EE2AFB /* DocumentStyleSheetCollection.cpp */,
                                E47E276416036ED200EE2AFB /* DocumentStyleSheetCollection.h */,
                                86D982F6125C154000AD9E3D /* DocumentTiming.h */,
                                93EEC1F709C2877700C515D1 /* WheelEvent.idl */,
                                4123E568127B3041000FEEA7 /* WindowEventContext.cpp */,
                                4123E567127B3041000FEEA7 /* WindowEventContext.h */,
-                               AD6E71AA1668899D00320C13 /* DocumentSharedObjectPool.cpp */,
-                               AD6E71AB1668899D00320C13 /* DocumentSharedObjectPool.h */,
                        );
                        path = dom;
                        sourceTree = "<group>";
                                FD671A74159BB07000197559 /* MediaStreamAudioSourceNode.cpp */,
                                FD671A75159BB07000197559 /* MediaStreamAudioSourceNode.h */,
                                FD671A76159BB07000197559 /* MediaStreamAudioSourceNode.idl */,
-                               FDA9325A16703B2A008982DC /* OfflineAudioContext.cpp */,
-                               FDA9325B16703B2A008982DC /* OfflineAudioContext.h */,
-                               FDA9325C16703B2A008982DC /* OfflineAudioContext.idl */,
                                FDA3E955134A49EF008D4B5A /* OfflineAudioCompletionEvent.cpp */,
                                FDA3E956134A49EF008D4B5A /* OfflineAudioCompletionEvent.h */,
                                FDA3E95D134A49FF008D4B5A /* OfflineAudioCompletionEvent.idl */,
+                               FDA9325A16703B2A008982DC /* OfflineAudioContext.cpp */,
+                               FDA9325B16703B2A008982DC /* OfflineAudioContext.h */,
+                               FDA9325C16703B2A008982DC /* OfflineAudioContext.idl */,
                                FDA3E957134A49EF008D4B5A /* OfflineAudioDestinationNode.cpp */,
                                FDA3E958134A49EF008D4B5A /* OfflineAudioDestinationNode.h */,
                                FD581FAB1520F91F003A7A75 /* OscillatorNode.cpp */,
                                FD23A12413F5FA5900F67001 /* JSMediaElementAudioSourceNode.h */,
                                FDBD480A159BC6870093EB4F /* JSMediaStreamAudioSourceNode.cpp */,
                                FDBD480B159BC6870093EB4F /* JSMediaStreamAudioSourceNode.h */,
-                               FDA9326416703BA9008982DC /* JSOfflineAudioContext.cpp */,
-                               FDA9326516703BA9008982DC /* JSOfflineAudioContext.h */,
                                FDF6BAF6134A4C9800822920 /* JSOfflineAudioCompletionEvent.cpp */,
                                FDF6BAF7134A4C9800822920 /* JSOfflineAudioCompletionEvent.h */,
+                               FDA9326416703BA9008982DC /* JSOfflineAudioContext.cpp */,
+                               FDA9326516703BA9008982DC /* JSOfflineAudioContext.h */,
                                FDEA6240152102E200479DF0 /* JSOscillatorNode.cpp */,
                                FDEA6241152102E200479DF0 /* JSOscillatorNode.h */,
                                FDA15E9512B03EE1003A583A /* JSPannerNode.cpp */,
                        files = (
                                417DA6DA13734E6E007C57FB /* Internals.h in Headers */,
                                A7BF7EE014C9175A0014489D /* InternalSettings.h in Headers */,
+                               53E29E5F167A8A1900586D3D /* InternalSettingsGenerated.h in Headers */,
                                417DA71E13735DFA007C57FB /* JSInternals.h in Headers */,
                                A740B5A514C935AB00A77FA4 /* JSInternalSettings.h in Headers */,
+                               53ED3FDF167A88E7006762E6 /* JSInternalSettingsGenerated.h in Headers */,
                                A740B59514C935AB00A77FA4 /* JSMallocStatistics.h in Headers */,
                                EBF5121D1696496C0056BD25 /* JSTypeConversions.h in Headers */,
                                41815C1F138319830057AAA4 /* WebCoreTestSupport.h in Headers */,
-                               53ED3FDF167A88E7006762E6 /* JSInternalSettingsGenerated.h in Headers */,
-                               53E29E5F167A8A1900586D3D /* InternalSettingsGenerated.h in Headers */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        isa = PBXHeadersBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
-                               FEDEF84216797108000E444A /* DatabaseStrategy.h in Headers */,
-                               FE115FAB167988CD00249134 /* AbstractDatabaseServer.h in Headers */,
-                               FE3371A2167C11D400EDB752 /* DatabaseBasicTypes.h in Headers */,
-                               FEAF6654167970320062D0C5 /* DBBackendServer.h in Headers */,
-                               FE456F191677D74E005EDDF9 /* DatabaseManager.h in Headers */,
-                               E43105BB16750F1600DB2FB8 /* NodeTraversal.h in Headers */,
-                               C375D7FE16639519006184AB /* TypeAhead.h in Headers */,
-                               FD1AF1501656F15100C6D4F7 /* ExclusionShapeValue.h in Headers */,
-                               2E3BBF081162DA1100B9409A /* UUID.h in Headers */,
-                               BC7FA6210D1F0CBD00DB22A9 /* LiveNodeList.h in Headers */,
-                               A81369DA097374F600D74463 /* HTMLOptionsCollection.h in Headers */,
-                               A81369D8097374F600D74463 /* HTMLSelectElement.h in Headers */,
-                               A81369DC097374F600D74463 /* HTMLOptionElement.h in Headers */,
                                97BC69DB1505F076001B74AC /* AbstractDatabase.h in Headers */,
+                               FE115FAB167988CD00249134 /* AbstractDatabaseServer.h in Headers */,
                                41E1B1D10FF5986900576B3B /* AbstractWorker.h in Headers */,
                                29A8122E0FBB9C1D00510293 /* AccessibilityARIAGridCell.h in Headers */,
-                               9A9CEF8E163B3EA100DE7EFE /* ExclusionShapeOutsideInfo.h in Headers */,
                                29A812330FBB9C1D00510293 /* AccessibilityARIAGridRow.h in Headers */,
                                29A8123B0FBB9C1D00510293 /* AccessibilityImageMapLink.h in Headers */,
                                29A8122C0FBB9C1D00510293 /* AccessibilityList.h in Headers */,
                                29489FC712C00F0300D83F0F /* AccessibilityScrollView.h in Headers */,
                                0709FC4E1025DEE30059CDBA /* AccessibilitySlider.h in Headers */,
                                29D7BCFA1444AF7D0070619C /* AccessibilitySpinButton.h in Headers */,
+                               AAC08CF315F941FD00F1E188 /* AccessibilitySVGRoot.h in Headers */,
                                29A8122B0FBB9C1D00510293 /* AccessibilityTable.h in Headers */,
                                29A812320FBB9C1D00510293 /* AccessibilityTableCell.h in Headers */,
                                29A812410FBB9C1D00510293 /* AccessibilityTableColumn.h in Headers */,
                                F5E0C65C1643C42C00D6CB69 /* BaseChooserOnlyDateAndTimeInputType.h in Headers */,
                                C33EE5C514FB49610002095A /* BaseClickableWithKeyInputType.h in Headers */,
                                F59C96001255B23F000623C0 /* BaseDateAndTimeInputType.h in Headers */,
-                               E49BD9FA131FD2ED003C56F0 /* CSSValuePool.h in Headers */,
                                45861C73161949DC00010F3A /* BaseMultipleFieldsDateAndTimeInputType.h in Headers */,
                                F55B3DAE1251F12D003EF269 /* BaseTextInputType.h in Headers */,
                                FBD6AF8A15EF25DF008B7110 /* BasicShapeFunctions.h in Headers */,
                                5038BE411472AD980095E0D1 /* CachedShader.h in Headers */,
                                D0BC54491443AC4A00E105DA /* CachedStyleSheetClient.h in Headers */,
                                A104F24414C71F7A009E2C23 /* CachedSVGDocument.h in Headers */,
+                               FB2C15C3165D649D0039C9F8 /* CachedSVGDocumentReference.h in Headers */,
                                0753860314489E9800B78452 /* CachedTextTrack.h in Headers */,
                                BCB16C280979C3BD00467741 /* CachedXSLStyleSheet.h in Headers */,
                                93F1995008245E59001E9ABC /* CachePolicy.h in Headers */,
                                7ADE722610CBBB9B006B3B3A /* ContextMenuProvider.h in Headers */,
                                FD31602912B0267600C1A359 /* ConvolverNode.h in Headers */,
                                D8B6152F1032495100C8554A /* Cookie.h in Headers */,
+                               E1424C94164B52C800F32D40 /* CookieJar.h in Headers */,
                                339B5B63131DAA3200F48D02 /* CookiesStrategy.h in Headers */,
                                33D0212D131DB37B004091A8 /* CookieStorage.h in Headers */,
                                FE6FD4880F676E5700092873 /* Coordinates.h in Headers */,
                                A80E6CEE0A1989CA007FB8C5 /* CSSValue.h in Headers */,
                                6565815109D13043000E61D7 /* CSSValueKeywords.h in Headers */,
                                A80E6CE90A1989CA007FB8C5 /* CSSValueList.h in Headers */,
+                               E49BD9FA131FD2ED003C56F0 /* CSSValuePool.h in Headers */,
                                CAE9F910146441F000C245B1 /* CSSVariableValue.h in Headers */,
                                93F1992F08245E59001E9ABC /* Cursor.h in Headers */,
                                BC2272A20E82E87C00E7F975 /* CursorData.h in Headers */,
                                50CC089A14C6E99C0017AB51 /* CustomFilterNumberParameter.h in Headers */,
                                50ACE2CB14B5D79300446666 /* CustomFilterOperation.h in Headers */,
                                509CC9FB14C069ED00BBECBD /* CustomFilterParameter.h in Headers */,
+                               50933350163B0E4300099A60 /* CustomFilterParameterList.h in Headers */,
                                503D0CAB14B5B08700F32F57 /* CustomFilterProgram.h in Headers */,
                                503D0CAC14B5B08700F32F57 /* CustomFilterProgramClient.h in Headers */,
                                50D88CB615BDFDAA001809F4 /* CustomFilterProgramInfo.h in Headers */,
                                A80E6D0B0A1989CA007FB8C5 /* DashboardRegion.h in Headers */,
                                97BC6A211505F081001B74AC /* Database.h in Headers */,
                                97BC6A241505F081001B74AC /* DatabaseAuthorizer.h in Headers */,
+                               FE3371A2167C11D400EDB752 /* DatabaseBasicTypes.h in Headers */,
                                97BC6A251505F081001B74AC /* DatabaseCallback.h in Headers */,
                                97BC6A281505F081001B74AC /* DatabaseContext.h in Headers */,
                                97BC6A291505F081001B74AC /* DatabaseDetails.h in Headers */,
+                               FE456F191677D74E005EDDF9 /* DatabaseManager.h in Headers */,
                                97BC6A331505F081001B74AC /* DatabaseManagerClient.h in Headers */,
+                               FEDEF84216797108000E444A /* DatabaseStrategy.h in Headers */,
                                97BC6A2B1505F081001B74AC /* DatabaseSync.h in Headers */,
                                97BC6A2E1505F081001B74AC /* DatabaseTask.h in Headers */,
                                97BC6A301505F081001B74AC /* DatabaseThread.h in Headers */,
                                F55B3DBA1251F12D003EF269 /* DateTimeLocalInputType.h in Headers */,
                                45861C8616194A7400010F3A /* DateTimeNumericFieldElement.h in Headers */,
                                45861C8816194A7400010F3A /* DateTimeSymbolicFieldElement.h in Headers */,
+                               FEAF6654167970320062D0C5 /* DBBackendServer.h in Headers */,
                                45FEA5D0156DDE8C00654101 /* Decimal.h in Headers */,
                                A8C228A111D5722E00D5A7D3 /* DecodedDataDocumentParser.h in Headers */,
                                CECCFC3B141973D5002A0AC1 /* DecodeEscapeSequences.h in Headers */,
                                CE057FA61220731100A476D5 /* DocumentMarkerController.h in Headers */,
                                14947FFE12F80CD200A0F631 /* DocumentOrderedMap.h in Headers */,
                                BCCFBAE80B5152ED0001F1D7 /* DocumentParser.h in Headers */,
+                               AD6E71AD1668899D00320C13 /* DocumentSharedObjectPool.h in Headers */,
                                E47E276516036ED200EE2AFB /* DocumentStyleSheetCollection.h in Headers */,
                                0B90561A0F2578BF0095FF6A /* DocumentThreadableLoader.h in Headers */,
                                86D982F7125C154000AD9E3D /* DocumentTiming.h in Headers */,
                                8502AB540AD438C000378540 /* DOMSVGFEFuncGElement.h in Headers */,
                                8502AB980AD4394E00378540 /* DOMSVGFEFuncGElementInternal.h in Headers */,
                                8502AB560AD438C000378540 /* DOMSVGFEFuncRElement.h in Headers */,
-                               71B1E125164048F700B1880A /* InspectorLayerTreeAgent.h in Headers */,
                                8502AB990AD4394E00378540 /* DOMSVGFEFuncRElementInternal.h in Headers */,
                                8502AB580AD438C000378540 /* DOMSVGFEGaussianBlurElement.h in Headers */,
                                8502AB9A0AD4394E00378540 /* DOMSVGFEGaussianBlurElementInternal.h in Headers */,
                                8AD0A59814C88358000D83C5 /* DOMWebKitCSSRegionRuleInternal.h in Headers */,
                                31611E610E1C4E1400F6A579 /* DOMWebKitCSSTransformValue.h in Headers */,
                                31611E630E1C4E1400F6A579 /* DOMWebKitCSSTransformValueInternal.h in Headers */,
+                               3F2B33EB165AF15600E3987C /* DOMWebKitCSSViewportRule.h in Headers */,
+                               3F2B33ED165AF15600E3987C /* DOMWebKitCSSViewportRuleInternal.h in Headers */,
                                8A195932147EA16E00D1EA61 /* DOMWebKitNamedFlow.h in Headers */,
                                8A195934147EA16E00D1EA61 /* DOMWebKitNamedFlowInternal.h in Headers */,
                                31C0FF4C0E4CEFDD007D6FE5 /* DOMWebKitTransitionEvent.h in Headers */,
                                6E8798BD15F81E4A00BFE4AA /* ExclusionRectangle.h in Headers */,
                                6E8798BF15F81E4A00BFE4AA /* ExclusionShape.h in Headers */,
                                FD748AC015BF74ED0059CF0D /* ExclusionShapeInsideInfo.h in Headers */,
+                               9A9CEF8E163B3EA100DE7EFE /* ExclusionShapeOutsideInfo.h in Headers */,
+                               FD1AF1501656F15100C6D4F7 /* ExclusionShapeValue.h in Headers */,
                                6E67D2A91280E8BD008758F7 /* Extensions3D.h in Headers */,
                                6E67D2A71280E8A4008758F7 /* Extensions3DOpenGL.h in Headers */,
                                44DAB5B215A623580097C1E4 /* Extensions3DOpenGLCommon.h in Headers */,
                                B2A015AB0AF6CD53006BCE0E /* GraphicsTypes.h in Headers */,
                                77A17A7B12F2890B004E02F6 /* GraphicsTypes3D.h in Headers */,
                                A12705C31656BD6500C2E27C /* GridPosition.h in Headers */,
+                               A12A1050166444FD008FA311 /* GridTrackSize.h in Headers */,
                                C50B561712119D23008B46E0 /* GroupSettings.h in Headers */,
                                8482B7461198C35400BFB005 /* HashChangeEvent.h in Headers */,
                                A8748BE012CBF2DC001FBA41 /* HashTools.h in Headers */,
+                               F37A56231679CF7B00C57046 /* HeapGraphSerializer.h in Headers */,
                                F55B3DC01251F12D003EF269 /* HiddenInputType.h in Headers */,
                                BC94D1540C275C8B006BC617 /* History.h in Headers */,
                                97DCE20210807C750057D394 /* HistoryController.h in Headers */,
                                A81369D4097374F600D74463 /* HTMLFieldSetElement.h in Headers */,
                                A8CFF7A60A156978000A4234 /* HTMLFontElement.h in Headers */,
                                977B386F122883E900B81FF8 /* HTMLFormattingElementList.h in Headers */,
-                               A8DF3FCE097FA0FC0052981B /* HTMLFormControlsCollection.h in Headers */,
                                A81369CE097374F600D74463 /* HTMLFormControlElement.h in Headers */,
                                E14F1C4514B5DAC600EA9009 /* HTMLFormControlElementWithState.h in Headers */,
+                               A8DF3FCE097FA0FC0052981B /* HTMLFormControlsCollection.h in Headers */,
                                A81369D0097374F600D74463 /* HTMLFormElement.h in Headers */,
                                A871DE2B0A152AC800B12A68 /* HTMLFrameElement.h in Headers */,
                                14FFE31D0AE1963300136BF5 /* HTMLFrameElementBase.h in Headers */,
                                A871D45A0A127CBC00B12A68 /* HTMLObjectElement.h in Headers */,
                                A8EA79F10A1916DF00A8EF5F /* HTMLOListElement.h in Headers */,
                                A81369DE097374F600D74463 /* HTMLOptGroupElement.h in Headers */,
+                               A81369DC097374F600D74463 /* HTMLOptionElement.h in Headers */,
+                               A81369DA097374F600D74463 /* HTMLOptionsCollection.h in Headers */,
                                4AD01009127E642A0015035F /* HTMLOutputElement.h in Headers */,
                                A8EA7CB50A192B9C00A8EF5F /* HTMLParagraphElement.h in Headers */,
                                A871D4580A127CBC00B12A68 /* HTMLParamElement.h in Headers */,
                                BC588AF00BFA6CF900EE679E /* HTMLParserErrorCodes.h in Headers */,
                                93E2A307123E9DC0009FE12A /* HTMLParserIdioms.h in Headers */,
+                               973F418A169B95FF0006BF60 /* HTMLParserOptions.h in Headers */,
                                449B19F50FA72ECE0015CA4A /* HTMLParserQuirks.h in Headers */,
                                977B3871122883E900B81FF8 /* HTMLParserScheduler.h in Headers */,
                                A871D4560A127CBC00B12A68 /* HTMLPlugInElement.h in Headers */,
                                A871DC250A15205700B12A68 /* HTMLScriptElement.h in Headers */,
                                977B3875122883E900B81FF8 /* HTMLScriptRunner.h in Headers */,
                                977B3876122883E900B81FF8 /* HTMLScriptRunnerHost.h in Headers */,
+                               A81369D8097374F600D74463 /* HTMLSelectElement.h in Headers */,
                                4ABDFF0C14DBE385004D117D /* HTMLShadowElement.h in Headers */,
                                E44613A80CD6331000FADA75 /* HTMLSourceElement.h in Headers */,
                                977E2DCE12F0E28300C13379 /* HTMLSourceTracker.h in Headers */,
                                A871DB310A150BD600B12A68 /* HTMLTableRowElement.h in Headers */,
                                93442C9E0D2B335C00338FF9 /* HTMLTableRowsCollection.h in Headers */,
                                A871DB250A150BD600B12A68 /* HTMLTableSectionElement.h in Headers */,
+                               D66817FB166FE6D700FA07B4 /* HTMLTemplateElement.h in Headers */,
                                A81369D6097374F600D74463 /* HTMLTextAreaElement.h in Headers */,
                                9BC6C21B13CCC97B008E0337 /* HTMLTextFormControlElement.h in Headers */,
                                A871DC280A15205700B12A68 /* HTMLTitleElement.h in Headers */,
                                B27535710B053814002CE64F /* ImageSource.h in Headers */,
                                4B3480940EEF50D400AC1B41 /* ImageSourceCG.h in Headers */,
                                316FE1180E6E1DA700BF6088 /* ImplicitAnimation.h in Headers */,
+                               07941792166E855F009416C2 /* InbandTextTrack.h in Headers */,
+                               07941794166EA04E009416C2 /* InbandTextTrackPrivate.h in Headers */,
+                               07B442D7166C70B000556CAD /* InbandTextTrackPrivateAVF.h in Headers */,
+                               07AA6B6C166D2C1300D45671 /* InbandTextTrackPrivateAVFObjC.h in Headers */,
+                               07CE77D516712A6A00C55A47 /* InbandTextTrackPrivateClient.h in Headers */,
                                DB23C2CC0A508D29002489EB /* IndentOutdentCommand.h in Headers */,
+                               E1513D4F1677EA8300149FCB /* InitializeLogging.h in Headers */,
                                F3644B001119805900E0D537 /* InjectedScript.h in Headers */,
                                AAB6054F15874C58007B5031 /* InjectedScriptBase.h in Headers */,
                                AA73183F159255B900A93E6E /* InjectedScriptCanvasModule.h in Headers */,
                                7ACD88D414C08BD60084EDD2 /* InspectorIndexedDBAgent.h in Headers */,
                                4D273CFA1669420800259CA1 /* InspectorInputAgent.h in Headers */,
                                20D629271253690B00081543 /* InspectorInstrumentation.h in Headers */,
+                               71B1E125164048F700B1880A /* InspectorLayerTreeAgent.h in Headers */,
                                7AA51DD6148506A900AD2752 /* InspectorMemoryAgent.h in Headers */,
                                4F6FDD651341DEDD001F8EE3 /* InspectorPageAgent.h in Headers */,
                                9F0D6B2F121BFEBA006C0288 /* InspectorProfilerAgent.h in Headers */,
                                BC06EE050BFD71AA00856E9D /* JSHTMLTableElement.h in Headers */,
                                BC06EDA00BFD660600856E9D /* JSHTMLTableRowElement.h in Headers */,
                                BC06ED070BFD5BAE00856E9D /* JSHTMLTableSectionElement.h in Headers */,
+                               D6489D26166FFCF1007C031B /* JSHTMLTemplateElement.h in Headers */,
                                A80E7E9D0A1A83E3007FB8C5 /* JSHTMLTextAreaElement.h in Headers */,
                                A80E7B0C0A19D606007FB8C5 /* JSHTMLTitleElement.h in Headers */,
                                070756D414239A4F00414161 /* JSHTMLTrackElement.h in Headers */,
                                6EBF0E7712A9868800DB1709 /* JSOESTextureFloat.h in Headers */,
                                77A17AA712F28B2A004E02F6 /* JSOESVertexArrayObject.h in Headers */,
                                FDF6BAF9134A4C9800822920 /* JSOfflineAudioCompletionEvent.h in Headers */,
+                               FDA9326716703BA9008982DC /* JSOfflineAudioContext.h in Headers */,
                                FDEA6243152102E200479DF0 /* JSOscillatorNode.h in Headers */,
                                1A0D57410A5C7867007EDD4C /* JSOverflowEvent.h in Headers */,
                                E1284BB110449FFA00EAEB52 /* JSPageTransitionEvent.h in Headers */,
                                316FE0720E6CCBEE00BF6088 /* JSWebKitCSSKeyframeRule.h in Headers */,
                                316FE0740E6CCBEE00BF6088 /* JSWebKitCSSKeyframesRule.h in Headers */,
                                498391400F1E767500C23782 /* JSWebKitCSSMatrix.h in Headers */,
+                               15B8B7C91652C5220036EF55 /* JSWebKitCSSMixFunctionValue.h in Headers */,
                                8AD0A59514C88336000D83C5 /* JSWebKitCSSRegionRule.h in Headers */,
                                31611E5B0E1C4DE000F6A579 /* JSWebKitCSSTransformValue.h in Headers */,
+                               3F2B33EF165AF15600E3987C /* JSWebKitCSSViewportRule.h in Headers */,
                                494BD79E0F55C94C00747828 /* JSWebKitPoint.h in Headers */,
                                31C0FF400E4CEFAC007D6FE5 /* JSWebKitTransitionEvent.h in Headers */,
                                5DA5E0FD102B953800088CF9 /* JSWebSocket.h in Headers */,
                                85EC9AFB0A71A2C600EEEAED /* Language.h in Headers */,
                                2917B5621473496C0052C9D0 /* LayerFlushScheduler.h in Headers */,
                                2917B5631473496C0052C9D0 /* LayerFlushSchedulerClient.h in Headers */,
+                               93F72AF31666EDFC002A02BD /* LayerPool.h in Headers */,
+                               141DC050164834B900371E5A /* LayoutBoxExtent.h in Headers */,
                                931D72F615FE695300C4C07E /* LayoutMilestones.h in Headers */,
+                               141DC051164834B900371E5A /* LayoutPoint.h in Headers */,
+                               141DC053164834B900371E5A /* LayoutRect.h in Headers */,
                                A12538D413F9B60A00024754 /* LayoutRepainter.h in Headers */,
+                               141DC054164834B900371E5A /* LayoutSize.h in Headers */,
                                2D9066070BE141D400956998 /* LayoutState.h in Headers */,
                                D630E2AC149BF344005B2F93 /* LayoutTestSupport.h in Headers */,
                                141DC0481648348F00371E5A /* LayoutUnit.h in Headers */,
-                               141DC050164834B900371E5A /* LayoutBoxExtent.h in Headers */,
-                               141DC051164834B900371E5A /* LayoutPoint.h in Headers */,
-                               141DC053164834B900371E5A /* LayoutRect.h in Headers */,
-                               141DC054164834B900371E5A /* LayoutSize.h in Headers */,
                                512DD8F50D91E6AF000F89EE /* LegacyWebArchive.h in Headers */,
                                BCE65BEB0EACDF16007E4533 /* Length.h in Headers */,
                                BCFF64910EAD15C200C1D6F7 /* LengthBox.h in Headers */,
                                98CE432A129E00E5005821DC /* LinkLoader.h in Headers */,
                                984264F112D5280A000D88A4 /* LinkLoaderClient.h in Headers */,
                                985BB96E13A94058007A0B69 /* LinkRelAttribute.h in Headers */,
+                               BC7FA6210D1F0CBD00DB22A9 /* LiveNodeList.h in Headers */,
                                9759E94914EF1D490026A2DD /* LoadableTextTrack.h in Headers */,
                                656D37320ADBA5DE00A4554D /* LoaderNSURLExtras.h in Headers */,
                                7EE6846912D26E3800E79415 /* LoaderRunLoopCF.h in Headers */,
                                49E911C70EF86D47009D0CAF /* MatrixTransformOperation.h in Headers */,
                                931BCC611124DFCB00BE70DD /* MediaCanStartListener.h in Headers */,
                                417253AB1354BBBC00360F2A /* MediaControlElements.h in Headers */,
+                               DEBCCDD416646EAF00A452E1 /* MediaControlElementTypes.h in Headers */,
                                CDF65CC8145B1E7500C4C7AA /* MediaController.h in Headers */,
                                CDF65CCA145B448800C4C7AA /* MediaControllerInterface.h in Headers */,
-                               4157AF8012F1FB0400A8C6F5 /* MediaControlsApple.h in Headers */,
                                1F3C3BEB135CAF3C00B8C1AC /* MediaControls.h in Headers */,
+                               4157AF8012F1FB0400A8C6F5 /* MediaControlsApple.h in Headers */,
                                97205AB81239291000B17380 /* MediaDocument.h in Headers */,
                                FD6F252D13F5EF0E0065165F /* MediaElementAudioSourceNode.h in Headers */,
                                E44613AD0CD6331000FADA75 /* MediaError.h in Headers */,
                                628D214C12131ED10055DCFC /* NetworkingContext.h in Headers */,
                                59C27F07138D28CF0079B7E2 /* NetworkResourcesData.h in Headers */,
                                1A7FA6190DDA3B3A0028F8A5 /* NetworkStateNotifier.h in Headers */,
+                               E13EF3441684ECF40034C83F /* NetworkStorageSession.h in Headers */,
                                00CA93B213C6691600F7FE95 /* NewXMLDocumentParser.h in Headers */,
                                BCEF43DD0E674012001C1287 /* NinePieceImage.h in Headers */,
                                14115B5209F84B7100CA4FC1 /* Node.h in Headers */,
                                A7F5D9501384F02D00A29A87 /* NodeRenderingContext.h in Headers */,
                                A74F3EF51678B24F00B05A6E /* NodeRenderingTraversal.h in Headers */,
                                63D7B32D0E78CD3F00F7617C /* NodeRenderStyle.h in Headers */,
+                               E43105BB16750F1600DB2FB8 /* NodeTraversal.h in Headers */,
                                9382AAB40D8C386100F357A6 /* NodeWithIndex.h in Headers */,
+                               BCD3F9831326C93700098A60 /* NonCJKGlyphOrientation.h in Headers */,
                                A8EA7EBE0A1945D000A8EF5F /* Notation.h in Headers */,
                                312C0C41146DC6CC0016C911 /* Notification.h in Headers */,
                                3390CA560FFC157B00921962 /* NotificationCenter.h in Headers */,
                                6EBF0E4912A8926100DB1709 /* OESTextureFloat.h in Headers */,
                                77A17A7212F28182004E02F6 /* OESVertexArrayObject.h in Headers */,
                                FDA3E95A134A49EF008D4B5A /* OfflineAudioCompletionEvent.h in Headers */,
+                               FDA9325E16703B2A008982DC /* OfflineAudioContext.h in Headers */,
                                FDA3E95C134A49EF008D4B5A /* OfflineAudioDestinationNode.h in Headers */,
                                F4EAF4AF10C742B1009100D3 /* OpenTypeSanitizer.h in Headers */,
                                0014628B103CD1DE000B20DB /* OriginAccessEntry.h in Headers */,
                                A80E6CFB0A1989CA007FB8C5 /* Pair.h in Headers */,
                                FD3160A312B026F700C1A359 /* Panner.h in Headers */,
                                FD31601A12B0267600C1A359 /* PannerNode.h in Headers */,
+                               447958041643B49A001E0A7F /* ParsedContentType.h in Headers */,
                                BC76AC130DD7AD5C00415F34 /* ParserUtilities.h in Headers */,
                                F55B3DCA1251F12D003EF269 /* PasswordInputType.h in Headers */,
                                4B2708C70AF19EE40065127F /* Pasteboard.h in Headers */,
                                499B3EDD128DB50200E726C2 /* PlatformCAAnimation.h in Headers */,
                                499B3EC5128CCC4700E726C2 /* PlatformCALayer.h in Headers */,
                                493E5E0912D6420500020081 /* PlatformCALayerClient.h in Headers */,
+                               E1424C8A164B3B4E00F32D40 /* PlatformCookieJar.h in Headers */,
                                BC5C762B1497FE1400BC4775 /* PlatformEvent.h in Headers */,
                                BCAA487014A052530088FAC4 /* PlatformEventFactoryMac.h in Headers */,
                                A723F77B1484CA4C008C6DBE /* PlatformExportMacros.h in Headers */,
                                BCEC01D70C274EB4009F4EC9 /* PlatformScreen.h in Headers */,
                                1AD8F81B11CAB9E900E93E54 /* PlatformStrategies.h in Headers */,
                                935C476B09AC4D4F00A6AAB4 /* PlatformWheelEvent.h in Headers */,
+                               31D591B316697A6C00E6BF02 /* PlugInClient.h in Headers */,
                                A9C6E4F40D745E48006442E9 /* PluginData.h in Headers */,
                                97205ABC1239292700B17380 /* PluginDocument.h in Headers */,
                                1ADA14110E1AE5D900023EE5 /* PluginMainThreadScheduler.h in Headers */,
+                               31D591BC166C2E6C00E6BF02 /* PlugInOriginHash.h in Headers */,
                                1AA8799011CBE846003C664F /* PluginStrategy.h in Headers */,
                                0AFDAC3D10F5448C00E1F3D2 /* PluginViewBase.h in Headers */,
                                BCBB8AB813F1AFB000734DF0 /* PODArena.h in Headers */,
                                37919C240B7D188600A56998 /* PositionIterator.h in Headers */,
                                9746AF3214F4DDE6003E7A70 /* PositionOptions.h in Headers */,
                                C0F2A44113869AAB0066C534 /* preprocessor.pm in Headers */,
+                               986EA88315FFF29000985E5E /* PrerenderClient.h in Headers */,
                                9856F8CD1549E82400B04F3A /* Prerenderer.h in Headers */,
                                9856F8CF1549E82400B04F3A /* PrerendererClient.h in Headers */,
                                9856F8D11549E84F00B04F3A /* PrerenderHandle.h in Headers */,
                                439046E812DA25E800AF80A2 /* RenderMathMLSubSup.h in Headers */,
                                439046EA12DA25E800AF80A2 /* RenderMathMLUnderOver.h in Headers */,
                                E4C279590CF9741900E97B98 /* RenderMedia.h in Headers */,
+                               DEBCCDD216646E8200A452E1 /* RenderMediaControlElements.h in Headers */,
                                41FA303F1316C29C00C0BFC5 /* RenderMediaControls.h in Headers */,
                                ABDDFE7A0A5C6E7000A3E11D /* RenderMenuList.h in Headers */,
                                A454424F119B3687009BE912 /* RenderMeter.h in Headers */,
                                86FF886215DE3D0700BD6B28 /* RenderTextTrackCue.h in Headers */,
                                BCEA488A097D93020094C9E4 /* RenderTheme.h in Headers */,
                                BCEA4887097D93020094C9E4 /* RenderThemeMac.h in Headers */,
+                               1E50084716516AD800B7E098 /* RenderThemeMacShared.h in Headers */,
                                93F1998C08245E59001E9ABC /* RenderTreeAsText.h in Headers */,
                                E44614520CD68A3500FADA75 /* RenderVideo.h in Headers */,
                                BCEA4868097D93020094C9E4 /* RenderView.h in Headers */,
                                0F605AED15F94848004DF0C0 /* ScrollingConstraints.h in Headers */,
                                1AF62EE814DA22A70041556C /* ScrollingCoordinator.h in Headers */,
                                9391A991162746CB00297330 /* ScrollingCoordinatorMac.h in Headers */,
+                               93C38BFF164473C700091EB2 /* ScrollingStateFixedNode.h in Headers */,
                                931CBD0D161A44E900E4C874 /* ScrollingStateNode.h in Headers */,
                                931CBD0F161A44E900E4C874 /* ScrollingStateScrollingNode.h in Headers */,
+                               0FB8890F167D30160010CDA5 /* ScrollingStateStickyNode.h in Headers */,
                                931CBD11161A44E900E4C874 /* ScrollingStateTree.h in Headers */,
                                1AF62F2614DAFEA10041556C /* ScrollingThread.h in Headers */,
                                1AAADDA414DB409F00AF64B3 /* ScrollingTree.h in Headers */,
+                               93C38C03164473DD00091EB2 /* ScrollingTreeFixedNode.h in Headers */,
                                1AAADDE414DC8C8F00AF64B3 /* ScrollingTreeNode.h in Headers */,
                                9391A99D1629D70000297330 /* ScrollingTreeScrollingNode.h in Headers */,
                                93C4A4151629DF5A00C3EB6E /* ScrollingTreeScrollingNodeMac.h in Headers */,
+                               0FB8890A167D2FA10010CDA5 /* ScrollingTreeStickyNode.h in Headers */,
                                93C09C860B0657AA005ABD4D /* ScrollTypes.h in Headers */,
                                BC6D6E2609AF943500F59759 /* ScrollView.h in Headers */,
                                F55B3DD21251F12D003EF269 /* SearchInputType.h in Headers */,
                                371F4FFC0D25E7F300ECE0D5 /* SegmentedFontData.h in Headers */,
                                B2C3DA2F0D006C1D00EF6F26 /* SegmentedString.h in Headers */,
                                E44B4BB4141650D7002B1D8B /* SelectorChecker.h in Headers */,
+                               415071581685067300C3C7B3 /* SelectorFilter.h in Headers */,
                                E45322AC140CE267005A0F92 /* SelectorQuery.h in Headers */,
+                               570B78C01650CE81001DBE1B /* SelectRuleFeatureSet.h in Headers */,
                                A75E497610752ACB00C9B896 /* SerializedScriptValue.h in Headers */,
                                93309E10099E64920056E581 /* SetNodeAttributeCommand.h in Headers */,
                                B8DBDB4C130B0F8A00F5CDB1 /* SetSelectionCommand.h in Headers */,
                                93F1994F08245E59001E9ABC /* Settings.h in Headers */,
+                               53EF766B16530A61004CBE49 /* SettingsMacros.h in Headers */,
                                498770E91242C535002226BA /* Shader.h in Headers */,
                                0F3DD45012F5EA1B000D9190 /* ShadowBlur.h in Headers */,
                                BC5EB8C40E82031B00B25965 /* ShadowData.h in Headers */,
                                5728BD9E1625369600C40B56 /* SiblingTraversalStrategies.h in Headers */,
                                B2C3DA650D006CD600EF6F26 /* SimpleFontData.h in Headers */,
                                C5A1EA7D152BCF08004D00B6 /* SimplifyMarkupCommand.h in Headers */,
+                               31741AAD16636609008A5B7E /* SimulatedClickOptions.h in Headers */,
                                FD00D7A514A3F61900734011 /* SincResampler.h in Headers */,
                                51327D6011A33A2B004F9D65 /* SinkDocument.h in Headers */,
                                49E911CD0EF86D47009D0CAF /* SkewTransformOperation.h in Headers */,
                                650FBF2B0D9AF047008FC292 /* SVGHKernElement.h in Headers */,
                                B25599A40D00D8BA00BB825C /* SVGImage.h in Headers */,
                                08F859D51463F9CD0067D933 /* SVGImageCache.h in Headers */,
+                               AAC08CEF15F933D600F1E188 /* SVGImageChromeClient.h in Headers */,
                                B2227A2D0D00BF220071B782 /* SVGImageElement.h in Headers */,
                                B28C6A2A0D00C44800334AA4 /* SVGImageLoader.h in Headers */,
                                0854B01F1255E4E600B9CDD0 /* SVGInlineFlowBox.h in Headers */,
                                B2227AF60D00BF220071B782 /* SVGZoomAndPan.h in Headers */,
                                B2E4EC980D00C22B00432643 /* SVGZoomEvent.h in Headers */,
                                93E62D9B0985F41600E1B5E3 /* SystemTime.h in Headers */,
+                               5DA97ECD168E787B000E3676 /* SystemVersionMac.h in Headers */,
                                A8CFF0510A154F09000A4234 /* TableLayout.h in Headers */,
                                BCE3BEC30D222B1D007E06E4 /* TagNodeList.h in Headers */,
                                F55B3DD61251F12D003EF269 /* TelephoneInputType.h in Headers */,
                                CECADFCE1537791D00E37068 /* TextInsertionBaseCommand.h in Headers */,
                                93309E1C099E64920056E581 /* TextIterator.h in Headers */,
                                BCEF45E90E687767001C1287 /* TextMetrics.h in Headers */,
-                               BCD3F9831326C93700098A60 /* NonCJKGlyphOrientation.h in Headers */,
                                930FC68A1072B9280045293E /* TextRenderingMode.h in Headers */,
                                93F198F608245E59001E9ABC /* TextResourceDecoder.h in Headers */,
                                A824B4650E2EF2EA0081A7B7 /* TextRun.h in Headers */,
                                E44613B00CD6331000FADA75 /* TimeRanges.h in Headers */,
                                49E912AE0EFAC906009D0CAF /* TimingFunction.h in Headers */,
                                070334D71459FFD5008D8D45 /* TrackBase.h in Headers */,
-                               A12A1050166444FD008FA311 /* GridTrackSize.h in Headers */,
                                49E911C40EF86D47009D0CAF /* TransformationMatrix.h in Headers */,
                                49E911CE0EF86D47009D0CAF /* TransformOperation.h in Headers */,
                                49E911D00EF86D47009D0CAF /* TransformOperations.h in Headers */,
                                A77E1FF014AACB6E005B7CB6 /* TreeScopeAdopter.h in Headers */,
                                1419D2C50CEA6F6100FF507A /* TreeShared.h in Headers */,
                                854FE7390A2297BE0058D7AD /* TreeWalker.h in Headers */,
+                               C375D7FE16639519006184AB /* TypeAhead.h in Headers */,
                                37C28A6810F659CC008C7813 /* TypesettingFeatures.h in Headers */,
                                93309E1A099E64920056E581 /* TypingCommand.h in Headers */,
                                85031B4E0A44EFC700F992E0 /* UIEvent.h in Headers */,
                                BC8BF15A1058141800A40A07 /* UserStyleSheetTypes.h in Headers */,
                                BCDF317C11F8D683003C5BF8 /* UserTypingGestureIndicator.h in Headers */,
                                1FAFBF1915A5FA7400083A20 /* UTIUtilities.h in Headers */,
+                               2E3BBF081162DA1100B9409A /* UUID.h in Headers */,
+                               50D32858163B313F0016111E /* ValidatedCustomFilterOperation.h in Headers */,
                                F5A154281279534D00D0B0C0 /* ValidationMessage.h in Headers */,
                                F513A3EA15FF4841001526DB /* ValidationMessageClient.h in Headers */,
                                15C7708D100D3C6B005BA267 /* ValidityState.h in Headers */,
                                FD3160AF12B026F700C1A359 /* VectorMath.h in Headers */,
                                BCA257151293C010007A263D /* VerticalPositionCache.h in Headers */,
                                CEF418CF1179678C009D112C /* ViewportArguments.h in Headers */,
+                               3FFFF9AE159D9B060020BBD5 /* ViewportStyleResolver.h in Headers */,
                                93309E1E099E64920056E581 /* visible_units.h in Headers */,
                                93309E20099E64920056E581 /* VisiblePosition.h in Headers */,
                                A883DF280F3D045D00F19BF6 /* VisibleSelection.h in Headers */,
                                29A309B11561CAC400BBD8E5 /* VisitedLinks.h in Headers */,
+                               419BC2DF1685329900D64D6D /* VisitedLinkState.h in Headers */,
                                515788C11207852C00A37C4A /* VisitedLinkStrategy.h in Headers */,
                                E44613B60CD6344E00FADA75 /* VoidCallback.h in Headers */,
                                FD7F299213D4C0CB00AD9535 /* WaveShaperDSPKernel.h in Headers */,
                                29CD61DE146D02890068E82A /* WebKitCSSShaderValue.h in Headers */,
                                0562F9471573ECEB0031CA16 /* WebKitCSSSVGDocumentValue.h in Headers */,
                                BC9ADD230CC4032600098C4C /* WebKitCSSTransformValue.h in Headers */,
+                               3FFFF9A9159D9A550020BBD5 /* WebKitCSSViewportRule.h in Headers */,
                                494BD7950F55C8EE00747828 /* WebKitPoint.h in Headers */,
                                31C0FF250E4CEB6E007D6FE5 /* WebKitTransitionEvent.h in Headers */,
                                0FCF332F0F2B9A25004B6795 /* WebLayer.h in Headers */,
                                F55B3DE01251F12D003EF269 /* WeekInputType.h in Headers */,
                                85031B510A44EFC700F992E0 /* WheelEvent.h in Headers */,
                                9380F47409A11AB4001FDB34 /* Widget.h in Headers */,
+                               1411DCB1164C39A800D49BC1 /* WidthCache.h in Headers */,
                                939B02EF0EA2DBC400C54570 /* WidthIterator.h in Headers */,
                                4123E569127B3041000FEEA7 /* WindowEventContext.h in Headers */,
                                BC8243E90D0CFD7500460C8F /* WindowFeatures.h in Headers */,
                                E1BE512E0CF6C512002EA959 /* XSLTUnicodeSort.h in Headers */,
                                977E2E0F12F0FC9C00C13379 /* XSSAuditor.h in Headers */,
                                FD537353137B651800008DCE /* ZeroPole.h in Headers */,
-                               AAC08CEF15F933D600F1E188 /* SVGImageChromeClient.h in Headers */,
-                               AAC08CF315F941FD00F1E188 /* AccessibilitySVGRoot.h in Headers */,
-                               50933350163B0E4300099A60 /* CustomFilterParameterList.h in Headers */,
-                               50D32858163B313F0016111E /* ValidatedCustomFilterOperation.h in Headers */,
-                               3FFFF9AE159D9B060020BBD5 /* ViewportStyleResolver.h in Headers */,
-                               3FFFF9A9159D9A550020BBD5 /* WebKitCSSViewportRule.h in Headers */,
-                               3F2B33EB165AF15600E3987C /* DOMWebKitCSSViewportRule.h in Headers */,
-                               3F2B33ED165AF15600E3987C /* DOMWebKitCSSViewportRuleInternal.h in Headers */,
-                               3F2B33EF165AF15600E3987C /* JSWebKitCSSViewportRule.h in Headers */,
-                               93C38BFF164473C700091EB2 /* ScrollingStateFixedNode.h in Headers */,
-                               93C38C03164473DD00091EB2 /* ScrollingTreeFixedNode.h in Headers */,
-                               E1424C8A164B3B4E00F32D40 /* PlatformCookieJar.h in Headers */,
-                               E1424C94164B52C800F32D40 /* CookieJar.h in Headers */,
-                               1411DCB1164C39A800D49BC1 /* WidthCache.h in Headers */,
-                               570B78C01650CE81001DBE1B /* SelectRuleFeatureSet.h in Headers */,
-                               1E50084716516AD800B7E098 /* RenderThemeMacShared.h in Headers */,
-                               53EF766B16530A61004CBE49 /* SettingsMacros.h in Headers */,
-                               447958041643B49A001E0A7F /* ParsedContentType.h in Headers */,
-                               FB2C15C3165D649D0039C9F8 /* CachedSVGDocumentReference.h in Headers */,
-                               AD6E71AD1668899D00320C13 /* DocumentSharedObjectPool.h in Headers */,
-                               31741AAD16636609008A5B7E /* SimulatedClickOptions.h in Headers */,
-                               15B8B7C91652C5220036EF55 /* JSWebKitCSSMixFunctionValue.h in Headers */,
-                               93F72AF31666EDFC002A02BD /* LayerPool.h in Headers */,
-                               07B442D7166C70B000556CAD /* InbandTextTrackPrivateAVF.h in Headers */,
-                               07AA6B6C166D2C1300D45671 /* InbandTextTrackPrivateAVFObjC.h in Headers */,
-                               07CE77D516712A6A00C55A47 /* InbandTextTrackPrivateClient.h in Headers */,
-                               07941792166E855F009416C2 /* InbandTextTrack.h in Headers */,
-                               07941794166EA04E009416C2 /* InbandTextTrackPrivate.h in Headers */,
-                               DEBCCDD216646E8200A452E1 /* RenderMediaControlElements.h in Headers */,
-                               DEBCCDD416646EAF00A452E1 /* MediaControlElementTypes.h in Headers */,
-                               D66817FB166FE6D700FA07B4 /* HTMLTemplateElement.h in Headers */,
-                               D6489D26166FFCF1007C031B /* JSHTMLTemplateElement.h in Headers */,
-                               31D591B316697A6C00E6BF02 /* PlugInClient.h in Headers */,
-                               31D591BC166C2E6C00E6BF02 /* PlugInOriginHash.h in Headers */,
-                               986EA88315FFF29000985E5E /* PrerenderClient.h in Headers */,
-                               E1513D4F1677EA8300149FCB /* InitializeLogging.h in Headers */,
-                               FDA9325E16703B2A008982DC /* OfflineAudioContext.h in Headers */,
-                               FDA9326716703BA9008982DC /* JSOfflineAudioContext.h in Headers */,
-                               F37A56231679CF7B00C57046 /* HeapGraphSerializer.h in Headers */,
-                               0FB8890A167D2FA10010CDA5 /* ScrollingTreeStickyNode.h in Headers */,
-                               0FB8890F167D30160010CDA5 /* ScrollingStateStickyNode.h in Headers */,
-                               E13EF3441684ECF40034C83F /* NetworkStorageSession.h in Headers */,
-                               415071581685067300C3C7B3 /* SelectorFilter.h in Headers */,
-                               419BC2DF1685329900D64D6D /* VisitedLinkState.h in Headers */,
-                               5DA97ECD168E787B000E3676 /* SystemVersionMac.h in Headers */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        files = (
                                417DA6D913734E6E007C57FB /* Internals.cpp in Sources */,
                                A7BF7EDF14C9175A0014489D /* InternalSettings.cpp in Sources */,
+                               53E29E5E167A8A1900586D3D /* InternalSettingsGenerated.cpp in Sources */,
                                417DA71D13735DFA007C57FB /* JSInternals.cpp in Sources */,
                                A740B5A714C935AF00A77FA4 /* JSInternalSettings.cpp in Sources */,
+                               53ED3FDE167A88E7006762E6 /* JSInternalSettingsGenerated.cpp in Sources */,
                                A740B59714C935AF00A77FA4 /* JSMallocStatistics.cpp in Sources */,
                                EBF5121C1696496C0056BD25 /* JSTypeConversions.cpp in Sources */,
                                41815C1E138319830057AAA4 /* WebCoreTestSupport.cpp in Sources */,
-                               53ED3FDE167A88E7006762E6 /* JSInternalSettingsGenerated.cpp in Sources */,
-                               53E29E5E167A8A1900586D3D /* InternalSettingsGenerated.cpp in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
-                               71B1E1261640491A00B1880A /* InspectorLayerTreeAgent.cpp in Sources */,
                                97BC69DA1505F076001B74AC /* AbstractDatabase.cpp in Sources */,
                                41E1B1D00FF5986900576B3B /* AbstractWorker.cpp in Sources */,
                                0F29C16E1300C2E2002D794E /* AccessibilityAllInOne.cpp in Sources */,
                                FD5686C913AC180200B69C68 /* AsyncAudioDecoder.cpp in Sources */,
                                E1CDE92015018ED000862CC5 /* AsyncFileStream.cpp in Sources */,
                                89D08D9F12228451001241DF /* AsyncFileSystem.cpp in Sources */,
+                               1AA21250163F0DA80000E63F /* AtomicStringCF.cpp in Sources */,
                                A8C4A80E09D563270003AC8D /* Attr.cpp in Sources */,
                                FD629EA4154B47160006D026 /* AudioBasicInspectorNode.cpp in Sources */,
                                FD315FF612B0267600C1A359 /* AudioBasicProcessorNode.cpp in Sources */,
                                BC64B4CB0CB4295D005F2B62 /* CachedFont.cpp in Sources */,
                                51C0AA410F2AA15E001648C2 /* CachedFrame.cpp in Sources */,
                                BCB16C1B0979C3BD00467741 /* CachedImage.cpp in Sources */,
+                               4FC8534C1644272300D1C275 /* CachedMetadata.cpp in Sources */,
                                5101846A0B08602A004A825F /* CachedPage.cpp in Sources */,
                                D0EDA774143E303C0028E383 /* CachedRawResource.cpp in Sources */,
                                BCB16C1F0979C3BD00467741 /* CachedResource.cpp in Sources */,
                                06027CB30B1CC03D00884B2D /* ContextMenuItemMac.mm in Sources */,
                                93B6A0EA0B0BCA8400F5027A /* ContextMenuMac.mm in Sources */,
                                FD31602812B0267600C1A359 /* ConvolverNode.cpp in Sources */,
+                               E1424C93164B52C800F32D40 /* CookieJar.cpp in Sources */,
                                7EE6846212D26E3800E79415 /* CookieJarCFNet.cpp in Sources */,
+                               E1424C90164B460B00F32D40 /* CookieJarMac.mm in Sources */,
                                7EE6846312D26E3800E79415 /* CookieStorageCFNet.cpp in Sources */,
                                E13F01F11270E19000DFBA71 /* CookieStorageMac.mm in Sources */,
                                BC5EB9500E82056B00B25965 /* CounterDirectives.cpp in Sources */,
                                50D405F9147D31F300D30BB5 /* CustomFilterMesh.cpp in Sources */,
                                7E12E91015FA5D3A005E4126 /* CustomFilterMeshGenerator.cpp in Sources */,
                                50CC0A3914C6F5B10017AB51 /* CustomFilterOperation.cpp in Sources */,
+                               5093334F163B0E4300099A60 /* CustomFilterParameterList.cpp in Sources */,
                                503D0CAA14B5B08700F32F57 /* CustomFilterProgram.cpp in Sources */,
                                50D88CB515BDFDAA001809F4 /* CustomFilterProgramInfo.cpp in Sources */,
                                503D0CAA14B5B08700F32F58 /* CustomFilterRenderer.cpp in Sources */,
                                97BC6A201505F081001B74AC /* Database.cpp in Sources */,
                                97BC6A231505F081001B74AC /* DatabaseAuthorizer.cpp in Sources */,
                                97BC6A271505F081001B74AC /* DatabaseContext.cpp in Sources */,
+                               FE456F181677D74E005EDDF9 /* DatabaseManager.cpp in Sources */,
+                               FEDEF84116797108000E444A /* DatabaseStrategy.cpp in Sources */,
                                97BC6A2A1505F081001B74AC /* DatabaseSync.cpp in Sources */,
                                97BC6A2D1505F081001B74AC /* DatabaseTask.cpp in Sources */,
                                97BC6A2F1505F081001B74AC /* DatabaseThread.cpp in Sources */,
                                F55B3DB91251F12D003EF269 /* DateTimeLocalInputType.cpp in Sources */,
                                45861C8516194A7400010F3A /* DateTimeNumericFieldElement.cpp in Sources */,
                                45861C8716194A7400010F3A /* DateTimeSymbolicFieldElement.cpp in Sources */,
+                               FEB26D28167A8F2A00FDD26B /* DBBackendServer.cpp in Sources */,
                                45FEA5CF156DDE8C00654101 /* Decimal.cpp in Sources */,
                                A8C228A211D5722E00D5A7D3 /* DecodedDataDocumentParser.cpp in Sources */,
                                4162A450101145AE00DFF3ED /* DedicatedWorkerContext.cpp in Sources */,
                                CE057FA51220731100A476D5 /* DocumentMarkerController.cpp in Sources */,
                                14947FFD12F80CD200A0F631 /* DocumentOrderedMap.cpp in Sources */,
                                A8C2280E11D4A59700D5A7D3 /* DocumentParser.cpp in Sources */,
+                               AD6E71AC1668899D00320C13 /* DocumentSharedObjectPool.cpp in Sources */,
                                E47E276816036EDC00EE2AFB /* DocumentStyleSheetCollection.cpp in Sources */,
                                0B9056190F2578BE0095FF6A /* DocumentThreadableLoader.cpp in Sources */,
                                A8185F3A09765766005826D9 /* DocumentType.cpp in Sources */,
                                498391510F1E76B400C23782 /* DOMWebKitCSSMatrix.mm in Sources */,
                                8AD0A59714C88358000D83C5 /* DOMWebKitCSSRegionRule.mm in Sources */,
                                31611E620E1C4E1400F6A579 /* DOMWebKitCSSTransformValue.mm in Sources */,
+                               3F2B33EC165AF15600E3987C /* DOMWebKitCSSViewportRule.mm in Sources */,
                                8A195933147EA16E00D1EA61 /* DOMWebKitNamedFlow.mm in Sources */,
                                31C0FF4D0E4CEFDD007D6FE5 /* DOMWebKitTransitionEvent.mm in Sources */,
                                85C7F5E80AAFBAFB004014DD /* DOMWheelEvent.mm in Sources */,
                                A7CFB3D50B7ED1180070C32D /* DragImageMac.mm in Sources */,
                                498770DB1242C535002226BA /* DrawingBuffer.cpp in Sources */,
                                498771531243F9FA002226BA /* DrawingBufferMac.mm in Sources */,
-                               BC7FA6200D1F0CBD00DB22A9 /* LiveNodeList.cpp in Sources */,
                                FD6ED2C7136B8E66003CF072 /* DynamicsCompressor.cpp in Sources */,
                                FD537356137B653B00008DCE /* DynamicsCompressorKernel.cpp in Sources */,
                                FD6ED2C3136B8E42003CF072 /* DynamicsCompressorNode.cpp in Sources */,
                                ED501DC60B249F2900AE18D9 /* EditorMac.mm in Sources */,
                                A8C4A80809D563270003AC8D /* Element.cpp in Sources */,
                                2CF6878814D32EB500340F39 /* ElementAttributeData.cpp in Sources */,
+                               4FFC022D1643B726004E1638 /* ElementRareData.cpp in Sources */,
                                57CF4C8614F7597A00ECFF14 /* ElementShadow.cpp in Sources */,
                                A8CFF6CB0A1561CD000A4234 /* EllipsisBox.cpp in Sources */,
                                F55B3DBB1251F12D003EF269 /* EmailInputType.cpp in Sources */,
                                6E8798BC15F81E4A00BFE4AA /* ExclusionRectangle.cpp in Sources */,
                                6E8798BE15F81E4A00BFE4AA /* ExclusionShape.cpp in Sources */,
                                FD748ABF15BF74ED0059CF0D /* ExclusionShapeInsideInfo.cpp in Sources */,
+                               9A9CEF8D163B3EA100DE7EFE /* ExclusionShapeOutsideInfo.cpp in Sources */,
                                6E67D2A61280E8A4008758F7 /* Extensions3DOpenGL.cpp in Sources */,
                                44DAB5B115A623580097C1E4 /* Extensions3DOpenGLCommon.cpp in Sources */,
                                7728694E14F8882500F484DC /* EXTTextureFilterAnisotropic.cpp in Sources */,
                                974A862214B7ADBB003FDC76 /* FrameDestructionObserver.cpp in Sources */,
                                932E16090AF578340025F408 /* FrameLoader.cpp in Sources */,
                                D000EBA211BDAFD400C47726 /* FrameLoaderStateMachine.cpp in Sources */,
+                               86BA766E166427A8005BE5D1 /* FrameLoadRequest.cpp in Sources */,
                                65BF02450974819000C43196 /* FrameMac.mm in Sources */,
                                93309E0D099E64920056E581 /* FrameSelection.cpp in Sources */,
                                4A8C96EB0BE69032004EEFF0 /* FrameSelectionMac.mm in Sources */,
                                0FA24D79162DF91900A3F4C0 /* GraphicsLayerUpdater.cpp in Sources */,
                                B2A015AA0AF6CD53006BCE0E /* GraphicsTypes.cpp in Sources */,
                                C50B561612119D23008B46E0 /* GroupSettings.cpp in Sources */,
+                               F37A56221679CF7B00C57046 /* HeapGraphSerializer.cpp in Sources */,
                                F55B3DBF1251F12D003EF269 /* HiddenInputType.cpp in Sources */,
                                D6FDAEF3149C06190037B1E1 /* HistogramSupport.cpp in Sources */,
                                BC94D1530C275C8B006BC617 /* History.cpp in Sources */,
                                A81369D5097374F600D74463 /* HTMLFieldSetElement.cpp in Sources */,
                                A8CFF7A20A156978000A4234 /* HTMLFontElement.cpp in Sources */,
                                977B386E122883E900B81FF8 /* HTMLFormattingElementList.cpp in Sources */,
-                               A8DF3FCF097FA0FC0052981B /* HTMLFormControlsCollection.cpp in Sources */,
                                A81369CF097374F600D74463 /* HTMLFormControlElement.cpp in Sources */,
                                E14F1C4414B5DAC600EA9009 /* HTMLFormControlElementWithState.cpp in Sources */,
+                               A8DF3FCF097FA0FC0052981B /* HTMLFormControlsCollection.cpp in Sources */,
                                A81369D1097374F600D74463 /* HTMLFormElement.cpp in Sources */,
                                A871DE230A152AC800B12A68 /* HTMLFrameElement.cpp in Sources */,
                                14FFE31E0AE1963300136BF5 /* HTMLFrameElementBase.cpp in Sources */,
                                A871D4590A127CBC00B12A68 /* HTMLParamElement.cpp in Sources */,
                                BC588B4B0BFA723C00EE679E /* HTMLParserErrorCodes.cpp in Sources */,
                                93E2A306123E9DC0009FE12A /* HTMLParserIdioms.cpp in Sources */,
+                               973F418B169B96030006BF60 /* HTMLParserOptions.cpp in Sources */,
                                977B3870122883E900B81FF8 /* HTMLParserScheduler.cpp in Sources */,
                                A871D4570A127CBC00B12A68 /* HTMLPlugInElement.cpp in Sources */,
                                4415292F0E1AE8A000C4A2D0 /* HTMLPlugInImageElement.cpp in Sources */,
                                A871DB300A150BD600B12A68 /* HTMLTableRowElement.cpp in Sources */,
                                93442CA00D2B336000338FF9 /* HTMLTableRowsCollection.cpp in Sources */,
                                A871DB260A150BD600B12A68 /* HTMLTableSectionElement.cpp in Sources */,
+                               D66817FA166FE6D700FA07B4 /* HTMLTemplateElement.cpp in Sources */,
                                A81369D7097374F600D74463 /* HTMLTextAreaElement.cpp in Sources */,
                                9BC6C21C13CCC97B008E0337 /* HTMLTextFormControlElement.cpp in Sources */,
                                A871DC290A15205700B12A68 /* HTMLTitleElement.cpp in Sources */,
                                B275355F0B053814002CE64F /* ImageSourceCG.cpp in Sources */,
                                4B3480930EEF50D400AC1B41 /* ImageSourceCGMac.mm in Sources */,
                                316FE1170E6E1DA700BF6088 /* ImplicitAnimation.cpp in Sources */,
+                               07941791166E855F009416C2 /* InbandTextTrack.cpp in Sources */,
+                               07B442D6166C70B000556CAD /* InbandTextTrackPrivateAVF.cpp in Sources */,
+                               07AA6B6B166D2C0700D45671 /* InbandTextTrackPrivateAVFObjC.mm in Sources */,
                                DB23C2CB0A508D29002489EB /* IndentOutdentCommand.cpp in Sources */,
                                F3644AFF1119805900E0D537 /* InjectedScript.cpp in Sources */,
                                AAB6054E15874C58007B5031 /* InjectedScriptBase.cpp in Sources */,
                                7ACD88D314C08BD60084EDD2 /* InspectorIndexedDBAgent.cpp in Sources */,
                                4D273CF91669420800259CA1 /* InspectorInputAgent.cpp in Sources */,
                                20D629261253690B00081543 /* InspectorInstrumentation.cpp in Sources */,
+                               71B1E1261640491A00B1880A /* InspectorLayerTreeAgent.cpp in Sources */,
                                7AA51DD5148506A900AD2752 /* InspectorMemoryAgent.cpp in Sources */,
                                7C522D4B15B477E8009B7C95 /* InspectorOverlay.cpp in Sources */,
                                4F6FDD641341DEDD001F8EE3 /* InspectorPageAgent.cpp in Sources */,
                                BC124EFF0C26447A009E2349 /* JSBarInfo.cpp in Sources */,
                                BC946346107A934B00857193 /* JSBeforeLoadEvent.cpp in Sources */,
                                FDF09DC81399B62200688E5B /* JSBiquadFilterNode.cpp in Sources */,
+                               FD8AA63C1695148E00D2EA68 /* JSBiquadFilterNodeCustom.cpp in Sources */,
                                2E2D99CD10E2BBDA00496337 /* JSBlob.cpp in Sources */,
                                8931DE5B14C44C44000DC9D2 /* JSBlobCustom.cpp in Sources */,
                                1449E287107D4DB400B5793F /* JSCallbackData.cpp in Sources */,
                                FE700DD10F92D81A008E2BFE /* JSCoordinatesCustom.cpp in Sources */,
                                930705D809E0C9B700B17FE4 /* JSCounter.cpp in Sources */,
                                975CA2A11303679D00E99AD9 /* JSCrypto.cpp in Sources */,
+                               209B456B16796A7E00E54E4E /* JSCryptoCustom.cpp in Sources */,
                                BC46C1FA0C0DDC8F0020CFC3 /* JSCSSCharsetRule.cpp in Sources */,
                                BC46C1FC0C0DDC8F0020CFC3 /* JSCSSFontFaceRule.cpp in Sources */,
                                E1AD14911297337400ACA989 /* JSCSSFontFaceRuleCustom.cpp in Sources */,
                                BC06EE040BFD71AA00856E9D /* JSHTMLTableElement.cpp in Sources */,
                                BC06ED9F0BFD660600856E9D /* JSHTMLTableRowElement.cpp in Sources */,
                                BC06ED060BFD5BAE00856E9D /* JSHTMLTableSectionElement.cpp in Sources */,
+                               D6489D25166FFCF1007C031B /* JSHTMLTemplateElement.cpp in Sources */,
+                               D6F7960D166FFECE0076DD18 /* JSHTMLTemplateElementCustom.cpp in Sources */,
                                A80E7E9E0A1A83E3007FB8C5 /* JSHTMLTextAreaElement.cpp in Sources */,
                                A80E7B130A19D606007FB8C5 /* JSHTMLTitleElement.cpp in Sources */,
                                070756D314239A4E00414161 /* JSHTMLTrackElement.cpp in Sources */,
                                6EBF0E7612A9868800DB1709 /* JSOESTextureFloat.cpp in Sources */,
                                77A17AA612F28B2A004E02F6 /* JSOESVertexArrayObject.cpp in Sources */,
                                FDF6BAF8134A4C9800822920 /* JSOfflineAudioCompletionEvent.cpp in Sources */,
+                               FDA9326616703BA9008982DC /* JSOfflineAudioContext.cpp in Sources */,
                                FDEA6242152102E200479DF0 /* JSOscillatorNode.cpp in Sources */,
+                               FDBD1DFC167FE27D0051A11E /* JSOscillatorNodeCustom.cpp in Sources */,
                                1A0D57400A5C7867007EDD4C /* JSOverflowEvent.cpp in Sources */,
                                E1284BB210449FFA00EAEB52 /* JSPageTransitionEvent.cpp in Sources */,
                                FDA15EB112B03EE1003A583A /* JSPannerNode.cpp in Sources */,
+                               FD8AA63E169514A700D2EA68 /* JSPannerNodeCustom.cpp in Sources */,
                                8A9A587411E84C81008ACFD1 /* JSPerformance.cpp in Sources */,
                                8A9A587011E84C36008ACFD1 /* JSPerformanceNavigation.cpp in Sources */,
                                8A9A588711E84F37008ACFD1 /* JSPerformanceTiming.cpp in Sources */,
                                316FE0730E6CCBEE00BF6088 /* JSWebKitCSSKeyframesRule.cpp in Sources */,
                                E1AD14B5129734CA00ACA989 /* JSWebKitCSSKeyframesRuleCustom.cpp in Sources */,
                                4983913F0F1E767500C23782 /* JSWebKitCSSMatrix.cpp in Sources */,
+                               15B8B7C81652C5220036EF55 /* JSWebKitCSSMixFunctionValue.cpp in Sources */,
                                8AD0A59414C88336000D83C5 /* JSWebKitCSSRegionRule.cpp in Sources */,
                                31611E5A0E1C4DE000F6A579 /* JSWebKitCSSTransformValue.cpp in Sources */,
+                               3F2B33EE165AF15600E3987C /* JSWebKitCSSViewportRule.cpp in Sources */,
                                D7613AC414753E5600DB8606 /* JSWebKitNamedFlow.cpp in Sources */,
                                494BD79D0F55C94C00747828 /* JSWebKitPoint.cpp in Sources */,
                                BC275B7911C5D1C300C9206C /* JSWebKitPointCustom.cpp in Sources */,
                                9352084509BD43B900F2038D /* Language.mm in Sources */,
                                2917B5611473496C0052C9D0 /* LayerFlushScheduler.cpp in Sources */,
                                2917B566147349950052C9D0 /* LayerFlushSchedulerMac.cpp in Sources */,
+                               93F72AF41666EDFC002A02BD /* LayerPool.mm in Sources */,
                                141DC04F164834B900371E5A /* LayoutBoxExtent.cpp in Sources */,
                                141DC052164834B900371E5A /* LayoutRect.cpp in Sources */,
                                A120ACA413F998CA00FE4AC7 /* LayoutRepainter.cpp in Sources */,
                                A7AD2F870EC89D07008AB002 /* LinkHash.cpp in Sources */,
                                98CE4326129E00BD005821DC /* LinkLoader.cpp in Sources */,
                                985BB96D13A94058007A0B69 /* LinkRelAttribute.cpp in Sources */,
+                               BC7FA6200D1F0CBD00DB22A9 /* LiveNodeList.cpp in Sources */,
                                9759E93E14EF1CF80026A2DD /* LoadableTextTrack.cpp in Sources */,
                                656D37330ADBA5DE00A4554D /* LoaderNSURLExtras.mm in Sources */,
                                7EE6846812D26E3800E79415 /* LoaderRunLoopCF.cpp in Sources */,
+                               51ABF64D16392E2800132A7A /* LoaderStrategy.cpp in Sources */,
                                06E81EEC0AB5DA9700C87837 /* LocalCurrentGraphicsContext.mm in Sources */,
                                F5973DE115CFB2030027F804 /* LocaleMac.mm in Sources */,
                                7633A72713D8B33A008501B6 /* LocaleToScriptMappingDefault.cpp in Sources */,
                                49D5DC2B0F423A73008F20FD /* Matrix3DTransformOperation.cpp in Sources */,
                                49E911C60EF86D47009D0CAF /* MatrixTransformOperation.cpp in Sources */,
                                417253AA1354BBBC00360F2A /* MediaControlElements.cpp in Sources */,
+                               DEBCCDD516646EB200A452E1 /* MediaControlElementTypes.cpp in Sources */,
                                CD27F6E7145770D30078207D /* MediaController.cpp in Sources */,
-                               4157AF8112F1FB0400A8C6F5 /* MediaControlsApple.cpp in Sources */,
                                1F3C3BEA135CAF3C00B8C1AC /* MediaControls.cpp in Sources */,
-                               DEBCCDD516646EB200A452E1 /* MediaControlElementTypes.cpp in Sources */,
+                               4157AF8112F1FB0400A8C6F5 /* MediaControlsApple.cpp in Sources */,
                                97205AB71239291000B17380 /* MediaDocument.cpp in Sources */,
                                FD6F252C13F5EF0E0065165F /* MediaElementAudioSourceNode.cpp in Sources */,
                                4E1959210A39DABA00220FE5 /* MediaFeatureNames.cpp in Sources */,
                                59C27F05138D28C10079B7E2 /* NetworkResourcesData.cpp in Sources */,
                                1A7FA61B0DDA3BBE0028F8A5 /* NetworkStateNotifier.cpp in Sources */,
                                1A7FA6490DDA3CBA0028F8A5 /* NetworkStateNotifierMac.cpp in Sources */,
+                               E13EF34916850C470034C83F /* NetworkStorageSessionCFNet.cpp in Sources */,
                                00CA93B513C6697C00F7FE95 /* NewXMLDocumentParser.cpp in Sources */,
                                BCEF43E00E674110001C1287 /* NinePieceImage.cpp in Sources */,
                                A8C4A80009D563270003AC8D /* Node.cpp in Sources */,
                                854FE7300A2297BE0058D7AD /* NodeFilter.cpp in Sources */,
                                854FE7320A2297BE0058D7AD /* NodeFilterCondition.cpp in Sources */,
                                854FE7340A2297BE0058D7AD /* NodeIterator.cpp in Sources */,
+                               4FFC022B1643B710004E1638 /* NodeRareData.cpp in Sources */,
                                A7F5D94F1384F02D00A29A87 /* NodeRenderingContext.cpp in Sources */,
                                A74F3EF31678B24A00B05A6E /* NodeRenderingTraversal.cpp in Sources */,
+                               E43105B816750F0C00DB2FB8 /* NodeTraversal.cpp in Sources */,
                                A8EA7EBF0A1945D000A8EF5F /* Notation.cpp in Sources */,
                                33503CC71017A1B1003B47E1 /* Notification.cpp in Sources */,
                                3390CA550FFC157B00921962 /* NotificationCenter.cpp in Sources */,
                                3128CA68147331520074C72A /* NotificationController.cpp in Sources */,
+                               E1513D511677F08800149FCB /* NotImplemented.cpp in Sources */,
                                1A569D0A0D7E2B82007C3983 /* NP_jsobject.cpp in Sources */,
                                1A569D0D0D7E2B82007C3983 /* npruntime.cpp in Sources */,
                                52F52E1114A0134F00ACC397 /* NSScrollerImpDetails.mm in Sources */,
                                6EBF0E4812A8926100DB1709 /* OESTextureFloat.cpp in Sources */,
                                77A17A7112F28182004E02F6 /* OESVertexArrayObject.cpp in Sources */,
                                FDA3E959134A49EF008D4B5A /* OfflineAudioCompletionEvent.cpp in Sources */,
+                               FDA9325D16703B2A008982DC /* OfflineAudioContext.cpp in Sources */,
                                FDA3E95B134A49EF008D4B5A /* OfflineAudioDestinationNode.cpp in Sources */,
                                F4EAF4AE10C742B1009100D3 /* OpenTypeSanitizer.cpp in Sources */,
                                0014628A103CD1DE000B20DB /* OriginAccessEntry.cpp in Sources */,
                                FFD5B97A135CC97800D5E92A /* PageVisibilityState.cpp in Sources */,
                                FD3160A212B026F700C1A359 /* Panner.cpp in Sources */,
                                FD31601912B0267600C1A359 /* PannerNode.cpp in Sources */,
+                               447958051643B4B2001E0A7F /* ParsedContentType.cpp in Sources */,
                                F55B3DC91251F12D003EF269 /* PasswordInputType.cpp in Sources */,
                                4B2709830AF2E5E00065127F /* PasteboardMac.mm in Sources */,
                                B275357F0B053814002CE64F /* Path.cpp in Sources */,
                                A9C6E4F30D745E48006442E9 /* PluginData.cpp in Sources */,
                                97205ABB1239292700B17380 /* PluginDocument.cpp in Sources */,
                                1ADA14100E1AE5D900023EE5 /* PluginMainThreadScheduler.cpp in Sources */,
+                               31D591BB166C2E6C00E6BF02 /* PlugInOriginHash.cpp in Sources */,
                                76FF17E311235673001D61B5 /* PluginViewNone.cpp in Sources */,
                                B2B1F7160D00CAA8004AEA64 /* PointerEventsHitRules.cpp in Sources */,
                                A1E1154613015C4E0054AC8C /* PointLightSource.cpp in Sources */,
                                439046E712DA25E800AF80A2 /* RenderMathMLSubSup.cpp in Sources */,
                                439046E912DA25E800AF80A2 /* RenderMathMLUnderOver.cpp in Sources */,
                                E4C279580CF9741900E97B98 /* RenderMedia.cpp in Sources */,
-                               41FA303E1316C29C00C0BFC5 /* RenderMediaControls.cpp in Sources */,
                                DE49B309165F2FE10010338D /* RenderMediaControlElements.cpp in Sources */,
+                               41FA303E1316C29C00C0BFC5 /* RenderMediaControls.cpp in Sources */,
                                ABDDFE790A5C6E7000A3E11D /* RenderMenuList.cpp in Sources */,
                                A454424E119B3687009BE912 /* RenderMeter.cpp in Sources */,
                                BC45827F151299C10061A556 /* RenderMultiColumnBlock.cpp in Sources */,
                                86FF886115DE3D0700BD6B28 /* RenderTextTrackCue.cpp in Sources */,
                                BCEA4889097D93020094C9E4 /* RenderTheme.cpp in Sources */,
                                BCEA4888097D93020094C9E4 /* RenderThemeMac.mm in Sources */,
+                               1E50084816516AD800B7E098 /* RenderThemeMacShared.mm in Sources */,
                                93F19AD508245E59001E9ABC /* RenderTreeAsText.cpp in Sources */,
                                E44614510CD68A3500FADA75 /* RenderVideo.cpp in Sources */,
                                BCEA4867097D93020094C9E4 /* RenderView.cpp in Sources */,
                                0F605AEC15F94848004DF0C0 /* ScrollingConstraints.cpp in Sources */,
                                1AF62EE714DA22A70041556C /* ScrollingCoordinator.cpp in Sources */,
                                1AF62EE614DA22A70041556C /* ScrollingCoordinatorMac.mm in Sources */,
+                               93C38BFE164473C700091EB2 /* ScrollingStateFixedNode.cpp in Sources */,
                                931CBD0C161A44E900E4C874 /* ScrollingStateNode.cpp in Sources */,
                                931CBD13161A44F800E4C874 /* ScrollingStateNodeMac.mm in Sources */,
                                931CBD0E161A44E900E4C874 /* ScrollingStateScrollingNode.cpp in Sources */,
+                               0FB8890E167D30160010CDA5 /* ScrollingStateStickyNode.cpp in Sources */,
                                931CBD10161A44E900E4C874 /* ScrollingStateTree.cpp in Sources */,
                                1AF62F2514DAFE9E0041556C /* ScrollingThread.cpp in Sources */,
                                1AF62F2414DAFE910041556C /* ScrollingThreadMac.mm in Sources */,
                                1AAADDA314DB409F00AF64B3 /* ScrollingTree.cpp in Sources */,
+                               93C38C04164473DD00091EB2 /* ScrollingTreeFixedNode.mm in Sources */,
                                1AAADDE314DC8C8F00AF64B3 /* ScrollingTreeNode.cpp in Sources */,
                                9391A99C1629D70000297330 /* ScrollingTreeScrollingNode.cpp in Sources */,
                                93C4A4161629DF5A00C3EB6E /* ScrollingTreeScrollingNodeMac.mm in Sources */,
+                               0FB8890B167D2FA10010CDA5 /* ScrollingTreeStickyNode.mm in Sources */,
                                BC2441C40E8B65D00055320F /* ScrollView.cpp in Sources */,
                                9353676B09AED88B00D35CD6 /* ScrollViewMac.mm in Sources */,
                                F55B3DD11251F12D003EF269 /* SearchInputType.cpp in Sources */,
                                371F4FFD0D25E7F300ECE0D5 /* SegmentedFontData.cpp in Sources */,
                                B2C3DA2E0D006C1D00EF6F26 /* SegmentedString.cpp in Sources */,
                                E44B4BB3141650D7002B1D8B /* SelectorChecker.cpp in Sources */,
+                               415071571685067300C3C7B3 /* SelectorFilter.cpp in Sources */,
                                E45322AB140CE267005A0F92 /* SelectorQuery.cpp in Sources */,
+                               570B78BF1650CE81001DBE1B /* SelectRuleFeatureSet.cpp in Sources */,
                                A75E497710752ACB00C9B896 /* SerializedScriptValue.cpp in Sources */,
                                93309E0F099E64920056E581 /* SetNodeAttributeCommand.cpp in Sources */,
                                B8DBDB4B130B0F8A00F5CDB1 /* SetSelectionCommand.cpp in Sources */,
                                B2227AF50D00BF220071B782 /* SVGZoomAndPan.cpp in Sources */,
                                B2E4EC970D00C22B00432643 /* SVGZoomEvent.cpp in Sources */,
                                6582A16309999D6D00BEEB6D /* SystemTimeMac.cpp in Sources */,
+                               5DA97ECE168E787B000E3676 /* SystemVersionMac.mm in Sources */,
                                BCE3BEC20D222B1D007E06E4 /* TagNodeList.cpp in Sources */,
                                F55B3DD51251F12D003EF269 /* TelephoneInputType.cpp in Sources */,
                                6550B6A5099DF0270090D781 /* Text.cpp in Sources */,
                                9759E94514EF1CF80026A2DD /* TextTrackCueList.cpp in Sources */,
                                076970861463AD8700F502CF /* TextTrackList.cpp in Sources */,
                                B1AD4E7313A12A4600846B27 /* TextTrackLoader.cpp in Sources */,
+                               CD1E7347167BC78E009A885D /* TextTrackRepresentation.cpp in Sources */,
                                498770F01242C535002226BA /* Texture.cpp in Sources */,
                                97BC84A412370DC8000C6161 /* TextViewSourceParser.cpp in Sources */,
                                BCE65D320EAD1211007E4533 /* Theme.cpp in Sources */,
                                14D64B5C134A5B6B00E58FDA /* TreeScope.cpp in Sources */,
                                A77E1FEF14AACB6E005B7CB6 /* TreeScopeAdopter.cpp in Sources */,
                                854FE7380A2297BE0058D7AD /* TreeWalker.cpp in Sources */,
+                               C375D7FD16639519006184AB /* TypeAhead.cpp in Sources */,
                                93309E19099E64920056E581 /* TypingCommand.cpp in Sources */,
                                85031B4D0A44EFC700F992E0 /* UIEvent.cpp in Sources */,
                                93354A3C0B24F8C9003F6DEA /* UIEventWithKeyState.cpp in Sources */,
                                BCDF317B11F8D683003C5BF8 /* UserTypingGestureIndicator.cpp in Sources */,
                                1FAFBF1815A5FA6E00083A20 /* UTIUtilities.mm in Sources */,
                                2E3BBF071162DA1100B9409A /* UUID.cpp in Sources */,
+                               50D32857163B313F0016111E /* ValidatedCustomFilterOperation.cpp in Sources */,
                                F5A154271279534D00D0B0C0 /* ValidationMessage.cpp in Sources */,
                                15C7708E100D3C6B005BA267 /* ValidityState.cpp in Sources */,
                                FD3160AE12B026F700C1A359 /* VectorMath.cpp in Sources */,
                                CEF418CE1179678C009D112C /* ViewportArguments.cpp in Sources */,
+                               3FFFF9AD159D9B060020BBD5 /* ViewportStyleResolver.cpp in Sources */,
                                93309E1D099E64920056E581 /* visible_units.cpp in Sources */,
                                93309E1F099E64920056E581 /* VisiblePosition.cpp in Sources */,
                                A883DF270F3D045D00F19BF6 /* VisibleSelection.cpp in Sources */,
                                29A309B01561CAC400BBD8E5 /* VisitedLinks.cpp in Sources */,
+                               419BC2DE1685329900D64D6D /* VisitedLinkState.cpp in Sources */,
                                FD7F299113D4C0CB00AD9535 /* WaveShaperDSPKernel.cpp in Sources */,
                                FD7F299313D4C0CB00AD9535 /* WaveShaperNode.cpp in Sources */,
                                FD7F299613D4C0CB00AD9535 /* WaveShaperProcessor.cpp in Sources */,
                                FD581FB41520F93B003A7A75 /* WaveTable.cpp in Sources */,
                                29A8124A0FBB9CA900510293 /* WebAccessibilityObjectWrapper.mm in Sources */,
+                               CD7E05221651C28200C1201F /* WebCoreAVFResourceLoader.mm in Sources */,
                                CDC69DDB16371FD4007C38DF /* WebCoreFullScreenPlaceholderView.mm in Sources */,
                                CDC69DD71632026C007C38DF /* WebCoreFullScreenWarningView.mm in Sources */,
                                CD127DED14F3097D00E84779 /* WebCoreFullScreenWindow.mm in Sources */,
                                5038BC0714711CDB0095E0D1 /* WebKitCSSShaderValue.cpp in Sources */,
                                0562F9461573ECEB0031CA16 /* WebKitCSSSVGDocumentValue.cpp in Sources */,
                                BC9ADD800CC4092200098C4C /* WebKitCSSTransformValue.cpp in Sources */,
+                               3FFFF9A8159D9A550020BBD5 /* WebKitCSSViewportRule.cpp in Sources */,
                                1A1414B513A0F0500019996C /* WebKitFontFamilyNames.cpp in Sources */,
                                D7613A501474F13F00DB8606 /* WebKitNamedFlow.cpp in Sources */,
                                31C0FF240E4CEB6E007D6FE5 /* WebKitTransitionEvent.cpp in Sources */,
                                93F19B0508245E59001E9ABC /* XSLTProcessorLibxslt.cpp in Sources */,
                                E1BE512D0CF6C512002EA959 /* XSLTUnicodeSort.cpp in Sources */,
                                977E2E0E12F0FC9C00C13379 /* XSSAuditor.cpp in Sources */,
-                               3FFFF9AD159D9B060020BBD5 /* ViewportStyleResolver.cpp in Sources */,
                                FD537352137B651800008DCE /* ZeroPole.cpp in Sources */,
-                               51ABF64D16392E2800132A7A /* LoaderStrategy.cpp in Sources */,
-                               5093334F163B0E4300099A60 /* CustomFilterParameterList.cpp in Sources */,
-                               1AA21250163F0DA80000E63F /* AtomicStringCF.cpp in Sources */,
-                               50D32857163B313F0016111E /* ValidatedCustomFilterOperation.cpp in Sources */,
-                               3FFFF9A8159D9A550020BBD5 /* WebKitCSSViewportRule.cpp in Sources */,
-                               3F2B33EC165AF15600E3987C /* DOMWebKitCSSViewportRule.mm in Sources */,
-                               3F2B33EE165AF15600E3987C /* JSWebKitCSSViewportRule.cpp in Sources */,
-                               4FFC022B1643B710004E1638 /* NodeRareData.cpp in Sources */,
-                               4FFC022D1643B726004E1638 /* ElementRareData.cpp in Sources */,
-                               93C38BFE164473C700091EB2 /* ScrollingStateFixedNode.cpp in Sources */,
-                               93C38C04164473DD00091EB2 /* ScrollingTreeFixedNode.mm in Sources */,
-                               4FC8534C1644272300D1C275 /* CachedMetadata.cpp in Sources */,
-                               E1424C90164B460B00F32D40 /* CookieJarMac.mm in Sources */,
-                               E1424C93164B52C800F32D40 /* CookieJar.cpp in Sources */,
-                               570B78BF1650CE81001DBE1B /* SelectRuleFeatureSet.cpp in Sources */,
-                               1E50084816516AD800B7E098 /* RenderThemeMacShared.mm in Sources */,
-                               CD7E05221651C28200C1201F /* WebCoreAVFResourceLoader.mm in Sources */,
-                               AD6E71AC1668899D00320C13 /* DocumentSharedObjectPool.cpp in Sources */,
-                               447958051643B4B2001E0A7F /* ParsedContentType.cpp in Sources */,
-                               15B8B7C81652C5220036EF55 /* JSWebKitCSSMixFunctionValue.cpp in Sources */,
-                               86BA766E166427A8005BE5D1 /* FrameLoadRequest.cpp in Sources */,
-                               93F72AF41666EDFC002A02BD /* LayerPool.mm in Sources */,
-                               C375D7FD16639519006184AB /* TypeAhead.cpp in Sources */,
-                               E43105B816750F0C00DB2FB8 /* NodeTraversal.cpp in Sources */,
-                               07B442D6166C70B000556CAD /* InbandTextTrackPrivateAVF.cpp in Sources */,
-                               07AA6B6B166D2C0700D45671 /* InbandTextTrackPrivateAVFObjC.mm in Sources */,
-                               07941791166E855F009416C2 /* InbandTextTrack.cpp in Sources */,
-                               D66817FA166FE6D700FA07B4 /* HTMLTemplateElement.cpp in Sources */,
-                               D6489D25166FFCF1007C031B /* JSHTMLTemplateElement.cpp in Sources */,
-                               D6F7960D166FFECE0076DD18 /* JSHTMLTemplateElementCustom.cpp in Sources */,
-                               31D591BB166C2E6C00E6BF02 /* PlugInOriginHash.cpp in Sources */,
-                               E1513D511677F08800149FCB /* NotImplemented.cpp in Sources */,
-                               FDA9325D16703B2A008982DC /* OfflineAudioContext.cpp in Sources */,
-                               FDA9326616703BA9008982DC /* JSOfflineAudioContext.cpp in Sources */,
-                               FE456F181677D74E005EDDF9 /* DatabaseManager.cpp in Sources */,
-                               FEDEF84116797108000E444A /* DatabaseStrategy.cpp in Sources */,
-                               FEB26D28167A8F2A00FDD26B /* DBBackendServer.cpp in Sources */,
-                               F37A56221679CF7B00C57046 /* HeapGraphSerializer.cpp in Sources */,
-                               CD1E7347167BC78E009A885D /* TextTrackRepresentation.cpp in Sources */,
-                               9A9CEF8D163B3EA100DE7EFE /* ExclusionShapeOutsideInfo.cpp in Sources */,
-                               0FB8890B167D2FA10010CDA5 /* ScrollingTreeStickyNode.mm in Sources */,
-                               0FB8890E167D30160010CDA5 /* ScrollingStateStickyNode.cpp in Sources */,
-                               209B456B16796A7E00E54E4E /* JSCryptoCustom.cpp in Sources */,
-                               E13EF34916850C470034C83F /* NetworkStorageSessionCFNet.cpp in Sources */,
-                               415071571685067300C3C7B3 /* SelectorFilter.cpp in Sources */,
-                               419BC2DE1685329900D64D6D /* VisitedLinkState.cpp in Sources */,
-                               5DA97ECE168E787B000E3676 /* SystemVersionMac.mm in Sources */,
-                               FDBD1DFC167FE27D0051A11E /* JSOscillatorNodeCustom.cpp in Sources */,
-                               FD8AA63C1695148E00D2EA68 /* JSBiquadFilterNodeCustom.cpp in Sources */,
-                               FD8AA63E169514A700D2EA68 /* JSPannerNodeCustom.cpp in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
index 5932bb9..48553aa 100644 (file)
@@ -72,9 +72,10 @@ static HTMLTokenizerState::State tokenizerStateForContextElement(Element* contex
 
 HTMLDocumentParser::HTMLDocumentParser(HTMLDocument* document, bool reportErrors)
     : ScriptableDocumentParser(document)
-    , m_tokenizer(HTMLTokenizer::create(usePreHTML5ParserQuirks(document)))
+    , m_options(document)
+    , m_tokenizer(HTMLTokenizer::create(m_options.usePreHTML5ParserQuirks))
     , m_scriptRunner(HTMLScriptRunner::create(document, this))
-    , m_treeBuilder(HTMLTreeBuilder::create(this, document, reportErrors, usePreHTML5ParserQuirks(document), maximumDOMTreeDepth(document)))
+    , m_treeBuilder(HTMLTreeBuilder::create(this, document, reportErrors, m_options))
     , m_parserScheduler(HTMLParserScheduler::create(this))
     , m_xssAuditor(this)
     , m_endWasDelayed(false)
@@ -86,8 +87,9 @@ HTMLDocumentParser::HTMLDocumentParser(HTMLDocument* document, bool reportErrors
 // minimize code duplication between these constructors.
 HTMLDocumentParser::HTMLDocumentParser(DocumentFragment* fragment, Element* contextElement, FragmentScriptingPermission scriptingPermission)
     : ScriptableDocumentParser(fragment->document())
-    , m_tokenizer(HTMLTokenizer::create(usePreHTML5ParserQuirks(fragment->document())))
-    , m_treeBuilder(HTMLTreeBuilder::create(this, fragment, contextElement, scriptingPermission, usePreHTML5ParserQuirks(fragment->document()), maximumDOMTreeDepth(fragment->document())))
+    , m_options(fragment->document())
+    , m_tokenizer(HTMLTokenizer::create(m_options.usePreHTML5ParserQuirks))
+    , m_treeBuilder(HTMLTreeBuilder::create(this, fragment, contextElement, scriptingPermission, m_options))
     , m_xssAuditor(this)
     , m_endWasDelayed(false)
     , m_pumpSessionNestingLevel(0)
@@ -288,7 +290,7 @@ void HTMLDocumentParser::pumpTokenizer(SynchronousMode mode)
     if (isWaitingForScripts()) {
         ASSERT(m_tokenizer->state() == HTMLTokenizerState::DataState);
         if (!m_preloadScanner) {
-            m_preloadScanner = adoptPtr(new HTMLPreloadScanner(document()));
+            m_preloadScanner = adoptPtr(new HTMLPreloadScanner(document(), m_options));
             m_preloadScanner->appendToEnd(m_input.current());
         }
         m_preloadScanner->scan();
@@ -325,7 +327,7 @@ void HTMLDocumentParser::insert(const SegmentedString& source)
         // Check the document.write() output with a separate preload scanner as
         // the main scanner can't deal with insertions.
         if (!m_insertionPreloadScanner)
-            m_insertionPreloadScanner = adoptPtr(new HTMLPreloadScanner(document()));
+            m_insertionPreloadScanner = adoptPtr(new HTMLPreloadScanner(document(), m_options));
         m_insertionPreloadScanner->appendToEnd(source);
         m_insertionPreloadScanner->scan();
     }
@@ -549,18 +551,6 @@ void HTMLDocumentParser::parseDocumentFragment(const String& source, DocumentFra
     parser->detach(); // Allows ~DocumentParser to assert it was detached before destruction.
 }
     
-bool HTMLDocumentParser::usePreHTML5ParserQuirks(Document* document)
-{
-    ASSERT(document);
-    return document->settings() && document->settings()->usePreHTML5ParserQuirks();
-}
-
-unsigned HTMLDocumentParser::maximumDOMTreeDepth(Document* document)
-{
-    ASSERT(document);
-    return document->settings() ? document->settings()->maximumHTMLParserDOMTreeDepth() : Settings::defaultMaximumHTMLParserDOMTreeDepth;
-}
-
 void HTMLDocumentParser::suspendScheduledTasks()
 {
     if (m_parserScheduler)
index ce108f4..86ba8b7 100644 (file)
@@ -29,6 +29,7 @@
 #include "CachedResourceClient.h"
 #include "FragmentScriptingPermission.h"
 #include "HTMLInputStream.h"
+#include "HTMLParserOptions.h"
 #include "HTMLScriptRunnerHost.h"
 #include "HTMLSourceTracker.h"
 #include "HTMLToken.h"
@@ -66,9 +67,6 @@ public:
     void resumeParsingAfterYield();
 
     static void parseDocumentFragment(const String&, DocumentFragment*, Element* contextElement, FragmentScriptingPermission = AllowScriptingContent);
-    
-    static bool usePreHTML5ParserQuirks(Document*);
-    static unsigned maximumDOMTreeDepth(Document*);
 
     HTMLTokenizer* tokenizer() const { return m_tokenizer.get(); }
     String sourceForToken(const HTMLToken&);
@@ -137,6 +135,7 @@ private:
     bool inPumpSession() const { return m_pumpSessionNestingLevel > 0; }
     bool shouldDelayEnd() const { return inPumpSession() || isWaitingForScripts() || isScheduledForResume() || isExecutingScript(); }
 
+    HTMLParserOptions m_options;
     HTMLInputStream m_input;
 
     // We hold m_token here because it might be partially complete.
diff --git a/Source/WebCore/html/parser/HTMLParserOptions.cpp b/Source/WebCore/html/parser/HTMLParserOptions.cpp
new file mode 100644 (file)
index 0000000..86466fa
--- /dev/null
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2013 Google, Inc. All Rights Reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY GOOGLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL GOOGLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "HTMLParserOptions.h"
+
+#include "Document.h"
+#include "Settings.h"
+
+namespace WebCore {
+
+HTMLParserOptions::HTMLParserOptions(Document* document)
+{
+    ASSERT(document);
+    Settings* settings = document->settings();
+    usePreHTML5ParserQuirks = settings && settings->usePreHTML5ParserQuirks();
+    maximumDOMTreeDepth = settings ? settings->maximumHTMLParserDOMTreeDepth() : Settings::defaultMaximumHTMLParserDOMTreeDepth;
+}
+
+}
diff --git a/Source/WebCore/html/parser/HTMLParserOptions.h b/Source/WebCore/html/parser/HTMLParserOptions.h
new file mode 100644 (file)
index 0000000..5ffdc25
--- /dev/null
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2013 Google, Inc. All Rights Reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY GOOGLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL GOOGLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef HTMLParserOptions_h
+#define HTMLParserOptions_h
+
+namespace WebCore {
+
+class Document;
+
+class HTMLParserOptions {
+public:
+    bool usePreHTML5ParserQuirks;
+    unsigned maximumDOMTreeDepth;
+
+    HTMLParserOptions()
+        : usePreHTML5ParserQuirks(false)
+        , maximumDOMTreeDepth(0)
+    {
+    }
+
+    explicit HTMLParserOptions(Document*);
+};
+
+}
+
+#endif
index 69aa109..dbaef03 100644 (file)
@@ -34,6 +34,7 @@
 #include "HTMLTokenizer.h"
 #include "HTMLNames.h"
 #include "HTMLParserIdioms.h"
+#include "HTMLParserOptions.h"
 #include "InputTypeNames.h"
 #include "LinkRelAttribute.h"
 #include "MediaList.h"
@@ -161,10 +162,10 @@ private:
     bool m_inputIsImage;
 };
 
-HTMLPreloadScanner::HTMLPreloadScanner(Document* document)
+HTMLPreloadScanner::HTMLPreloadScanner(Document* document, const HTMLParserOptions& options)
     : m_document(document)
     , m_cssScanner(document)
-    , m_tokenizer(HTMLTokenizer::create(HTMLDocumentParser::usePreHTML5ParserQuirks(document)))
+    , m_tokenizer(HTMLTokenizer::create(options.usePreHTML5ParserQuirks))
     , m_inStyle(false)
 {
 }
index f547207..81af124 100644 (file)
@@ -34,6 +34,7 @@
 namespace WebCore {
 
 class Document;
+class HTMLParserOptions;
 class HTMLToken;
 class HTMLTokenizer;
 class SegmentedString;
@@ -41,7 +42,7 @@ class SegmentedString;
 class HTMLPreloadScanner {
     WTF_MAKE_NONCOPYABLE(HTMLPreloadScanner); WTF_MAKE_FAST_ALLOCATED;
 public:
-    explicit HTMLPreloadScanner(Document*);
+    HTMLPreloadScanner(Document*, const HTMLParserOptions&);
 
     void appendToEnd(const SegmentedString&);
     void scan();
index d8757bc..0f4d551 100644 (file)
@@ -270,32 +270,32 @@ private:
 };
 
 
-HTMLTreeBuilder::HTMLTreeBuilder(HTMLDocumentParser* parser, HTMLDocument* document, bool, bool usePreHTML5ParserQuirks, unsigned maximumDOMTreeDepth)
+HTMLTreeBuilder::HTMLTreeBuilder(HTMLDocumentParser* parser, HTMLDocument* document, bool, const HTMLParserOptions& options)
     : m_framesetOk(true)
     , m_document(document)
-    , m_tree(document, maximumDOMTreeDepth)
+    , m_tree(document, options.maximumDOMTreeDepth)
     , m_insertionMode(InitialMode)
     , m_originalInsertionMode(InitialMode)
     , m_shouldSkipLeadingNewline(false)
     , m_parser(parser)
     , m_scriptToProcessStartPosition(uninitializedPositionValue1())
-    , m_usePreHTML5ParserQuirks(usePreHTML5ParserQuirks)
+    , m_options(options)
 {
 }
 
 // FIXME: Member variables should be grouped into self-initializing structs to
 // minimize code duplication between these constructors.
-HTMLTreeBuilder::HTMLTreeBuilder(HTMLDocumentParser* parser, DocumentFragment* fragment, Element* contextElement, FragmentScriptingPermission scriptingPermission, bool usePreHTML5ParserQuirks, unsigned maximumDOMTreeDepth)
+HTMLTreeBuilder::HTMLTreeBuilder(HTMLDocumentParser* parser, DocumentFragment* fragment, Element* contextElement, FragmentScriptingPermission scriptingPermission, const HTMLParserOptions& options)
     : m_framesetOk(true)
     , m_fragmentContext(fragment, contextElement, scriptingPermission)
     , m_document(fragment->document())
-    , m_tree(fragment, scriptingPermission, maximumDOMTreeDepth)
+    , m_tree(fragment, scriptingPermission, options.maximumDOMTreeDepth)
     , m_insertionMode(InitialMode)
     , m_originalInsertionMode(InitialMode)
     , m_shouldSkipLeadingNewline(false)
     , m_parser(parser)
     , m_scriptToProcessStartPosition(uninitializedPositionValue1())
-    , m_usePreHTML5ParserQuirks(usePreHTML5ParserQuirks)
+    , m_options(options)
 {
     ASSERT(isMainThread());
     // FIXME: This assertion will become invalid if <http://webkit.org/b/60316> is fixed.
@@ -2185,7 +2185,7 @@ void HTMLTreeBuilder::processEndTag(AtomicHTMLToken* token)
             // self-closing script tag was encountered and pre-HTML5 parser
             // quirks are enabled. We must set the tokenizer's state to
             // DataState explicitly if the tokenizer didn't have a chance to.
-            ASSERT(m_parser->tokenizer()->state() == HTMLTokenizerState::DataState || m_usePreHTML5ParserQuirks);
+            ASSERT(m_parser->tokenizer()->state() == HTMLTokenizerState::DataState || m_options.usePreHTML5ParserQuirks);
             m_parser->tokenizer()->setState(HTMLTokenizerState::DataState);
             return;
         }
@@ -2704,7 +2704,7 @@ bool HTMLTreeBuilder::processStartTagForInHead(AtomicHTMLToken* token)
     }
     if (token->name() == scriptTag) {
         processScriptStartTag(token);
-        if (m_usePreHTML5ParserQuirks && token->selfClosing())
+        if (m_options.usePreHTML5ParserQuirks && token->selfClosing())
             processFakeEndTag(scriptTag);
         return true;
     }
index 64a09a3..3914d5b 100644 (file)
@@ -31,6 +31,7 @@
 #include "HTMLConstructionSite.h"
 #include "HTMLElementStack.h"
 #include "HTMLFormattingElementList.h"
+#include "HTMLParserOptions.h"
 #include "HTMLTokenizer.h"
 #include <wtf/Noncopyable.h>
 #include <wtf/OwnPtr.h>
@@ -57,13 +58,13 @@ class HTMLDocumentParser;
 class HTMLTreeBuilder {
     WTF_MAKE_NONCOPYABLE(HTMLTreeBuilder); WTF_MAKE_FAST_ALLOCATED;
 public:
-    static PassOwnPtr<HTMLTreeBuilder> create(HTMLDocumentParser* parser, HTMLDocument* document, bool reportErrors, bool usePreHTML5ParserQuirks, unsigned maximumDOMTreeDepth)
+    static PassOwnPtr<HTMLTreeBuilder> create(HTMLDocumentParser* parser, HTMLDocument* document, bool reportErrors, const HTMLParserOptions& options)
     {
-        return adoptPtr(new HTMLTreeBuilder(parser, document, reportErrors, usePreHTML5ParserQuirks, maximumDOMTreeDepth));
+        return adoptPtr(new HTMLTreeBuilder(parser, document, reportErrors, options));
     }
-    static PassOwnPtr<HTMLTreeBuilder> create(HTMLDocumentParser* parser, DocumentFragment* fragment, Element* contextElement, FragmentScriptingPermission scriptingPermission, bool usePreHTML5ParserQuirks, unsigned maximumDOMTreeDepth)
+    static PassOwnPtr<HTMLTreeBuilder> create(HTMLDocumentParser* parser, DocumentFragment* fragment, Element* contextElement, FragmentScriptingPermission scriptingPermission, const HTMLParserOptions& options)
     {
-        return adoptPtr(new HTMLTreeBuilder(parser, fragment, contextElement, scriptingPermission, usePreHTML5ParserQuirks, maximumDOMTreeDepth));
+        return adoptPtr(new HTMLTreeBuilder(parser, fragment, contextElement, scriptingPermission, options));
     }
     ~HTMLTreeBuilder();
 
@@ -123,8 +124,8 @@ private:
         AfterAfterFramesetMode,
     };
 
-    HTMLTreeBuilder(HTMLDocumentParser*, HTMLDocument*, bool reportErrors, bool usePreHTML5ParserQuirks, unsigned maximumDOMTreeDepth);
-    HTMLTreeBuilder(HTMLDocumentParser*, DocumentFragment*, Element* contextElement, FragmentScriptingPermission, bool usePreHTML5ParserQuirks, unsigned maximumDOMTreeDepth);
+    HTMLTreeBuilder(HTMLDocumentParser*, HTMLDocument*, bool reportErrors, const HTMLParserOptions&);
+    HTMLTreeBuilder(HTMLDocumentParser*, DocumentFragment*, Element* contextElement, FragmentScriptingPermission, const HTMLParserOptions&);
 
     void processToken(AtomicHTMLToken*);
 
@@ -249,7 +250,7 @@ private:
     RefPtr<Element> m_scriptToProcess; // <script> tag which needs processing before resuming the parser.
     TextPosition m_scriptToProcessStartPosition; // Starting line number of the script tag needing processing.
 
-    bool m_usePreHTML5ParserQuirks;
+    HTMLParserOptions m_options;
 };
 
 }
index 0e31fc9..5a55853 100644 (file)
 
 #include "HTMLDocumentParser.h"
 #include "HTMLNames.h"
+#include "HTMLParserOptions.h"
 #include "HTMLViewSourceDocument.h"
 
 namespace WebCore {
 
 HTMLViewSourceParser::HTMLViewSourceParser(HTMLViewSourceDocument* document)
     : DecodedDataDocumentParser(document)
-    , m_tokenizer(HTMLTokenizer::create(HTMLDocumentParser::usePreHTML5ParserQuirks(document)))
+    , m_tokenizer(HTMLTokenizer::create(HTMLParserOptions(document).usePreHTML5ParserQuirks))
 {
 }