Attachment 367500 Details for Bug 182512 – Patch

[patch] Patch

bug-182512.diff (text/plain), 101.79 KB, created by Don Olmstead on 2019-04-15 23:18:18 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Don Olmstead

Created: 2019-04-15 23:18:18 PDT

Size: 101.79 KB

patch

obsolete

>diff --git a/Source/WebCore/CMakeLists.txt b/Source/WebCore/CMakeLists.txt
>index 9a66248a601..443d8615fbb 100644
>--- a/Source/WebCore/CMakeLists.txt
>+++ b/Source/WebCore/CMakeLists.txt
>@@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 2.8.12)
> 
> include(WebKitCommon)
> include(WebCoreMacros.cmake)
>+include(Headers.cmake)
> 
> set_property(DIRECTORY . PROPERTY FOLDER "WebCore")
> 
>@@ -15,14 +16,14 @@ list(APPEND WebCore_UNIFIED_SOURCE_LIST_FILES
>     "Sources.txt"
> )
> 
>-set(WebCore_PRIVATE_INCLUDE_DIRECTORIES
>-    "${CMAKE_BINARY_DIR}"
>-)
>-
> set(WebCore_INCLUDE_DIRECTORIES
>-    "${WebCore_DERIVED_SOURCES_DIR}"
>     "${JavaScriptCore_PRIVATE_FRAMEWORK_HEADERS_DIR}"
>     "${PAL_FRAMEWORK_HEADERS_DIR}"
>+)
>+
>+set(WebCore_PRIVATE_INCLUDE_DIRECTORIES
>+    "${CMAKE_BINARY_DIR}"
>+    "${WebCore_DERIVED_SOURCES_DIR}"
>     "${WEBCORE_DIR}"
>     "${WEBCORE_DIR}/Modules/airplay"
>     "${WEBCORE_DIR}/Modules/applepay"
>@@ -1142,7 +1143,7 @@ else ()
> endif ()
> 
> if (ENABLE_GAMEPAD)
>-    list(APPEND WebCore_INCLUDE_DIRECTORIES
>+    list(APPEND WebCore_PRIVATE_INCLUDE_DIRECTORIES
>         "${WEBCORE_DIR}/Modules/gamepad"
>     )
> 
>@@ -1487,7 +1488,7 @@ if (ENABLE_GRAPHICS_CONTEXT_3D)
>         endif ()
>     endif ()
> 
>-    list(APPEND WebCore_INCLUDE_DIRECTORIES
>+    list(APPEND WebCore_PRIVATE_INCLUDE_DIRECTORIES
>         "${ANGLE_FORWARDING_HEADERS_DIR}"
>         "${WEBCORE_DIR}/platform/graphics/gpu"
>     )
>@@ -1649,39 +1650,39 @@ if (ENABLE_USER_MESSAGE_HANDLERS)
> endif ()
> 
> if (USE_OPENVR)
>-  list(APPEND WebCore_INCLUDE_DIRECTORIES "${THIRDPARTY_DIR}/openvr/headers")
>-  list(APPEND WebCore_INCLUDE_DIRECTORIES "${WEBCORE_DIR}/platform/vr/openvr")
>+  list(APPEND WebCore_PRIVATE_INCLUDE_DIRECTORIES "${THIRDPARTY_DIR}/openvr/headers")
>+  list(APPEND WebCore_PRIVATE_INCLUDE_DIRECTORIES "${WEBCORE_DIR}/platform/vr/openvr")
>   list(APPEND WebCore_LIBRARIES openvr_api)
> endif ()
> 
> if (USE_WOFF2)
>-  list(APPEND WebCore_INCLUDE_DIRECTORIES "${WOFF2DEC_INCLUDE_DIRS}")
>-  list(APPEND WebCore_LIBRARIES "${WOFF2DEC_LIBRARIES}")
>+  list(APPEND WebCore_PRIVATE_INCLUDE_DIRECTORIES "${WOFF2DEC_INCLUDE_DIRS}")
>+  list(APPEND WebCore_PRIVATE_LIBRARIES "${WOFF2DEC_LIBRARIES}")
> endif ()
> 
> if (USE_XDGMIME)
>-    list(APPEND WebCore_INCLUDE_DIRECTORIES "${THIRDPARTY_DIR}/xdgmime/src")
>+    list(APPEND WebCore_PRIVATE_INCLUDE_DIRECTORIES "${THIRDPARTY_DIR}/xdgmime/src")
>     list(APPEND WebCore_LIBRARIES xdgmime)
> endif ()
> 
> if (USE_LIBWEBRTC)
>-  list(APPEND WebCore_SYSTEM_INCLUDE_DIRECTORIES "${THIRDPARTY_DIR}/libwebrtc/Source/"
>-      "${THIRDPARTY_DIR}/libwebrtc/Source/webrtc"
>-      "${THIRDPARTY_DIR}/libwebrtc/Source/third_party/abseil-cpp")
>-  list(APPEND WebCore_LIBRARIES webrtc)
>-  list(APPEND WebCore_SOURCES
>-      Modules/mediastream/libwebrtc/LibWebRTCStatsCollector.cpp
>-      Modules/mediastream/libwebrtc/LibWebRTCDataChannelHandler.cpp
>-      Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.cpp
>-      Modules/mediastream/libwebrtc/LibWebRTCPeerConnectionBackend.cpp
>-      Modules/mediastream/libwebrtc/LibWebRTCRtpReceiverBackend.cpp
>-      Modules/mediastream/libwebrtc/LibWebRTCRtpSenderBackend.cpp
>-      Modules/mediastream/libwebrtc/LibWebRTCRtpTransceiverBackend.cpp
>-      Modules/mediastream/libwebrtc/LibWebRTCUtils.cpp
>-      )
>+    list(APPEND WebCore_SYSTEM_INCLUDE_DIRECTORIES "${THIRDPARTY_DIR}/libwebrtc/Source/"
>+        "${THIRDPARTY_DIR}/libwebrtc/Source/webrtc"
>+        "${THIRDPARTY_DIR}/libwebrtc/Source/third_party/abseil-cpp")
>+    list(APPEND WebCore_LIBRARIES webrtc)
>+    list(APPEND WebCore_SOURCES
>+        Modules/mediastream/libwebrtc/LibWebRTCDataChannelHandler.cpp
>+        Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.cpp
>+        Modules/mediastream/libwebrtc/LibWebRTCPeerConnectionBackend.cpp
>+        Modules/mediastream/libwebrtc/LibWebRTCRtpReceiverBackend.cpp
>+        Modules/mediastream/libwebrtc/LibWebRTCRtpSenderBackend.cpp
>+        Modules/mediastream/libwebrtc/LibWebRTCRtpTransceiverBackend.cpp
>+        Modules/mediastream/libwebrtc/LibWebRTCStatsCollector.cpp
>+        Modules/mediastream/libwebrtc/LibWebRTCUtils.cpp
>+    )
> endif ()
> 
>-set(WebCoreTestSupport_INCLUDE_DIRECTORIES
>+set(WebCoreTestSupport_PRIVATE_INCLUDE_DIRECTORIES
>     "${WEBCORE_DIR}/platform/mock"
>     "${WEBCORE_DIR}/testing"
>     "${WEBCORE_DIR}/testing/js"
>@@ -1757,6 +1758,12 @@ set(PAINTWORKLETGLOBALSCOPE_CONSTRUCTORS_FILE ${WebCore_DERIVED_SOURCES_DIR}/Pai
> WEBKIT_FRAMEWORK_DECLARE(WebCore)
> WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
> 
>+WEBKIT_MAKE_FORWARDING_HEADERS(WebCore
>+    TARGET_NAME WebCorePrivateFrameworkHeaders
>+    DESTINATION ${WebCore_PRIVATE_FRAMEWORK_HEADERS_DIR}/WebCore
>+    FILES ${WebCore_PRIVATE_FRAMEWORK_HEADERS}
>+    FLATTENED
>+)
> 
> # Generate CommandLineAPIModuleSource.h
> add_custom_command(
>@@ -2053,7 +2060,6 @@ list(APPEND WebCore_SOURCES ${WebCore_DERIVED_SOURCES_DIR}/XLinkNames.cpp)
> GENERATE_DOM_NAMES(XMLNS ${WEBCORE_DIR}/xml/xmlnsattrs.in)
> list(APPEND WebCore_SOURCES ${WebCore_DERIVED_SOURCES_DIR}/XMLNSNames.cpp)
> 
>-
> GENERATE_DOM_NAMES(XML ${WEBCORE_DIR}/xml/xmlattrs.in)
> list(APPEND WebCore_SOURCES ${WebCore_DERIVED_SOURCES_DIR}/XMLNames.cpp)
> 
>@@ -2066,10 +2072,10 @@ if (MSVC)
>     WEBKIT_ADD_PRECOMPILED_HEADER("WebCorePrefix.h" "WebCorePrefix.cpp" WebCore_SOURCES)
> endif ()
> 
>-
> WEBKIT_FRAMEWORK(WebCore)
> 
> add_dependencies(WebCore WebCoreBindings)
>+add_dependencies(WebCorePrivateFrameworkHeaders WebCoreBindings)
> 
> if (APPLE)
>     set_target_properties(WebCore PROPERTIES LINK_FLAGS "-sub_library libobjc -umbrella WebKit -allowable_client WebCoreTestSupport -allowable_client WebKit2 -allowable_client WebKitLegacy")
>@@ -2099,6 +2105,7 @@ endif ()
> add_library(WebCoreTestSupport ${WebCoreTestSupport_LIBRARY_TYPE} ${WebCoreTestSupport_SOURCES})
> add_dependencies(WebCoreTestSupport WebCore WebCoreTestSupportBindings)
> target_include_directories(WebCoreTestSupport PUBLIC ${WebCoreTestSupport_INCLUDE_DIRECTORIES} ${WebCore_INCLUDE_DIRECTORIES})
>+target_include_directories(WebCoreTestSupport PRIVATE ${WebCoreTestSupport_PRIVATE_INCLUDE_DIRECTORIES} ${WebCore_PRIVATE_INCLUDE_DIRECTORIES})
> target_include_directories(WebCoreTestSupport SYSTEM PUBLIC ${WebCore_SYSTEM_INCLUDE_DIRECTORIES})
> target_link_libraries(WebCoreTestSupport ${WebCoreTestSupport_LIBRARIES})
> 
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index cbc275c9b47..b679d573295 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,29 @@
>+2019-04-15  Don Olmstead  <don.olmstead@sony.com>
>+
>+        [CMake] Make WebCore headers copies
>+        https://bugs.webkit.org/show_bug.cgi?id=182512
>+        <rdar://problem/37510435>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * CMakeLists.txt:
>+        * Headers.cmake: Added.
>+        * PlatformAppleWin.cmake:
>+        * PlatformGTK.cmake:
>+        * PlatformMac.cmake:
>+        * PlatformPlayStation.cmake:
>+        * PlatformWPE.cmake:
>+        * PlatformWin.cmake:
>+        * PlatformWinCairo.cmake:
>+        * platform/Cairo.cmake:
>+        * platform/Curl.cmake:
>+        * platform/FreeType.cmake:
>+        * platform/GStreamer.cmake:
>+        * platform/HolePunch.cmake:
>+        * platform/ImageDecoders.cmake:
>+        * platform/Soup.cmake: Added.
>+        * platform/TextureMapper.cmake:
>+
> 2019-04-15  John Wilander  <wilander@apple.com>
> 
>         Add a query string nonce to LayoutTests/http/tests/adClickAttribution/send-attribution-conversion-request.html to address flakiness
>diff --git a/Source/WebCore/Headers.cmake b/Source/WebCore/Headers.cmake
>new file mode 100644
>index 00000000000..029f129112e
>--- /dev/null
>+++ b/Source/WebCore/Headers.cmake
>@@ -0,0 +1,1461 @@
>+set(WebCore_PRIVATE_FRAMEWORK_HEADERS
>+    Modules/applepay/ApplePaySessionPaymentRequest.h
>+    Modules/applepay/Payment.h
>+    Modules/applepay/PaymentAuthorizationStatus.h
>+    Modules/applepay/PaymentContact.h
>+    Modules/applepay/PaymentCoordinator.h
>+    Modules/applepay/PaymentCoordinatorClient.h
>+    Modules/applepay/PaymentHeaders.h
>+    Modules/applepay/PaymentMerchantSession.h
>+    Modules/applepay/PaymentMethod.h
>+
>+    Modules/applicationmanifest/ApplicationManifest.h
>+    Modules/applicationmanifest/ApplicationManifestParser.h
>+
>+    Modules/cache/CacheQueryOptions.h
>+    Modules/cache/CacheStorageConnection.h
>+    Modules/cache/DOMCacheEngine.h
>+
>+    Modules/encryptedmedia/CDMClient.h
>+
>+    Modules/fetch/FetchBodyConsumer.h
>+    Modules/fetch/FetchBodySource.h
>+    Modules/fetch/FetchHeaders.h
>+    Modules/fetch/FetchIdentifier.h
>+    Modules/fetch/FetchLoader.h
>+    Modules/fetch/FetchLoaderClient.h
>+
>+    Modules/geolocation/Coordinates.h
>+    Modules/geolocation/Geolocation.h
>+    Modules/geolocation/GeolocationClient.h
>+    Modules/geolocation/GeolocationController.h
>+    Modules/geolocation/GeolocationError.h
>+    Modules/geolocation/GeolocationPosition.h
>+    Modules/geolocation/Geoposition.h
>+    Modules/geolocation/PositionCallback.h
>+    Modules/geolocation/PositionError.h
>+    Modules/geolocation/PositionErrorCallback.h
>+    Modules/geolocation/PositionOptions.h
>+
>+    Modules/indexeddb/IDBActiveDOMObject.h
>+    Modules/indexeddb/IDBDatabaseIdentifier.h
>+    Modules/indexeddb/IDBGetAllResult.h
>+    Modules/indexeddb/IDBGetResult.h
>+    Modules/indexeddb/IDBKey.h
>+    Modules/indexeddb/IDBKeyData.h
>+    Modules/indexeddb/IDBKeyPath.h
>+    Modules/indexeddb/IDBKeyRange.h
>+    Modules/indexeddb/IDBKeyRangeData.h
>+    Modules/indexeddb/IDBOpenDBRequest.h
>+    Modules/indexeddb/IDBRequest.h
>+    Modules/indexeddb/IDBTransaction.h
>+    Modules/indexeddb/IDBTransactionMode.h
>+    Modules/indexeddb/IDBValue.h
>+    Modules/indexeddb/IndexedDB.h
>+
>+    Modules/indexeddb/client/IDBConnectionProxy.h
>+    Modules/indexeddb/client/IDBConnectionToServer.h
>+    Modules/indexeddb/client/IDBConnectionToServerDelegate.h
>+    Modules/indexeddb/client/TransactionOperation.h
>+
>+    Modules/indexeddb/server/IDBBackingStore.h
>+    Modules/indexeddb/server/IDBConnectionToClient.h
>+    Modules/indexeddb/server/IDBConnectionToClientDelegate.h
>+    Modules/indexeddb/server/IDBServer.h
>+    Modules/indexeddb/server/ServerOpenDBRequest.h
>+    Modules/indexeddb/server/UniqueIDBDatabase.h
>+    Modules/indexeddb/server/UniqueIDBDatabaseConnection.h
>+    Modules/indexeddb/server/UniqueIDBDatabaseTransaction.h
>+
>+    Modules/indexeddb/shared/IDBCursorInfo.h
>+    Modules/indexeddb/shared/IDBDatabaseInfo.h
>+    Modules/indexeddb/shared/IDBError.h
>+    Modules/indexeddb/shared/IDBGetAllRecordsData.h
>+    Modules/indexeddb/shared/IDBGetRecordData.h
>+    Modules/indexeddb/shared/IDBIndexInfo.h
>+    Modules/indexeddb/shared/IDBIterateCursorData.h
>+    Modules/indexeddb/shared/IDBObjectStoreInfo.h
>+    Modules/indexeddb/shared/IDBRequestData.h
>+    Modules/indexeddb/shared/IDBResourceIdentifier.h
>+    Modules/indexeddb/shared/IDBResultData.h
>+    Modules/indexeddb/shared/IDBTransactionInfo.h
>+    Modules/indexeddb/shared/InProcessIDBServer.h
>+
>+    Modules/mediasession/MediaSessionEvents.h
>+    Modules/mediasession/MediaSessionMetadata.h
>+    Modules/mediasession/WebMediaSessionManager.h
>+    Modules/mediasession/WebMediaSessionManagerClient.h
>+
>+    Modules/mediasource/SampleMap.h
>+
>+    Modules/mediastream/DoubleRange.h
>+    Modules/mediastream/LongRange.h
>+    Modules/mediastream/MediaDevicesEnumerationRequest.h
>+    Modules/mediastream/MediaStreamTrack.h
>+    Modules/mediastream/MediaTrackConstraints.h
>+    Modules/mediastream/RTCController.h
>+    Modules/mediastream/UserMediaClient.h
>+    Modules/mediastream/UserMediaController.h
>+    Modules/mediastream/UserMediaRequest.h
>+
>+    Modules/notifications/Notification.h
>+    Modules/notifications/NotificationClient.h
>+    Modules/notifications/NotificationController.h
>+    Modules/notifications/NotificationDirection.h
>+    Modules/notifications/NotificationPermission.h
>+    Modules/notifications/NotificationPermissionCallback.h
>+
>+    Modules/plugins/PluginReplacement.h
>+    Modules/plugins/YouTubePluginReplacement.h
>+
>+    Modules/streams/ReadableStreamChunk.h
>+    Modules/streams/ReadableStreamSink.h
>+    Modules/streams/ReadableStreamSource.h
>+
>+    Modules/webauthn/AuthenticationExtensionsClientInputs.h
>+    Modules/webauthn/AuthenticatorCoordinator.h
>+    Modules/webauthn/AuthenticatorCoordinatorClient.h
>+    Modules/webauthn/AuthenticatorTransport.h
>+    Modules/webauthn/PublicKeyCredentialCreationOptions.h
>+    Modules/webauthn/PublicKeyCredentialData.h
>+    Modules/webauthn/PublicKeyCredentialDescriptor.h
>+    Modules/webauthn/PublicKeyCredentialRequestOptions.h
>+    Modules/webauthn/PublicKeyCredentialType.h
>+    Modules/webauthn/UserVerificationRequirement.h
>+    Modules/webauthn/WebAuthenticationConstants.h
>+    Modules/webauthn/WebAuthenticationUtils.h
>+
>+    Modules/webauthn/apdu/ApduCommand.h
>+    Modules/webauthn/apdu/ApduResponse.h
>+
>+    Modules/webauthn/cbor/CBORReader.h
>+    Modules/webauthn/cbor/CBORValue.h
>+    Modules/webauthn/cbor/CBORWriter.h
>+
>+    Modules/webauthn/fido/AuthenticatorGetInfoResponse.h
>+    Modules/webauthn/fido/AuthenticatorSupportedOptions.h
>+    Modules/webauthn/fido/DeviceRequestConverter.h
>+    Modules/webauthn/fido/DeviceResponseConverter.h
>+    Modules/webauthn/fido/FidoConstants.h
>+    Modules/webauthn/fido/FidoHidMessage.h
>+    Modules/webauthn/fido/FidoHidPacket.h
>+    Modules/webauthn/fido/U2fCommandConstructor.h
>+    Modules/webauthn/fido/U2fResponseConverter.h
>+
>+    Modules/webdatabase/DatabaseDetails.h
>+    Modules/webdatabase/DatabaseManager.h
>+    Modules/webdatabase/DatabaseManagerClient.h
>+    Modules/webdatabase/DatabaseTracker.h
>+    Modules/webdatabase/OriginLock.h
>+
>+    accessibility/AXObjectCache.h
>+    accessibility/AXTextStateChangeIntent.h
>+    accessibility/AccessibilityListBox.h
>+    accessibility/AccessibilityMenuListPopup.h
>+    accessibility/AccessibilityMockObject.h
>+    accessibility/AccessibilityNodeObject.h
>+    accessibility/AccessibilityObject.h
>+    accessibility/AccessibilityObjectInterface.h
>+    accessibility/AccessibilityRenderObject.h
>+    accessibility/AccessibilityScrollView.h
>+
>+    accessibility/isolatedtree/AXIsolatedTree.h
>+    accessibility/isolatedtree/AXIsolatedTreeNode.h
>+
>+    animation/CSSPropertyBlendingClient.h
>+    animation/CompositeOperation.h
>+    animation/EffectTiming.h
>+    animation/FillMode.h
>+    animation/IterationCompositeOperation.h
>+    animation/KeyframeAnimationOptions.h
>+    animation/KeyframeEffectOptions.h
>+    animation/PlaybackDirection.h
>+
>+    bindings/IDLTypes.h
>+
>+    bindings/js/BufferSource.h
>+    bindings/js/CachedScriptFetcher.h
>+    bindings/js/CommonVM.h
>+    bindings/js/DOMWrapperWorld.h
>+    bindings/js/GCController.h
>+    bindings/js/IDBBindingUtilities.h
>+    bindings/js/JSCSSRuleCustom.h
>+    bindings/js/JSCSSStyleDeclarationCustom.h
>+    bindings/js/JSDOMBinding.h
>+    bindings/js/JSDOMBindingSecurity.h
>+    bindings/js/JSDOMCastedThisErrorBehavior.h
>+    bindings/js/JSDOMConvert.h
>+    bindings/js/JSDOMConvertAny.h
>+    bindings/js/JSDOMConvertBase.h
>+    bindings/js/JSDOMConvertBoolean.h
>+    bindings/js/JSDOMConvertBufferSource.h
>+    bindings/js/JSDOMConvertCallbacks.h
>+    bindings/js/JSDOMConvertDate.h
>+    bindings/js/JSDOMConvertDictionary.h
>+    bindings/js/JSDOMConvertEnumeration.h
>+    bindings/js/JSDOMConvertEventListener.h
>+    bindings/js/JSDOMConvertIndexedDB.h
>+    bindings/js/JSDOMConvertInterface.h
>+    bindings/js/JSDOMConvertJSON.h
>+    bindings/js/JSDOMConvertNull.h
>+    bindings/js/JSDOMConvertNullable.h
>+    bindings/js/JSDOMConvertNumbers.h
>+    bindings/js/JSDOMConvertObject.h
>+    bindings/js/JSDOMConvertRecord.h
>+    bindings/js/JSDOMConvertSequences.h
>+    bindings/js/JSDOMConvertSerializedScriptValue.h
>+    bindings/js/JSDOMConvertStrings.h
>+    bindings/js/JSDOMConvertUnion.h
>+    bindings/js/JSDOMConvertWebGL.h
>+    bindings/js/JSDOMConvertXPathNSResolver.h
>+    bindings/js/JSDOMExceptionHandling.h
>+    bindings/js/JSDOMGlobalObject.h
>+    bindings/js/JSDOMGuardedObject.h
>+    bindings/js/JSDOMOperation.h
>+    bindings/js/JSDOMPromiseDeferred.h
>+    bindings/js/JSDOMWindowBase.h
>+    bindings/js/JSDOMWrapper.h
>+    bindings/js/JSDOMWrapperCache.h
>+    bindings/js/JSDocumentCustom.h
>+    bindings/js/JSElementCustom.h
>+    bindings/js/JSEventCustom.h
>+    bindings/js/JSEventTargetCustom.h
>+    bindings/js/JSExecState.h
>+    bindings/js/JSMediaListCustom.h
>+    bindings/js/JSNodeCustom.h
>+    bindings/js/JSNodeListCustom.h
>+    bindings/js/JSPluginElementFunctions.h
>+    bindings/js/JSStyleSheetCustom.h
>+    bindings/js/JSValueInWrappedObject.h
>+    bindings/js/JSWindowProxy.h
>+    bindings/js/ReadableStreamDefaultController.h
>+    bindings/js/ScriptCachedFrameData.h
>+    bindings/js/ScriptController.h
>+    bindings/js/ScriptState.h
>+    bindings/js/ScriptWrappable.h
>+    bindings/js/ScriptWrappableInlines.h
>+    bindings/js/SerializedScriptValue.h
>+    bindings/js/StringAdaptors.h
>+    bindings/js/WebCoreTypedArrayController.h
>+    bindings/js/WindowProxy.h
>+
>+    bridge/Bridge.h
>+    bridge/IdentifierRep.h
>+    bridge/NP_jsobject.h
>+    bridge/npruntime_impl.h
>+    bridge/npruntime_internal.h
>+    bridge/runtime_method.h
>+    bridge/runtime_object.h
>+    bridge/runtime_root.h
>+
>+    bridge/c/c_instance.h
>+    bridge/c/c_utility.h
>+
>+    bridge/jsc/BridgeJSC.h
>+
>+    bridge/objc/WebScriptObject.h
>+    bridge/objc/WebScriptObjectPrivate.h
>+
>+    contentextensions/CombinedFiltersAlphabet.h
>+    contentextensions/CombinedURLFilters.h
>+    contentextensions/CompiledContentExtension.h
>+    contentextensions/ContentExtension.h
>+    contentextensions/ContentExtensionActions.h
>+    contentextensions/ContentExtensionCompiler.h
>+    contentextensions/ContentExtensionError.h
>+    contentextensions/ContentExtensionParser.h
>+    contentextensions/ContentExtensionRule.h
>+    contentextensions/ContentExtensionsBackend.h
>+    contentextensions/ContentExtensionsDebugging.h
>+    contentextensions/ContentRuleListResults.h
>+    contentextensions/DFA.h
>+    contentextensions/DFABytecode.h
>+    contentextensions/DFABytecodeCompiler.h
>+    contentextensions/DFABytecodeInterpreter.h
>+    contentextensions/DFACombiner.h
>+    contentextensions/DFANode.h
>+    contentextensions/ImmutableNFA.h
>+    contentextensions/ImmutableNFANodeBuilder.h
>+    contentextensions/MutableRange.h
>+    contentextensions/MutableRangeList.h
>+    contentextensions/NFA.h
>+    contentextensions/NFANode.h
>+    contentextensions/NFAToDFA.h
>+    contentextensions/Term.h
>+    contentextensions/URLFilterParser.h
>+
>+    crypto/SerializedCryptoKeyWrap.h
>+
>+    css/CSSCalculationValue.h
>+    css/CSSCustomPropertyValue.h
>+    css/CSSFontFaceRule.h
>+    css/CSSFontFamily.h
>+    css/CSSGroupingRule.h
>+    css/CSSImportRule.h
>+    css/CSSLineBoxContainValue.h
>+    css/CSSMediaRule.h
>+    css/CSSPageRule.h
>+    css/CSSPrimitiveValue.h
>+    css/CSSPrimitiveValueMappings.h
>+    css/CSSProperty.h
>+    css/CSSReflectionDirection.h
>+    css/CSSRegisteredCustomProperty.h
>+    css/CSSRule.h
>+    css/CSSRuleList.h
>+    css/CSSStyleDeclaration.h
>+    css/CSSStyleRule.h
>+    css/CSSStyleSheet.h
>+    css/CSSToLengthConversionData.h
>+    css/CSSUnknownRule.h
>+    css/CSSValue.h
>+    css/CSSValueList.h
>+    css/CSSVariableData.h
>+    css/CSSVariableReferenceValue.h
>+    css/Counter.h
>+    css/DeprecatedCSSOMCounter.h
>+    css/DeprecatedCSSOMPrimitiveValue.h
>+    css/DeprecatedCSSOMRGBColor.h
>+    css/DeprecatedCSSOMRect.h
>+    css/DeprecatedCSSOMValue.h
>+    css/DeprecatedCSSOMValueList.h
>+    css/LengthFunctions.h
>+    css/MediaList.h
>+    css/MediaQueryEvaluator.h
>+    css/MediaQueryExpression.h
>+    css/MediaQueryParserContext.h
>+    css/RGBColor.h
>+    css/Rect.h
>+    css/StyleColor.h
>+    css/StyleProperties.h
>+    css/StyleSheet.h
>+    css/StyleSheetContents.h
>+    css/StyleSheetList.h
>+
>+    css/parser/CSSParser.h
>+    css/parser/CSSParserContext.h
>+    css/parser/CSSParserMode.h
>+    css/parser/CSSParserToken.h
>+    css/parser/CSSParserTokenRange.h
>+
>+    dom/ActiveDOMCallback.h
>+    dom/ActiveDOMObject.h
>+    dom/Attr.h
>+    dom/Attribute.h
>+    dom/CDATASection.h
>+    dom/CallbackResult.h
>+    dom/CharacterData.h
>+    dom/CollectionIndexCache.h
>+    dom/Comment.h
>+    dom/ContainerNode.h
>+    dom/ContextDestructionObserver.h
>+    dom/CustomElementReactionQueue.h
>+    dom/DOMException.h
>+    dom/DOMHighResTimeStamp.h
>+    dom/DOMImplementation.h
>+    dom/DOMPasteAccess.h
>+    dom/DOMRect.h
>+    dom/DOMRectInit.h
>+    dom/DOMRectList.h
>+    dom/DOMRectReadOnly.h
>+    dom/DOMTimeStamp.h
>+    dom/DataTransfer.h
>+    dom/DeviceOrientationClient.h
>+    dom/DeviceOrientationData.h
>+    dom/Document.h
>+    dom/DocumentEventQueue.h
>+    dom/DocumentFragment.h
>+    dom/DocumentIdentifier.h
>+    dom/DocumentMarker.h
>+    dom/DocumentMarkerController.h
>+    dom/DocumentTiming.h
>+    dom/DocumentType.h
>+    dom/Element.h
>+    dom/ElementAncestorIterator.h
>+    dom/ElementChildIterator.h
>+    dom/ElementData.h
>+    dom/ElementDescendantIterator.h
>+    dom/ElementIdentifier.h
>+    dom/ElementIterator.h
>+    dom/ElementIteratorAssertions.h
>+    dom/ElementTraversal.h
>+    dom/Event.h
>+    dom/EventInit.h
>+    dom/EventListener.h
>+    dom/EventListenerMap.h
>+    dom/EventModifierInit.h
>+    dom/EventNames.h
>+    dom/EventQueue.h
>+    dom/EventTarget.h
>+    dom/Exception.h
>+    dom/ExceptionCode.h
>+    dom/ExceptionData.h
>+    dom/ExceptionOr.h
>+    dom/FragmentScriptingPermission.h
>+    dom/GCReachableRef.h
>+    dom/GenericEventQueue.h
>+    dom/InlineStyleSheetOwner.h
>+    dom/KeyboardEvent.h
>+    dom/LiveNodeList.h
>+    dom/LoadableScript.h
>+    dom/MessagePort.h
>+    dom/MessagePortIdentifier.h
>+    dom/MouseEvent.h
>+    dom/MouseEventInit.h
>+    dom/MouseRelatedEvent.h
>+    dom/MutationEvent.h
>+    dom/MutationObserver.h
>+    dom/NameNodeList.h
>+    dom/NamedNodeMap.h
>+    dom/NativeNodeFilter.h
>+    dom/Node.h
>+    dom/NodeConstants.h
>+    dom/NodeFilter.h
>+    dom/NodeFilterCondition.h
>+    dom/NodeIterator.h
>+    dom/NodeList.h
>+    dom/NodeRenderStyle.h
>+    dom/NodeTraversal.h
>+    dom/OverflowEvent.h
>+    dom/PointerID.h
>+    dom/Position.h
>+    dom/ProcessingInstruction.h
>+    dom/ProgressEvent.h
>+    dom/QualifiedName.h
>+    dom/RadioButtonGroups.h
>+    dom/Range.h
>+    dom/RangeBoundaryPoint.h
>+    dom/RegisteredEventListener.h
>+    dom/RenderedDocumentMarker.h
>+    dom/ScriptDisallowedScope.h
>+    dom/ScriptElement.h
>+    dom/ScriptElementCachedScriptFetcher.h
>+    dom/ScriptExecutionContext.h
>+    dom/SecurityContext.h
>+    dom/SecurityPolicyViolationEvent.h
>+    dom/ShadowRoot.h
>+    dom/ShadowRootMode.h
>+    dom/SimulatedClickOptions.h
>+    dom/SpaceSplitString.h
>+    dom/StyledElement.h
>+    dom/SuccessOr.h
>+    dom/Text.h
>+    dom/TextEvent.h
>+    dom/TextEventInputType.h
>+    dom/Touch.h
>+    dom/Traversal.h
>+    dom/TreeScope.h
>+    dom/TreeScopeOrderedMap.h
>+    dom/TreeWalker.h
>+    dom/TypedElementDescendantIterator.h
>+    dom/UIEvent.h
>+    dom/UIEventInit.h
>+    dom/UIEventWithKeyState.h
>+    dom/UserActionElementSet.h
>+    dom/UserGestureIndicator.h
>+    dom/UserTypingGestureIndicator.h
>+    dom/ViewportArguments.h
>+    dom/VisibilityChangeClient.h
>+    dom/VisibilityState.h
>+    dom/WheelEvent.h
>+    dom/XMLDocument.h
>+
>+    dom/messageports/MessagePortChannel.h
>+    dom/messageports/MessagePortChannelProvider.h
>+    dom/messageports/MessagePortChannelRegistry.h
>+    dom/messageports/MessageWithMessagePorts.h
>+
>+    editing/ClipboardAccessPolicy.h
>+    editing/CompositionUnderline.h
>+    editing/DictationAlternative.h
>+    editing/DictionaryPopupInfo.h
>+    editing/EditAction.h
>+    editing/Editing.h
>+    editing/EditingBehavior.h
>+    editing/EditingBehaviorTypes.h
>+    editing/EditingBoundary.h
>+    editing/EditingStyle.h
>+    editing/Editor.h
>+    editing/EditorDeleteAction.h
>+    editing/EditorInsertAction.h
>+    editing/FindOptions.h
>+    editing/FontAttributeChanges.h
>+    editing/FontAttributes.h
>+    editing/FontShadow.h
>+    editing/FrameSelection.h
>+    editing/HTMLInterchange.h
>+    editing/SelectionRectGatherer.h
>+    editing/SerializedAttachmentData.h
>+    editing/SmartReplace.h
>+    editing/SpellChecker.h
>+    editing/TextAffinity.h
>+    editing/TextGranularity.h
>+    editing/TextIterator.h
>+    editing/TextIteratorBehavior.h
>+    editing/UndoStep.h
>+    editing/VisiblePosition.h
>+    editing/VisibleSelection.h
>+    editing/VisibleUnits.h
>+    editing/WebContentReader.h
>+    editing/WritingDirection.h
>+    editing/markup.h
>+
>+    fileapi/AsyncFileStream.h
>+    fileapi/Blob.h
>+    fileapi/BlobLineEndings.h
>+    fileapi/BlobPropertyBag.h
>+    fileapi/File.h
>+    fileapi/FileList.h
>+
>+    history/BackForwardClient.h
>+    history/BackForwardController.h
>+    history/BackForwardItemIdentifier.h
>+    history/CachedFrame.h
>+    history/CachedFramePlatformData.h
>+    history/HistoryItem.h
>+    history/PageCache.h
>+
>+    html/Autocapitalize.h
>+    html/AutocapitalizeTypes.h
>+    html/Autofill.h
>+    html/CachedHTMLCollection.h
>+    html/CanvasBase.h
>+    html/CollectionTraversal.h
>+    html/CollectionType.h
>+    html/DOMTokenList.h
>+    html/DataListSuggestionInformation.h
>+    html/FormAssociatedElement.h
>+    html/FormNamedItem.h
>+    html/HTMLAnchorElement.h
>+    html/HTMLAppletElement.h
>+    html/HTMLAreaElement.h
>+    html/HTMLAttachmentElement.h
>+    html/HTMLAudioElement.h
>+    html/HTMLBRElement.h
>+    html/HTMLBaseElement.h
>+    html/HTMLBodyElement.h
>+    html/HTMLButtonElement.h
>+    html/HTMLCanvasElement.h
>+    html/HTMLCollection.h
>+    html/HTMLDListElement.h
>+    html/HTMLDataListElement.h
>+    html/HTMLDirectoryElement.h
>+    html/HTMLDivElement.h
>+    html/HTMLDocument.h
>+    html/HTMLElement.h
>+    html/HTMLEmbedElement.h
>+    html/HTMLFieldSetElement.h
>+    html/HTMLFontElement.h
>+    html/HTMLFormControlElement.h
>+    html/HTMLFormControlElementWithState.h
>+    html/HTMLFormElement.h
>+    html/HTMLFrameElement.h
>+    html/HTMLFrameElementBase.h
>+    html/HTMLFrameOwnerElement.h
>+    html/HTMLFrameSetElement.h
>+    html/HTMLHRElement.h
>+    html/HTMLHeadElement.h
>+    html/HTMLHeadingElement.h
>+    html/HTMLHtmlElement.h
>+    html/HTMLIFrameElement.h
>+    html/HTMLImageElement.h
>+    html/HTMLImageLoader.h
>+    html/HTMLInputElement.h
>+    html/HTMLKeygenElement.h
>+    html/HTMLLIElement.h
>+    html/HTMLLabelElement.h
>+    html/HTMLLegendElement.h
>+    html/HTMLLinkElement.h
>+    html/HTMLMapElement.h
>+    html/HTMLMarqueeElement.h
>+    html/HTMLMediaElement.h
>+    html/HTMLMediaElementEnums.h
>+    html/HTMLMenuElement.h
>+    html/HTMLMenuItemElement.h
>+    html/HTMLMetaElement.h
>+    html/HTMLModElement.h
>+    html/HTMLOListElement.h
>+    html/HTMLObjectElement.h
>+    html/HTMLOptGroupElement.h
>+    html/HTMLOptionElement.h
>+    html/HTMLOptionsCollection.h
>+    html/HTMLParagraphElement.h
>+    html/HTMLParamElement.h
>+    html/HTMLPlugInElement.h
>+    html/HTMLPlugInImageElement.h
>+    html/HTMLPreElement.h
>+    html/HTMLQuoteElement.h
>+    html/HTMLScriptElement.h
>+    html/HTMLSelectElement.h
>+    html/HTMLStyleElement.h
>+    html/HTMLSummaryElement.h
>+    html/HTMLTableCaptionElement.h
>+    html/HTMLTableCellElement.h
>+    html/HTMLTableColElement.h
>+    html/HTMLTableElement.h
>+    html/HTMLTablePartElement.h
>+    html/HTMLTableRowElement.h
>+    html/HTMLTableSectionElement.h
>+    html/HTMLTextAreaElement.h
>+    html/HTMLTextFormControlElement.h
>+    html/HTMLTitleElement.h
>+    html/HTMLUListElement.h
>+    html/HTMLUnknownElement.h
>+    html/HTMLVideoElement.h
>+    html/ImageBitmap.h
>+    html/ImageDocument.h
>+    html/InputMode.h
>+    html/LabelableElement.h
>+    html/LinkIconCollector.h
>+    html/LinkIconType.h
>+    html/LinkRelAttribute.h
>+    html/MediaControllerInterface.h
>+    html/MediaElementSession.h
>+    html/MediaError.h
>+    html/PluginDocument.h
>+    html/StepRange.h
>+    html/TimeRanges.h
>+    html/TypeAhead.h
>+    html/URLRegistry.h
>+    html/URLUtils.h
>+    html/ValidityState.h
>+    html/VoidCallback.h
>+
>+    html/canvas/ImageBitmapRenderingContextSettings.h
>+    html/canvas/WebGLAny.h
>+    html/canvas/WebGLContextAttributes.h
>+
>+    html/forms/FileIconLoader.h
>+
>+    html/parser/HTMLParserIdioms.h
>+
>+    html/track/AudioTrack.h
>+    html/track/TextTrack.h
>+    html/track/TextTrackCue.h
>+    html/track/TrackBase.h
>+    html/track/VTTCue.h
>+    html/track/VideoTrack.h
>+
>+    inspector/InspectorClient.h
>+    inspector/InspectorController.h
>+    inspector/InspectorFrontendClient.h
>+    inspector/InspectorFrontendClientLocal.h
>+    inspector/InspectorFrontendHost.h
>+    inspector/InspectorOverlay.h
>+    inspector/InspectorWebAgentBase.h
>+    inspector/PageScriptDebugServer.h
>+
>+    inspector/agents/InspectorPageAgent.h
>+
>+    loader/AdClickAttribution.h
>+    loader/CanvasActivityRecord.h
>+    loader/CookieJar.h
>+    loader/CrossOriginAccessControl.h
>+    loader/CrossOriginPreflightResultCache.h
>+    loader/DocumentLoader.h
>+    loader/DocumentWriter.h
>+    loader/EmptyClients.h
>+    loader/EmptyFrameLoaderClient.h
>+    loader/FetchOptions.h
>+    loader/FormState.h
>+    loader/FormSubmission.h
>+    loader/FrameLoadRequest.h
>+    loader/FrameLoader.h
>+    loader/FrameLoaderClient.h
>+    loader/FrameLoaderStateMachine.h
>+    loader/FrameLoaderTypes.h
>+    loader/FrameNetworkingContext.h
>+    loader/HTTPHeaderField.h
>+    loader/HistoryController.h
>+    loader/ImageLoader.h
>+    loader/LinkLoader.h
>+    loader/LinkLoaderClient.h
>+    loader/LoadTiming.h
>+    loader/LoaderStrategy.h
>+    loader/MediaResourceLoader.h
>+    loader/MixedContentChecker.h
>+    loader/NavigationAction.h
>+    loader/NetscapePlugInStreamLoader.h
>+    loader/PingLoader.h
>+    loader/PolicyChecker.h
>+    loader/ProgressTracker.h
>+    loader/ProgressTrackerClient.h
>+    loader/ResourceCryptographicDigest.h
>+    loader/ResourceLoadInfo.h
>+    loader/ResourceLoadNotifier.h
>+    loader/ResourceLoadObserver.h
>+    loader/ResourceLoadStatistics.h
>+    loader/ResourceLoader.h
>+    loader/ResourceLoaderOptions.h
>+    loader/ResourceLoaderTypes.h
>+    loader/ResourceTimingInformation.h
>+    loader/ShouldTreatAsContinuingLoad.h
>+    loader/SubframeLoader.h
>+    loader/SubresourceLoader.h
>+    loader/SubstituteData.h
>+    loader/SubstituteResource.h
>+    loader/TextResourceDecoder.h
>+    loader/ThreadableLoader.h
>+    loader/ThreadableLoaderClient.h
>+
>+    loader/appcache/ApplicationCache.h
>+    loader/appcache/ApplicationCacheHost.h
>+    loader/appcache/ApplicationCacheStorage.h
>+
>+    loader/archive/Archive.h
>+    loader/archive/ArchiveResource.h
>+
>+    loader/archive/mhtml/MHTMLArchive.h
>+
>+    loader/cache/CachePolicy.h
>+    loader/cache/CachedImage.h
>+    loader/cache/CachedImageClient.h
>+    loader/cache/CachedRawResourceClient.h
>+    loader/cache/CachedResource.h
>+    loader/cache/CachedResourceClient.h
>+    loader/cache/CachedResourceHandle.h
>+    loader/cache/CachedResourceLoader.h
>+    loader/cache/CachedResourceRequest.h
>+    loader/cache/CachedStyleSheetClient.h
>+    loader/cache/KeepaliveRequestTracker.h
>+    loader/cache/MemoryCache.h
>+
>+    page/AbstractDOMWindow.h
>+    page/AbstractFrame.h
>+    page/ActivityState.h
>+    page/ActivityStateChangeObserver.h
>+    page/AdjustViewSizeOrNot.h
>+    page/AlternativeTextClient.h
>+    page/ApplicationStateChangeListener.h
>+    page/AutoplayEvent.h
>+    page/Base64Utilities.h
>+    page/CacheStorageProvider.h
>+    page/CaptionUserPreferences.h
>+    page/Chrome.h
>+    page/ChromeClient.h
>+    page/ClientOrigin.h
>+    page/ContextMenuClient.h
>+    page/ContextMenuContext.h
>+    page/ContextMenuController.h
>+    page/ContextMenuProvider.h
>+    page/DOMSelection.h
>+    page/DOMTimer.h
>+    page/DOMWindow.h
>+    page/DOMWindowExtension.h
>+    page/DOMWindowProperty.h
>+    page/DatabaseProvider.h
>+    page/DebugPageOverlays.h
>+    page/DeprecatedGlobalSettings.h
>+    page/DeviceClient.h
>+    page/DiagnosticLoggingClient.h
>+    page/DiagnosticLoggingKeys.h
>+    page/DiagnosticLoggingResultType.h
>+    page/DisabledAdaptations.h
>+    page/DragActions.h
>+    page/DragClient.h
>+    page/DragController.h
>+    page/EditorClient.h
>+    page/EventHandler.h
>+    page/FocusController.h
>+    page/FocusDirection.h
>+    page/Frame.h
>+    page/FrameDestructionObserver.h
>+    page/FrameSnapshotting.h
>+    page/FrameTree.h
>+    page/FrameView.h
>+    page/FrameViewLayoutContext.h
>+    page/GlobalFrameIdentifier.h
>+    page/GlobalWindowIdentifier.h
>+    page/LayerFlushThrottleState.h
>+    page/LayoutMilestone.h
>+    page/MediaCanStartListener.h
>+    page/MediaProducer.h
>+    page/MemoryRelease.h
>+    page/Page.h
>+    page/PageConfiguration.h
>+    page/PageConsoleClient.h
>+    page/PageGroup.h
>+    page/PageOverlay.h
>+    page/PageOverlayController.h
>+    page/PerformanceLogging.h
>+    page/PerformanceLoggingClient.h
>+    page/PlugInClient.h
>+    page/PointerCaptureController.h
>+    page/PointerLockController.h
>+    page/PrewarmInformation.h
>+    page/PrintContext.h
>+    page/ProcessWarming.h
>+    page/Quirks.h
>+    page/RemoteDOMWindow.h
>+    page/RemoteFrame.h
>+    page/RenderingUpdateScheduler.h
>+    page/RuntimeEnabledFeatures.h
>+    page/ScrollIntoViewOptions.h
>+    page/ScrollLogicalPosition.h
>+    page/ScrollToOptions.h
>+    page/SecurityOrigin.h
>+    page/SecurityOriginData.h
>+    page/SecurityOriginHash.h
>+    page/SecurityPolicy.h
>+    page/SettingsBase.h
>+    page/ShareData.h
>+    page/SocketProvider.h
>+    page/SpeechSynthesisClient.h
>+    page/SuspendableTimer.h
>+    page/TextIndicator.h
>+    page/UserContentController.h
>+    page/UserContentProvider.h
>+    page/UserContentTypes.h
>+    page/UserContentURLPattern.h
>+    page/UserMessageHandler.h
>+    page/UserMessageHandlerDescriptor.h
>+    page/UserMessageHandlersNamespace.h
>+    page/UserScript.h
>+    page/UserScriptTypes.h
>+    page/UserStyleSheet.h
>+    page/UserStyleSheetTypes.h
>+    page/ValidationMessageClient.h
>+    page/ViewportConfiguration.h
>+    page/VisitedLinkStore.h
>+    page/WebCoreKeyboardUIMode.h
>+    page/WebKitNamespace.h
>+    page/WheelEventDeltaFilter.h
>+    page/WheelEventTestTrigger.h
>+    page/WindowFeatures.h
>+
>+    page/animation/AnimationBase.h
>+    page/animation/CSSAnimationController.h
>+
>+    page/csp/ContentSecurityPolicy.h
>+    page/csp/ContentSecurityPolicyClient.h
>+    page/csp/ContentSecurityPolicyHash.h
>+    page/csp/ContentSecurityPolicyResponseHeaders.h
>+
>+    page/scrolling/AsyncScrollingCoordinator.h
>+    page/scrolling/AxisScrollSnapOffsets.h
>+    page/scrolling/ScrollSnapOffsetsInfo.h
>+    page/scrolling/ScrollingConstraints.h
>+    page/scrolling/ScrollingCoordinator.h
>+    page/scrolling/ScrollingCoordinatorTypes.h
>+    page/scrolling/ScrollingMomentumCalculator.h
>+    page/scrolling/ScrollingStateFixedNode.h
>+    page/scrolling/ScrollingStateFrameHostingNode.h
>+    page/scrolling/ScrollingStateFrameScrollingNode.h
>+    page/scrolling/ScrollingStateNode.h
>+    page/scrolling/ScrollingStateOverflowScrollingNode.h
>+    page/scrolling/ScrollingStatePositionedNode.h
>+    page/scrolling/ScrollingStateScrollingNode.h
>+    page/scrolling/ScrollingStateStickyNode.h
>+    page/scrolling/ScrollingStateTree.h
>+    page/scrolling/ScrollingThread.h
>+    page/scrolling/ScrollingTree.h
>+    page/scrolling/ScrollingTreeFrameHostingNode.h
>+    page/scrolling/ScrollingTreeFrameScrollingNode.h
>+    page/scrolling/ScrollingTreeNode.h
>+    page/scrolling/ScrollingTreeOverflowScrollingNode.h
>+    page/scrolling/ScrollingTreeScrollingNode.h
>+    page/scrolling/ScrollingTreeScrollingNodeDelegate.h
>+    page/scrolling/ThreadedScrollingTree.h
>+
>+    platform/AbortableTaskQueue.h
>+    platform/CPUMonitor.h
>+    platform/CalculationValue.h
>+    platform/ColorChooser.h
>+    platform/ColorChooserClient.h
>+    platform/ContentFilterUnblockHandler.h
>+    platform/ContentType.h
>+    platform/ContextMenu.h
>+    platform/ContextMenuItem.h
>+    platform/ControlStates.h
>+    platform/Cookie.h
>+    platform/CountedUserActivity.h
>+    platform/Cursor.h
>+    platform/DataListSuggestionPicker.h
>+    platform/DataListSuggestionsClient.h
>+    platform/DateComponents.h
>+    platform/Decimal.h
>+    platform/DeferrableTask.h
>+    platform/DragData.h
>+    platform/DragImage.h
>+    platform/DragItem.h
>+    platform/EventTrackingRegions.h
>+    platform/FileChooser.h
>+    platform/FileHandle.h
>+    platform/FileMonitor.h
>+    platform/FileStreamClient.h
>+    platform/FloatConversion.h
>+    platform/GenericTaskQueue.h
>+    platform/HostWindow.h
>+    platform/KeyedCoding.h
>+    platform/KeypressCommand.h
>+    platform/LayoutUnit.h
>+    platform/Length.h
>+    platform/LengthBox.h
>+    platform/LengthPoint.h
>+    platform/LengthSize.h
>+    platform/LinkIcon.h
>+    platform/LocalizedStrings.h
>+    platform/LogInitialization.h
>+    platform/Logging.h
>+    platform/LowPowerModeNotifier.h
>+    platform/MIMETypeRegistry.h
>+    platform/MediaSample.h
>+    platform/MediaSelectionOption.h
>+    platform/NotImplemented.h
>+    platform/OrientationNotifier.h
>+    platform/PODInterval.h
>+    platform/PODIntervalTree.h
>+    platform/PODRedBlackTree.h
>+    platform/Pasteboard.h
>+    platform/PasteboardItemInfo.h
>+    platform/PasteboardStrategy.h
>+    platform/PasteboardWriterData.h
>+    platform/PlatformEvent.h
>+    platform/PlatformExportMacros.h
>+    platform/PlatformKeyboardEvent.h
>+    platform/PlatformMouseEvent.h
>+    platform/PlatformPasteboard.h
>+    platform/PlatformScreen.h
>+    platform/PlatformSpeechSynthesisUtterance.h
>+    platform/PlatformSpeechSynthesisVoice.h
>+    platform/PlatformSpeechSynthesizer.h
>+    platform/PlatformStrategies.h
>+    platform/PlatformTouchEvent.h
>+    platform/PlatformTouchPoint.h
>+    platform/PlatformWheelEvent.h
>+    platform/PopupMenu.h
>+    platform/PopupMenuClient.h
>+    platform/PopupMenuStyle.h
>+    platform/ProcessIdentifier.h
>+    platform/PromisedAttachmentInfo.h
>+    platform/PublicSuffix.h
>+    platform/RectEdges.h
>+    platform/ReferrerPolicy.h
>+    platform/RegistrableDomain.h
>+    platform/RemoteCommandListener.h
>+    platform/RuntimeApplicationChecks.h
>+    platform/SSLKeyGenerator.h
>+    platform/SchemeRegistry.h
>+    platform/ScreenProperties.h
>+    platform/ScrollAnimator.h
>+    platform/ScrollTypes.h
>+    platform/ScrollView.h
>+    platform/ScrollableArea.h
>+    platform/Scrollbar.h
>+    platform/ScrollbarTheme.h
>+    platform/ScrollbarThemeComposite.h
>+    platform/SearchPopupMenu.h
>+    platform/SerializedPlatformRepresentation.h
>+    platform/SharedBuffer.h
>+    platform/SharedStringHash.h
>+    platform/SuddenTermination.h
>+    platform/Supplementable.h
>+    platform/ThemeTypes.h
>+    platform/ThreadCheck.h
>+    platform/ThreadGlobalData.h
>+    platform/ThreadSafeDataBuffer.h
>+    platform/ThreadTimers.h
>+    platform/Timer.h
>+    platform/TouchAction.h
>+    platform/UserActivity.h
>+    platform/UserAgent.h
>+    platform/UserInterfaceLayoutDirection.h
>+    platform/ValidationBubble.h
>+    platform/WebGLStateTracker.h
>+    platform/Widget.h
>+    platform/WindowsKeyboardCodes.h
>+
>+    platform/animation/Animation.h
>+    platform/animation/AnimationList.h
>+    platform/animation/AnimationUtilities.h
>+    platform/animation/TimingFunction.h
>+
>+    platform/audio/AudioHardwareListener.h
>+    platform/audio/AudioSession.h
>+    platform/audio/AudioSourceProvider.h
>+    platform/audio/AudioStreamDescription.h
>+    platform/audio/PlatformAudioData.h
>+    platform/audio/PlatformMediaSession.h
>+    platform/audio/PlatformMediaSessionManager.h
>+
>+    platform/gamepad/GamepadProvider.h
>+    platform/gamepad/GamepadProviderClient.h
>+    platform/gamepad/PlatformGamepad.h
>+
>+    platform/graphics/ANGLEWebKitBridge.h
>+    platform/graphics/AudioTrackPrivate.h
>+    platform/graphics/BitmapImage.h
>+    platform/graphics/Color.h
>+    platform/graphics/ColorHash.h
>+    platform/graphics/ColorSpace.h
>+    platform/graphics/ComplexTextController.h
>+    platform/graphics/DashArray.h
>+    platform/graphics/DecodingOptions.h
>+    platform/graphics/DisplayRefreshMonitor.h
>+    platform/graphics/DisplayRefreshMonitorClient.h
>+    platform/graphics/DisplayRefreshMonitorManager.h
>+    platform/graphics/ExtendedColor.h
>+    platform/graphics/Extensions3D.h
>+    platform/graphics/FloatPoint.h
>+    platform/graphics/FloatPoint3D.h
>+    platform/graphics/FloatQuad.h
>+    platform/graphics/FloatRect.h
>+    platform/graphics/FloatRoundedRect.h
>+    platform/graphics/FloatSize.h
>+    platform/graphics/Font.h
>+    platform/graphics/FontBaseline.h
>+    platform/graphics/FontCache.h
>+    platform/graphics/FontCascade.h
>+    platform/graphics/FontCascadeDescription.h
>+    platform/graphics/FontCascadeFonts.h
>+    platform/graphics/FontDescription.h
>+    platform/graphics/FontFamilySpecificationNull.h
>+    platform/graphics/FontMetrics.h
>+    platform/graphics/FontPlatformData.h
>+    platform/graphics/FontRanges.h
>+    platform/graphics/FontSelectionAlgorithm.h
>+    platform/graphics/FontSelector.h
>+    platform/graphics/FontSelectorClient.h
>+    platform/graphics/FontTaggedSettings.h
>+    platform/graphics/FourCC.h
>+    platform/graphics/GLContext.h
>+    platform/graphics/GeometryUtilities.h
>+    platform/graphics/Glyph.h
>+    platform/graphics/GlyphBuffer.h
>+    platform/graphics/GlyphMetricsMap.h
>+    platform/graphics/GlyphPage.h
>+    platform/graphics/Gradient.h
>+    platform/graphics/GraphicsContext.h
>+    platform/graphics/GraphicsContext3D.h
>+    platform/graphics/GraphicsContext3DAttributes.h
>+    platform/graphics/GraphicsContext3DManager.h
>+    platform/graphics/GraphicsContextImpl.h
>+    platform/graphics/GraphicsLayer.h
>+    platform/graphics/GraphicsLayerClient.h
>+    platform/graphics/GraphicsLayerFactory.h
>+    platform/graphics/GraphicsLayerTransform.h
>+    platform/graphics/GraphicsLayerUpdater.h
>+    platform/graphics/GraphicsTypes.h
>+    platform/graphics/GraphicsTypes3D.h
>+    platform/graphics/Icon.h
>+    platform/graphics/Image.h
>+    platform/graphics/ImageBackingStore.h
>+    platform/graphics/ImageBuffer.h
>+    platform/graphics/ImageBufferData.h
>+    platform/graphics/ImageFrame.h
>+    platform/graphics/ImageObserver.h
>+    platform/graphics/ImageOrientation.h
>+    platform/graphics/ImageSource.h
>+    platform/graphics/ImageTypes.h
>+    platform/graphics/InbandTextTrackPrivate.h
>+    platform/graphics/InbandTextTrackPrivateClient.h
>+    platform/graphics/IntPoint.h
>+    platform/graphics/IntPointHash.h
>+    platform/graphics/IntRect.h
>+    platform/graphics/IntRectExtent.h
>+    platform/graphics/IntRectHash.h
>+    platform/graphics/IntSize.h
>+    platform/graphics/IntSizeHash.h
>+    platform/graphics/LayoutPoint.h
>+    platform/graphics/LayoutRect.h
>+    platform/graphics/LayoutSize.h
>+    platform/graphics/LegacyCDMSession.h
>+    platform/graphics/MediaPlaybackTarget.h
>+    platform/graphics/MediaPlaybackTargetClient.h
>+    platform/graphics/MediaPlaybackTargetContext.h
>+    platform/graphics/MediaPlaybackTargetPicker.h
>+    platform/graphics/MediaPlayer.h
>+    platform/graphics/MediaPlayerEnums.h
>+    platform/graphics/NativeImage.h
>+    platform/graphics/OpenGLESShims.h
>+    platform/graphics/OpenGLShims.h
>+    platform/graphics/Path.h
>+    platform/graphics/PathUtilities.h
>+    platform/graphics/Pattern.h
>+    platform/graphics/PlatformDisplay.h
>+    platform/graphics/PlatformLayer.h
>+    platform/graphics/PlatformMediaResourceLoader.h
>+    platform/graphics/PlatformTextTrack.h
>+    platform/graphics/PlatformTimeRanges.h
>+    platform/graphics/Region.h
>+    platform/graphics/RemoteVideoSample.h
>+    platform/graphics/RoundedRect.h
>+    platform/graphics/StringTruncator.h
>+    platform/graphics/TextRun.h
>+    platform/graphics/TiledBacking.h
>+    platform/graphics/TrackPrivateBase.h
>+    platform/graphics/VideoTrackPrivate.h
>+    platform/graphics/WidthCache.h
>+    platform/graphics/WindRule.h
>+
>+    platform/graphics/cv/ImageTransferSessionVT.h
>+
>+    platform/graphics/filters/FilterOperation.h
>+    platform/graphics/filters/FilterOperations.h
>+
>+    platform/graphics/iso/ISOBox.h
>+    platform/graphics/iso/ISOOriginalFormatBox.h
>+    platform/graphics/iso/ISOProtectionSchemeInfoBox.h
>+    platform/graphics/iso/ISOSchemeInformationBox.h
>+    platform/graphics/iso/ISOSchemeTypeBox.h
>+    platform/graphics/iso/ISOTrackEncryptionBox.h
>+
>+    platform/graphics/libwpe/PlatformDisplayLibWPE.h
>+
>+    platform/graphics/opengl/Extensions3DOpenGL.h
>+    platform/graphics/opengl/Extensions3DOpenGLCommon.h
>+    platform/graphics/opengl/Extensions3DOpenGLES.h
>+    platform/graphics/opengl/TemporaryOpenGLSetting.h
>+
>+    platform/graphics/opentype/OpenTypeMathData.h
>+    platform/graphics/opentype/OpenTypeVerticalData.h
>+
>+    platform/graphics/transforms/AffineTransform.h
>+    platform/graphics/transforms/TransformOperation.h
>+    platform/graphics/transforms/TransformOperations.h
>+    platform/graphics/transforms/TransformationMatrix.h
>+
>+    platform/mediastream/CaptureDevice.h
>+    platform/mediastream/CaptureDeviceManager.h
>+    platform/mediastream/MediaConstraints.h
>+    platform/mediastream/MediaStreamPrivate.h
>+    platform/mediastream/MediaStreamRequest.h
>+    platform/mediastream/MediaStreamTrackPrivate.h
>+    platform/mediastream/RealtimeMediaSource.h
>+    platform/mediastream/RealtimeMediaSourceCapabilities.h
>+    platform/mediastream/RealtimeMediaSourceCenter.h
>+    platform/mediastream/RealtimeMediaSourceFactory.h
>+    platform/mediastream/RealtimeMediaSourceSettings.h
>+    platform/mediastream/RealtimeMediaSourceSupportedConstraints.h
>+    platform/mediastream/RealtimeVideoSource.h
>+    platform/mediastream/VideoPreset.h
>+    platform/mediastream/WebAudioSourceProvider.h
>+
>+    platform/mediastream/libwebrtc/LibWebRTCMacros.h
>+    platform/mediastream/libwebrtc/LibWebRTCProvider.h
>+
>+    platform/mock/DeviceOrientationClientMock.h
>+    platform/mock/MediaPlaybackTargetMock.h
>+    platform/mock/MediaPlaybackTargetPickerMock.h
>+    platform/mock/MockMediaDevice.h
>+    platform/mock/MockRealtimeAudioSource.h
>+    platform/mock/MockRealtimeMediaSourceCenter.h
>+    platform/mock/MockRealtimeVideoSource.h
>+
>+    platform/network/AuthenticationChallengeBase.h
>+    platform/network/AuthenticationClient.h
>+    platform/network/BlobData.h
>+    platform/network/BlobDataFileReference.h
>+    platform/network/BlobPart.h
>+    platform/network/BlobRegistry.h
>+    platform/network/BlobRegistryImpl.h
>+    platform/network/CacheValidation.h
>+    platform/network/CertificateInfoBase.h
>+    platform/network/CookieRequestHeaderFieldProxy.h
>+    platform/network/CookieStorage.h
>+    platform/network/Credential.h
>+    platform/network/CredentialBase.h
>+    platform/network/CredentialStorage.h
>+    platform/network/DNS.h
>+    platform/network/DNSResolveQueue.h
>+    platform/network/FormData.h
>+    platform/network/HTTPHeaderMap.h
>+    platform/network/HTTPParsers.h
>+    platform/network/NetworkLoadInformation.h
>+    platform/network/NetworkLoadMetrics.h
>+    platform/network/NetworkStateNotifier.h
>+    platform/network/NetworkStorageSession.h
>+    platform/network/NetworkingContext.h
>+    platform/network/ParsedContentRange.h
>+    platform/network/ParsedContentType.h
>+    platform/network/ProtectionSpace.h
>+    platform/network/ProtectionSpaceBase.h
>+    platform/network/ProtectionSpaceHash.h
>+    platform/network/ProxyServer.h
>+    platform/network/ResourceErrorBase.h
>+    platform/network/ResourceHandle.h
>+    platform/network/ResourceHandleClient.h
>+    platform/network/ResourceLoadPriority.h
>+    platform/network/ResourceRequestBase.h
>+    platform/network/ResourceResponseBase.h
>+    platform/network/SameSiteInfo.h
>+    platform/network/SocketStreamError.h
>+    platform/network/SocketStreamHandle.h
>+    platform/network/SocketStreamHandleClient.h
>+    platform/network/StorageSessionProvider.h
>+    platform/network/StoredCredentialsPolicy.h
>+
>+    platform/sql/SQLValue.h
>+    platform/sql/SQLiteDatabase.h
>+    platform/sql/SQLiteDatabaseTracker.h
>+    platform/sql/SQLiteDatabaseTrackerClient.h
>+    platform/sql/SQLiteFileSystem.h
>+    platform/sql/SQLiteStatement.h
>+    platform/sql/SQLiteTransaction.h
>+
>+    platform/text/BidiContext.h
>+    platform/text/StringWithDirection.h
>+    platform/text/TextBoundaries.h
>+    platform/text/TextCheckerClient.h
>+    platform/text/TextChecking.h
>+    platform/text/TextCodec.h
>+    platform/text/TextEncoding.h
>+    platform/text/TextEncodingRegistry.h
>+    platform/text/TextFlags.h
>+    platform/text/UnicodeBidi.h
>+    platform/text/WritingMode.h
>+
>+    plugins/PluginData.h
>+    plugins/PluginInfoProvider.h
>+    plugins/PluginViewBase.h
>+    plugins/npapi.h
>+    plugins/npfunctions.h
>+    plugins/npruntime.h
>+    plugins/nptypes.h
>+
>+    rendering/BreakLines.h
>+    rendering/ClipPathOperation.h
>+    rendering/ClipRect.h
>+    rendering/EventRegion.h
>+    rendering/FloatingObjects.h
>+    rendering/GapRects.h
>+    rendering/HitTestLocation.h
>+    rendering/HitTestRequest.h
>+    rendering/HitTestResult.h
>+    rendering/InlineBox.h
>+    rendering/InlineFlowBox.h
>+    rendering/LayerFragment.h
>+    rendering/MarkedText.h
>+    rendering/OrderIterator.h
>+    rendering/OverlapTestRequestClient.h
>+    rendering/Pagination.h
>+    rendering/PaintFrequencyTracker.h
>+    rendering/PaintInfo.h
>+    rendering/PaintPhase.h
>+    rendering/RenderAttachment.h
>+    rendering/RenderBlock.h
>+    rendering/RenderBlockFlow.h
>+    rendering/RenderBox.h
>+    rendering/RenderBoxModelObject.h
>+    rendering/RenderElement.h
>+    rendering/RenderEmbeddedObject.h
>+    rendering/RenderFlexibleBox.h
>+    rendering/RenderFrame.h
>+    rendering/RenderFrameBase.h
>+    rendering/RenderImage.h
>+    rendering/RenderImageResource.h
>+    rendering/RenderInline.h
>+    rendering/RenderLayer.h
>+    rendering/RenderLayerBacking.h
>+    rendering/RenderLayerCompositor.h
>+    rendering/RenderLayerModelObject.h
>+    rendering/RenderLineBoxList.h
>+    rendering/RenderMedia.h
>+    rendering/RenderObject.h
>+    rendering/RenderObjectEnums.h
>+    rendering/RenderOverflow.h
>+    rendering/RenderPtr.h
>+    rendering/RenderReplaced.h
>+    rendering/RenderSelectionInfo.h
>+    rendering/RenderSnapshottedPlugIn.h
>+    rendering/RenderText.h
>+    rendering/RenderTextControl.h
>+    rendering/RenderTextLineBoxes.h
>+    rendering/RenderTheme.h
>+    rendering/RenderThemeCocoa.h
>+    rendering/RenderThemeIOS.h
>+    rendering/RenderThemeWin.h
>+    rendering/RenderTreeAsText.h
>+    rendering/RenderVideo.h
>+    rendering/RenderView.h
>+    rendering/RenderWidget.h
>+    rendering/RootInlineBox.h
>+    rendering/ScrollAlignment.h
>+    rendering/SelectionRangeData.h
>+    rendering/SimpleLineLayout.h
>+    rendering/SimpleLineLayoutCoverage.h
>+
>+    rendering/line/LineWidth.h
>+    rendering/line/TrailingObjects.h
>+
>+    rendering/shapes/Shape.h
>+    rendering/shapes/ShapeOutsideInfo.h
>+
>+    rendering/style/BasicShapes.h
>+    rendering/style/BorderData.h
>+    rendering/style/BorderValue.h
>+    rendering/style/CounterDirectives.h
>+    rendering/style/DataRef.h
>+    rendering/style/FillLayer.h
>+    rendering/style/GapLength.h
>+    rendering/style/GridArea.h
>+    rendering/style/GridLength.h
>+    rendering/style/GridPosition.h
>+    rendering/style/GridTrackSize.h
>+    rendering/style/LineClampValue.h
>+    rendering/style/NinePieceImage.h
>+    rendering/style/OutlineValue.h
>+    rendering/style/RenderStyle.h
>+    rendering/style/RenderStyleConstants.h
>+    rendering/style/SVGRenderStyle.h
>+    rendering/style/SVGRenderStyleDefs.h
>+    rendering/style/ShadowData.h
>+    rendering/style/ShapeValue.h
>+    rendering/style/StyleBackgroundData.h
>+    rendering/style/StyleBoxData.h
>+    rendering/style/StyleContentAlignmentData.h
>+    rendering/style/StyleCustomPropertyData.h
>+    rendering/style/StyleDashboardRegion.h
>+    rendering/style/StyleDeprecatedFlexibleBoxData.h
>+    rendering/style/StyleFilterData.h
>+    rendering/style/StyleFlexibleBoxData.h
>+    rendering/style/StyleGridData.h
>+    rendering/style/StyleGridItemData.h
>+    rendering/style/StyleImage.h
>+    rendering/style/StyleInheritedData.h
>+    rendering/style/StyleMarqueeData.h
>+    rendering/style/StyleMultiColData.h
>+    rendering/style/StyleRareInheritedData.h
>+    rendering/style/StyleRareNonInheritedData.h
>+    rendering/style/StyleReflection.h
>+    rendering/style/StyleSelfAlignmentData.h
>+    rendering/style/StyleSupportedColorSchemes.h
>+    rendering/style/StyleSurroundData.h
>+    rendering/style/StyleTransformData.h
>+    rendering/style/StyleVisualData.h
>+    rendering/style/TextDecorationThickness.h
>+    rendering/style/TextSizeAdjustment.h
>+    rendering/style/TextUnderlineOffset.h
>+    rendering/style/WillChangeData.h
>+
>+    replay/UserInputBridge.h
>+
>+    storage/Storage.h
>+    storage/StorageArea.h
>+    storage/StorageEventDispatcher.h
>+    storage/StorageMap.h
>+    storage/StorageNamespace.h
>+    storage/StorageNamespaceProvider.h
>+    storage/StorageQuotaManager.h
>+    storage/StorageQuotaUser.h
>+    storage/StorageType.h
>+
>+    style/StyleChange.h
>+    style/StyleScope.h
>+    style/StyleValidity.h
>+
>+    svg/SVGLengthContext.h
>+    svg/SVGLengthValue.h
>+    svg/SVGParserUtilities.h
>+    svg/SVGParsingError.h
>+    svg/SVGStringList.h
>+    svg/SVGTests.h
>+    svg/SVGUnitTypes.h
>+
>+    svg/graphics/SVGImageCache.h
>+
>+    svg/properties/SVGList.h
>+    svg/properties/SVGPrimitiveList.h
>+    svg/properties/SVGProperty.h
>+    svg/properties/SVGPropertyOwner.h
>+    svg/properties/SVGPropertyTraits.h
>+
>+    testing/MockGamepad.h
>+    testing/MockGamepadProvider.h
>+
>+    workers/WorkerDebuggerProxy.h
>+    workers/WorkerLoaderProxy.h
>+    workers/WorkerRunLoop.h
>+    workers/WorkerScriptLoader.h
>+    workers/WorkerScriptLoaderClient.h
>+    workers/WorkerThread.h
>+    workers/WorkerType.h
>+
>+    workers/service/SWClientConnection.h
>+    workers/service/ServiceWorkerClientData.h
>+    workers/service/ServiceWorkerClientIdentifier.h
>+    workers/service/ServiceWorkerClientQueryOptions.h
>+    workers/service/ServiceWorkerClientType.h
>+    workers/service/ServiceWorkerContextData.h
>+    workers/service/ServiceWorkerData.h
>+    workers/service/ServiceWorkerFetchResult.h
>+    workers/service/ServiceWorkerIdentifier.h
>+    workers/service/ServiceWorkerJob.h
>+    workers/service/ServiceWorkerJobClient.h
>+    workers/service/ServiceWorkerJobData.h
>+    workers/service/ServiceWorkerJobDataIdentifier.h
>+    workers/service/ServiceWorkerJobType.h
>+    workers/service/ServiceWorkerProvider.h
>+    workers/service/ServiceWorkerRegistrationData.h
>+    workers/service/ServiceWorkerRegistrationKey.h
>+    workers/service/ServiceWorkerRegistrationOptions.h
>+    workers/service/ServiceWorkerTypes.h
>+    workers/service/ServiceWorkerUpdateViaCache.h
>+
>+    workers/service/context/SWContextManager.h
>+    workers/service/context/ServiceWorkerDebuggable.h
>+    workers/service/context/ServiceWorkerFetch.h
>+    workers/service/context/ServiceWorkerInspectorProxy.h
>+    workers/service/context/ServiceWorkerThread.h
>+    workers/service/context/ServiceWorkerThreadProxy.h
>+
>+    workers/service/server/RegistrationDatabase.h
>+    workers/service/server/SWOriginStore.h
>+    workers/service/server/SWServer.h
>+    workers/service/server/SWServerRegistration.h
>+    workers/service/server/SWServerToContextConnection.h
>+    workers/service/server/SWServerWorker.h
>+
>+    xml/XPathExpression.h
>+    xml/XPathNSResolver.h
>+    xml/XPathNodeSet.h
>+    xml/XPathResult.h
>+    xml/XPathValue.h
>+
>+    ${WebCore_DERIVED_SOURCES_DIR}/CSSPropertyNames.h
>+    ${WebCore_DERIVED_SOURCES_DIR}/CSSValueKeywords.h
>+    ${WebCore_DERIVED_SOURCES_DIR}/EventInterfaces.h
>+    ${WebCore_DERIVED_SOURCES_DIR}/EventTargetInterfaces.h
>+    ${WebCore_DERIVED_SOURCES_DIR}/HTMLElementTypeHelpers.h
>+    ${WebCore_DERIVED_SOURCES_DIR}/HTMLNames.h
>+    ${WebCore_DERIVED_SOURCES_DIR}/HTTPHeaderNames.h
>+    ${WebCore_DERIVED_SOURCES_DIR}/JSBlob.h
>+    ${WebCore_DERIVED_SOURCES_DIR}/JSCSSRule.h
>+    ${WebCore_DERIVED_SOURCES_DIR}/JSCSSRuleList.h
>+    ${WebCore_DERIVED_SOURCES_DIR}/JSCSSStyleDeclaration.h
>+    ${WebCore_DERIVED_SOURCES_DIR}/JSDOMBindingInternalsBuiltins.h
>+    ${WebCore_DERIVED_SOURCES_DIR}/JSDOMImplementation.h
>+    ${WebCore_DERIVED_SOURCES_DIR}/JSDOMWindow.h
>+    ${WebCore_DERIVED_SOURCES_DIR}/JSDeprecatedCSSOMCounter.h
>+    ${WebCore_DERIVED_SOURCES_DIR}/JSDeprecatedCSSOMRGBColor.h
>+    ${WebCore_DERIVED_SOURCES_DIR}/JSDeprecatedCSSOMRect.h
>+    ${WebCore_DERIVED_SOURCES_DIR}/JSDeprecatedCSSOMValue.h
>+    ${WebCore_DERIVED_SOURCES_DIR}/JSDocument.h
>+    ${WebCore_DERIVED_SOURCES_DIR}/JSElement.h
>+    ${WebCore_DERIVED_SOURCES_DIR}/JSEvent.h
>+    ${WebCore_DERIVED_SOURCES_DIR}/JSEventTarget.h
>+    ${WebCore_DERIVED_SOURCES_DIR}/JSFile.h
>+    ${WebCore_DERIVED_SOURCES_DIR}/JSHTMLCollection.h
>+    ${WebCore_DERIVED_SOURCES_DIR}/JSHTMLElement.h
>+    ${WebCore_DERIVED_SOURCES_DIR}/JSHTMLOptionsCollection.h
>+    ${WebCore_DERIVED_SOURCES_DIR}/JSMediaList.h
>+    ${WebCore_DERIVED_SOURCES_DIR}/JSNamedNodeMap.h
>+    ${WebCore_DERIVED_SOURCES_DIR}/JSNode.h
>+    ${WebCore_DERIVED_SOURCES_DIR}/JSNodeIterator.h
>+    ${WebCore_DERIVED_SOURCES_DIR}/JSNodeList.h
>+    ${WebCore_DERIVED_SOURCES_DIR}/JSNotification.h
>+    ${WebCore_DERIVED_SOURCES_DIR}/JSRange.h
>+    ${WebCore_DERIVED_SOURCES_DIR}/JSReadableStreamDefaultController.h
>+    ${WebCore_DERIVED_SOURCES_DIR}/JSStyleSheet.h
>+    ${WebCore_DERIVED_SOURCES_DIR}/JSStyleSheetList.h
>+    ${WebCore_DERIVED_SOURCES_DIR}/JSTreeWalker.h
>+    ${WebCore_DERIVED_SOURCES_DIR}/JSXPathExpression.h
>+    ${WebCore_DERIVED_SOURCES_DIR}/JSXPathResult.h
>+    ${WebCore_DERIVED_SOURCES_DIR}/RTCPeerConnectionInternalsBuiltins.h
>+    ${WebCore_DERIVED_SOURCES_DIR}/ReadableByteStreamInternalsBuiltins.h
>+    ${WebCore_DERIVED_SOURCES_DIR}/ReadableStreamInternalsBuiltins.h
>+    ${WebCore_DERIVED_SOURCES_DIR}/Settings.h
>+    ${WebCore_DERIVED_SOURCES_DIR}/StreamInternalsBuiltins.h
>+    ${WebCore_DERIVED_SOURCES_DIR}/WebCoreJSBuiltinInternals.h
>+    ${WebCore_DERIVED_SOURCES_DIR}/WebKitFontFamilyNames.h
>+    ${WebCore_DERIVED_SOURCES_DIR}/WritableStreamInternalsBuiltins.h
>+)
>diff --git a/Source/WebCore/PlatformAppleWin.cmake b/Source/WebCore/PlatformAppleWin.cmake
>index 8021bb3eee5..2e43b492241 100644
>--- a/Source/WebCore/PlatformAppleWin.cmake
>+++ b/Source/WebCore/PlatformAppleWin.cmake
>@@ -1,7 +1,7 @@
> add_definitions(-DQUARTZCORE_DLL -DDISABLE_COREIMAGE -DDISABLE_FRONTEND -DDISABLE_IOSURFACE -DDISABLE_RENDERSERVER
>     -DDISABLE_3D_TRANSFORMS -DWEBCORE_CONTEXT_MENUS -DPSAPI_VERSION=1)
> 
>-list(APPEND WebCore_INCLUDE_DIRECTORIES
>+list(APPEND WebCore_PRIVATE_INCLUDE_DIRECTORIES
>     "${WEBKIT_LIBRARIES_DIR}/include"
>     "${WEBCORE_DIR}/loader/archive/cf"
>     "${WEBCORE_DIR}/platform/graphics/avfoundation"
>@@ -12,20 +12,6 @@ list(APPEND WebCore_INCLUDE_DIRECTORIES
>     "${WEBCORE_DIR}/platform/network/cf"
> )
> 
>-if (${USE_DIRECT2D})
>-    list(APPEND WebCore_INCLUDE_DIRECTORIES
>-        "${WEBCORE_DIR}/platform/graphics/win"
>-    )
>-else ()
>-    list(APPEND WebCore_INCLUDE_DIRECTORIES
>-        "${WEBCORE_DIR}/platform/graphics/avfoundation"
>-        "${WEBCORE_DIR}/platform/graphics/avfoundation/cf"
>-        "${WEBCORE_DIR}/platform/graphics/ca"
>-        "${WEBCORE_DIR}/platform/graphics/ca/win"
>-        "${WEBCORE_DIR}/platform/graphics/cg"
>-    )
>-endif ()
>-
> list(APPEND WebCore_SOURCES
>     loader/cf/ResourceLoaderCFNet.cpp
> 
>@@ -69,7 +55,25 @@ list(APPEND WebCore_SOURCES
>     platform/text/LocaleNone.cpp
> )
> 
>+list(APPEND WebCore_PRIVATE_FORWARDING_HEADERS
>+    platform/network/cf/AuthenticationCF.h
>+    platform/network/cf/AuthenticationChallenge.h
>+    platform/network/cf/CertificateInfo.h
>+    platform/network/cf/DownloadBundle.h
>+    platform/network/cf/LoaderRunLoopCF.h
>+    platform/network/cf/ProtectionSpaceCFNet.h
>+    platform/network/cf/ResourceError.h
>+    platform/network/cf/ResourceRequest.h
>+    platform/network/cf/ResourceRequestCFNet.h
>+    platform/network/cf/ResourceResponse.h
>+    platform/network/cf/SocketStreamHandleImpl.h
>+)
>+
> if (${USE_DIRECT2D})
>+    list(APPEND WebCore_PRIVATE_INCLUDE_DIRECTORIES
>+        "${WEBCORE_DIR}/platform/graphics/win"
>+    )
>+
>     list(APPEND WebCore_SOURCES
>         page/win/FrameWinDirect2D.cpp
> 
>@@ -92,6 +96,14 @@ if (${USE_DIRECT2D})
>         platform/win/DragImageDirect2D.cpp
>     )
> else ()
>+    list(APPEND WebCore_PRIVATE_INCLUDE_DIRECTORIES
>+        "${WEBCORE_DIR}/platform/graphics/avfoundation"
>+        "${WEBCORE_DIR}/platform/graphics/avfoundation/cf"
>+        "${WEBCORE_DIR}/platform/graphics/ca"
>+        "${WEBCORE_DIR}/platform/graphics/ca/win"
>+        "${WEBCORE_DIR}/platform/graphics/cg"
>+    )
>+
>     list(APPEND WebCore_SOURCES
>         page/win/FrameCGWin.cpp
> 
>@@ -147,23 +159,26 @@ else ()
> 
>         platform/win/DragImageCGWin.cpp
>     )
>-endif ()
>-
>-list(APPEND WebCore_FORWARDING_HEADERS_DIRECTORIES
>-    platform/network/cf
>-)
>-
>-if (${USE_DIRECT2D})
>-    list(APPEND WebCore_FORWARDING_HEADERS_DIRECTORIES
>-        platform/graphics/win
>-    )
>-else ()
>-    list(APPEND WebCore_FORWARDING_HEADERS_DIRECTORIES
>-        platform/graphics/ca
>-        platform/graphics/cg
>-
>-        platform/graphics/ca/win
> 
>-        platform/network/cf
>+    list(APPEND WebCore_PRIVATE_FORWARDING_HEADERS
>+        platform/graphics/ca/GraphicsLayerCA.h
>+        platform/graphics/ca/LayerPool.h
>+        platform/graphics/ca/PlatformCAAnimation.h
>+        platform/graphics/ca/PlatformCAFilters.h
>+        platform/graphics/ca/PlatformCALayer.h
>+        platform/graphics/ca/PlatformCALayerClient.h
>+        platform/graphics/ca/TileController.h
>+
>+        platform/graphics/ca/win/AbstractCACFLayerTreeHost.h
>+        platform/graphics/ca/win/CACFLayerTreeHost.h
>+        platform/graphics/ca/win/CACFLayerTreeHostClient.h
>+        platform/graphics/ca/win/PlatformCALayerWin.h
>+
>+        platform/graphics/cg/GraphicsContextCG.h
>+        platform/graphics/cg/IOSurfacePool.h
>+        platform/graphics/cg/ImageBufferDataCG.h
>+        platform/graphics/cg/ImageBufferUtilitiesCG.h
>+        platform/graphics/cg/PDFDocumentImage.h
>+        platform/graphics/cg/UTIRegistry.h
>     )
> endif ()
>diff --git a/Source/WebCore/PlatformGTK.cmake b/Source/WebCore/PlatformGTK.cmake
>index f0a65ecee97..9081538437b 100644
>--- a/Source/WebCore/PlatformGTK.cmake
>+++ b/Source/WebCore/PlatformGTK.cmake
>@@ -3,6 +3,7 @@ include(platform/FreeType.cmake)
> include(platform/GCrypt.cmake)
> include(platform/GStreamer.cmake)
> include(platform/ImageDecoders.cmake)
>+include(platform/Soup.cmake)
> include(platform/TextureMapper.cmake)
> 
> set(WebCore_OUTPUT_NAME WebCoreGTK)
>@@ -11,10 +12,9 @@ list(APPEND WebCore_UNIFIED_SOURCE_LIST_FILES
>     "SourcesGTK.txt"
> 
>     "platform/SourcesGLib.txt"
>-    "platform/SourcesSoup.txt"
> )
> 
>-list(APPEND WebCore_INCLUDE_DIRECTORIES
>+list(APPEND WebCore_PRIVATE_INCLUDE_DIRECTORIES
>     "${THIRDPARTY_DIR}/ANGLE/"
>     "${THIRDPARTY_DIR}/ANGLE/include/KHR"
>     "${WEBCORE_DIR}/accessibility/atk"
>@@ -35,7 +35,6 @@ list(APPEND WebCore_INCLUDE_DIRECTORIES
>     "${WEBCORE_DIR}/platform/mediastream/gstreamer"
>     "${WEBCORE_DIR}/platform/mock/mediasource"
>     "${WEBCORE_DIR}/platform/network/gtk"
>-    "${WEBCORE_DIR}/platform/network/soup"
>     "${WEBCORE_DIR}/platform/text/gtk"
> )
> 
>@@ -74,6 +73,23 @@ list(APPEND WebCorePlatformGTK_SOURCES
>     rendering/RenderThemeGtk.cpp
> )
> 
>+list(APPEND WebCore_PRIVATE_FRAMEWORK_HEADERS
>+    platform/graphics/x11/PlatformDisplayX11.h
>+    platform/graphics/x11/XErrorTrapper.h
>+    platform/graphics/x11/XUniquePtr.h
>+    platform/graphics/x11/XUniqueResource.h
>+
>+    platform/gtk/CompositionResults.h
>+    platform/gtk/GRefPtrGtk.h
>+    platform/gtk/GUniquePtrGtk.h
>+    platform/gtk/GtkUtilities.h
>+    platform/gtk/GtkVersioning.h
>+    platform/gtk/PasteboardHelper.h
>+    platform/gtk/SelectionData.h
>+
>+    platform/text/enchant/TextCheckerEnchant.h
>+)
>+
> list(APPEND WebCore_USER_AGENT_STYLE_SHEETS
>     ${WEBCORE_DIR}/css/mediaControlsGtk.css
> )
>@@ -88,7 +104,6 @@ set(WebCore_USER_AGENT_SCRIPTS_DEPENDENCIES ${WEBCORE_DIR}/platform/gtk/RenderTh
> 
> list(APPEND WebCore_LIBRARIES
>     ${ATK_LIBRARIES}
>-    ${CAIRO_LIBRARIES}
>     ${ENCHANT_LIBRARIES}
>     ${GLIB_GIO_LIBRARIES}
>     ${GLIB_GMODULE_LIBRARIES}
>@@ -96,7 +111,6 @@ list(APPEND WebCore_LIBRARIES
>     ${GLIB_LIBRARIES}
>     ${LIBSECCOMP_LIBRARIES}
>     ${LIBSECRET_LIBRARIES}
>-    ${LIBSOUP_LIBRARIES}
>     ${LIBTASN1_LIBRARIES}
>     ${HYPHEN_LIBRARIES}
>     ${UPOWERGLIB_LIBRARIES}
>@@ -110,13 +124,11 @@ list(APPEND WebCore_LIBRARIES
> 
> list(APPEND WebCore_SYSTEM_INCLUDE_DIRECTORIES
>     ${ATK_INCLUDE_DIRS}
>-    ${CAIRO_INCLUDE_DIRS}
>     ${ENCHANT_INCLUDE_DIRS}
>     ${GIO_UNIX_INCLUDE_DIRS}
>     ${GLIB_INCLUDE_DIRS}
>     ${LIBSECCOMP_INCLUDE_DIRS}
>     ${LIBSECRET_INCLUDE_DIRS}
>-    ${LIBSOUP_INCLUDE_DIRS}
>     ${LIBTASN1_INCLUDE_DIRS}
>     ${UPOWERGLIB_INCLUDE_DIRS}
>     ${ZLIB_INCLUDE_DIRS}
>@@ -164,6 +176,10 @@ if (ENABLE_PLUGIN_PROCESS_GTK2)
> endif ()
> 
> if (ENABLE_WAYLAND_TARGET)
>+    list(APPEND WebCore_PRIVATE_FRAMEWORK_HEADERS
>+        platform/graphics/wayland/PlatformDisplayWayland.h
>+        platform/graphics/wayland/WlUniquePtr.h
>+    )
>     list(APPEND WebCore_SYSTEM_INCLUDE_DIRECTORIES
>         ${WAYLAND_INCLUDE_DIRS}
>     )
>@@ -191,6 +207,7 @@ target_link_libraries(WebCorePlatformGTK
> 
> include_directories(
>     ${WebCore_INCLUDE_DIRECTORIES}
>+    ${WebCore_PRIVATE_INCLUDE_DIRECTORIES}
>     "${WEBCORE_DIR}/bindings/gobject/"
> )
> 
>diff --git a/Source/WebCore/PlatformMac.cmake b/Source/WebCore/PlatformMac.cmake
>index 6ec65d82e08..d7012814275 100644
>--- a/Source/WebCore/PlatformMac.cmake
>+++ b/Source/WebCore/PlatformMac.cmake
>@@ -70,7 +70,7 @@ if (NOT LOOKUP_FRAMEWORK-NOTFOUND)
>     list(APPEND WebCore_LIBRARIES ${LOOKUP_FRAMEWORK})
> endif ()
> 
>-list(APPEND WebCore_INCLUDE_DIRECTORIES
>+list(APPEND WebCore_PRIVATE_INCLUDE_DIRECTORIES
>     "${CMAKE_SOURCE_DIR}/Source"
>     "${THIRDPARTY_DIR}/ANGLE"
>     "${THIRDPARTY_DIR}/ANGLE/include/KHR"
>@@ -428,194 +428,143 @@ list(APPEND WebCore_SOURCES
>     xml/SoftLinkLibxslt.cpp
> )
> 
>-# FIXME: We do not need everything from all of these directories.
>-# Move some to WebCore_FORWARDING_HEADERS_FILES once people start actually maintaining this.
>-set(WebCore_FORWARDING_HEADERS_DIRECTORIES
>-    accessibility
>-    bridge
>-    contentextensions
>-    crypto
>-    css
>-    dom
>-    editing
>-    fileapi
>-    history
>-    html
>-    inspector
>-    loader
>-    page
>-    platform
>-    plugins
>-    rendering
>-    replay
>-    storage
>-    style
>-    svg
>-    workers
>-
>-    workers/service/context
>-
>-    Modules/applepay
>-    Modules/applicationmanifest
>-    Modules/cache
>-    Modules/geolocation
>-    Modules/indexeddb
>-    Modules/mediastream
>-    Modules/notifications
>-    Modules/webdatabase
>-    Modules/websockets
>-
>-    Modules/indexeddb/client
>-    Modules/indexeddb/shared
>-    Modules/indexeddb/server
>-
>-    bindings/js
>-
>-    bridge/objc
>-    bridge/jsc
>-
>-    css/parser
>-
>-    editing/cocoa
>-    editing/mac
>-    editing/ios
>-
>-    html/canvas
>-    html/forms
>-    html/parser
>-    html/shadow
>-    html/track
>-
>-    inspector/agents
>-
>-    loader/appcache
>-    loader/archive
>-    loader/cache
>-    loader/cocoa
>-
>-    loader/archive/cf
>-
>-    page/animation
>-    page/cocoa
>-    page/csp
>-    page/mac
>-    page/scrolling
>-
>-    page/scrolling/mac
>-
>-    platform/animation
>-    platform/audio
>-    platform/cf
>-    platform/cocoa
>-    platform/ios
>-    platform/graphics
>-    platform/mac
>-    platform/mediastream
>-    platform/mock
>-    platform/network
>-    platform/sql
>-    platform/text
>-
>-    platform/audio/cocoa
>-
>-    platform/gamepad/cocoa
>-    platform/gamepad/mac
>-
>-    platform/graphics/avfoundation
>-    platform/graphics/ca
>-    platform/graphics/cocoa
>-    platform/graphics/cg
>-    platform/graphics/filters
>-    platform/graphics/opentype
>-    platform/graphics/mac
>-    platform/graphics/transforms
>-
>-    platform/graphics/ca/cocoa
>-
>-    platform/mediastream/libwebrtc
>-
>-    platform/network/cf
>-    platform/network/cocoa
>-    platform/network/mac
>-
>-    platform/spi/cf
>-    platform/spi/cg
>-    platform/spi/cocoa
>-    platform/spi/mac
>-
>-    rendering/line
>-    rendering/style
>-
>-    svg/graphics
>-    svg/properties
>+list(APPEND WebCore_PRIVATE_FRAMEWORK_HEADERS
>+    accessibility/mac/WebAccessibilityObjectWrapperBase.h
>+    accessibility/mac/WebAccessibilityObjectWrapperMac.h
> 
>-    workers/service
>-
>-    workers/service/server
>-
>-    xml
>-)
>-
>-set(WebCore_FORWARDING_HEADERS_FILES
>-    Modules/webdatabase/DatabaseDetails.h
>-
>-    bridge/IdentifierRep.h
>-    bridge/npruntime_impl.h
>-    bridge/npruntime_internal.h
>-
>-    contentextensions/CompiledContentExtension.h
>-
>-    editing/EditAction.h
>-    editing/EditingBehaviorTypes.h
>-    editing/EditingBoundary.h
>-    editing/FindOptions.h
>-    editing/FrameSelection.h
>-    editing/TextAffinity.h
>+    editing/cocoa/DataDetection.h
>+    editing/cocoa/HTMLConverter.h
> 
>+    editing/mac/AlternativeTextUIController.h
>+    editing/mac/DictionaryLookup.h
>     editing/mac/TextAlternativeWithRange.h
>+    editing/mac/TextUndoInsertionMarkupMac.h
> 
>-    history/HistoryItem.h
>-    history/PageCache.h
>+    loader/archive/cf/LegacyWebArchive.h
> 
>-    html/HTMLMediaElement.h
>+    loader/mac/LoaderNSURLExtras.h
> 
>-    loader/appcache/ApplicationCacheStorage.h
>+    page/mac/TextIndicatorWindow.h
>+    page/mac/WebCoreFrameView.h
> 
>-    loader/icon/IconDatabase.h
>-    loader/icon/IconDatabaseBase.h
>-    loader/icon/IconDatabaseClient.h
>+    page/scrolling/cocoa/ScrollingTreeFixedNode.h
>+    page/scrolling/cocoa/ScrollingTreePositionedNode.h
>+    page/scrolling/cocoa/ScrollingTreeStickyNode.h
> 
>-    loader/mac/LoaderNSURLExtras.h
>+    page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.h
>+    page/scrolling/mac/ScrollingTreeOverflowScrollingNodeMac.h
>+    page/scrolling/mac/ScrollingTreeScrollingNodeDelegateMac.h
> 
>-    platform/PlatformExportMacros.h
>+    platform/audio/cocoa/MediaSessionManagerCocoa.h
>+    platform/audio/cocoa/WebAudioBufferList.h
> 
>-    platform/audio/AudioHardwareListener.h
>+    platform/audio/mac/CAAudioStreamDescription.h
>+    platform/audio/mac/CARingBuffer.h
> 
>     platform/cf/RunLoopObserver.h
> 
>-    platform/cocoa/MachSendRight.h
>-    platform/cocoa/SoftLinking.h
>-
>+    platform/cocoa/PlatformView.h
>+    platform/cocoa/PlaybackSessionInterface.h
>+    platform/cocoa/PlaybackSessionModel.h
>+    platform/cocoa/PlaybackSessionModelMediaElement.h
>+    platform/cocoa/ScrollController.h
>+    platform/cocoa/ScrollSnapAnimatorState.h
>+    platform/cocoa/SearchPopupMenuCocoa.h
>+    platform/cocoa/SystemVersion.h
>+    platform/cocoa/VideoFullscreenChangeObserver.h
>+    platform/cocoa/VideoFullscreenModel.h
>+    platform/cocoa/VideoFullscreenModelVideoElement.h
>+
>+    platform/gamepad/cocoa/GameControllerGamepadProvider.h
>+
>+    platform/gamepad/mac/HIDGamepad.h
>+    platform/gamepad/mac/HIDGamepadProvider.h
>+
>+    platform/graphics/avfoundation/MediaPlaybackTargetMac.h
>+    platform/graphics/avfoundation/WebMediaSessionManagerMac.h
>+
>+    platform/graphics/avfoundation/objc/AVFoundationMIMETypeCache.h
>+
>+    platform/graphics/ca/GraphicsLayerCA.h
>+    platform/graphics/ca/LayerPool.h
>+    platform/graphics/ca/PlatformCAAnimation.h
>+    platform/graphics/ca/PlatformCAFilters.h
>+    platform/graphics/ca/PlatformCALayer.h
>+    platform/graphics/ca/PlatformCALayerClient.h
>+    platform/graphics/ca/TileController.h
>+
>+    platform/graphics/ca/cocoa/PlatformCAAnimationCocoa.h
>+    platform/graphics/ca/cocoa/PlatformCALayerCocoa.h
>+
>+    platform/graphics/cg/GraphicsContextCG.h
>+    platform/graphics/cg/IOSurfacePool.h
>+    platform/graphics/cg/ImageBufferDataCG.h
>+    platform/graphics/cg/ImageBufferUtilitiesCG.h
>+    platform/graphics/cg/PDFDocumentImage.h
>+    platform/graphics/cg/UTIRegistry.h
>+
>+    platform/graphics/cocoa/FontCacheCoreText.h
>+    platform/graphics/cocoa/FontFamilySpecificationCoreText.h
>     platform/graphics/cocoa/IOSurface.h
>-
>-    platform/graphics/transforms/AffineTransform.h
>-
>+    platform/graphics/cocoa/WebActionDisablingCALayerDelegate.h
>+    platform/graphics/cocoa/WebCoreCALayerExtras.h
>+
>+    platform/graphics/mac/ColorMac.h
>+    platform/graphics/mac/SwitchingGPUClient.h
>+    platform/graphics/mac/WebLayer.h
>+
>+    platform/mac/DynamicLinkerInterposing.h
>+    platform/mac/LegacyNSPasteboardTypes.h
>+    platform/mac/LocalDefaultSystemAppearance.h
>+    platform/mac/NSScrollerImpDetails.h
>+    platform/mac/PasteboardWriter.h
>+    platform/mac/PlatformEventFactoryMac.h
>+    platform/mac/PlaybackSessionInterfaceMac.h
>+    platform/mac/PluginBlacklist.h
>+    platform/mac/ScrollbarThemeMac.h
>+    platform/mac/StringUtilities.h
>+    platform/mac/VideoFullscreenInterfaceMac.h
>+    platform/mac/WebCoreFullScreenPlaceholderView.h
>+    platform/mac/WebCoreFullScreenWindow.h
>+    platform/mac/WebCoreNSFontManagerExtras.h
>+    platform/mac/WebCoreNSURLExtras.h
>+    platform/mac/WebCoreObjCExtras.h
>+    platform/mac/WebCoreView.h
>+    platform/mac/WebGLBlacklist.h
>+    platform/mac/WebNSAttributedStringExtras.h
>+    platform/mac/WebPlaybackControlsManager.h
>+
>+    platform/mediastream/libwebrtc/LibWebRTCProviderCocoa.h
>+
>+    platform/mediastream/mac/WebAudioSourceProviderAVFObjC.h
>+
>+    platform/network/cf/AuthenticationCF.h
>+    platform/network/cf/AuthenticationChallenge.h
>     platform/network/cf/CertificateInfo.h
>+    platform/network/cf/DownloadBundle.h
>+    platform/network/cf/LoaderRunLoopCF.h
>+    platform/network/cf/ProtectionSpaceCFNet.h
>+    platform/network/cf/ResourceError.h
>+    platform/network/cf/ResourceRequest.h
>+    platform/network/cf/ResourceRequestCFNet.h
>     platform/network/cf/ResourceResponse.h
>+    platform/network/cf/SocketStreamHandleImpl.h
> 
>-    platform/network/mac/AuthenticationMac.h
>-
>-    platform/sql/SQLiteDatabase.h
>+    platform/network/cocoa/CookieStorageObserver.h
>+    platform/network/cocoa/CredentialCocoa.h
>+    platform/network/cocoa/ProtectionSpaceCocoa.h
>+    platform/network/cocoa/WebCoreNSURLSession.h
> 
>-    rendering/style/RenderStyleConstants.h
>+    platform/network/mac/AuthenticationMac.h
>+    platform/network/mac/FormDataStreamMac.h
>+    platform/network/mac/UTIUtilities.h
>+    platform/network/mac/WebCoreURLResponse.h
> )
> 
> list(APPEND WebCore_IDL_FILES
>     Modules/plugins/QuickTimePluginReplacement.idl
> )
> 
>-WEBKIT_CREATE_FORWARDING_HEADERS(WebCore DIRECTORIES ${WebCore_FORWARDING_HEADERS_DIRECTORIES} FILES ${WebCore_FORWARDING_HEADERS_FILES})
>-
> set(FEATURE_DEFINES_OBJECTIVE_C "LANGUAGE_OBJECTIVE_C=1 ${FEATURE_DEFINES_WITH_SPACE_SEPARATOR}")
> set(ADDITIONAL_BINDINGS_DEPENDENCIES
>     ${WINDOW_CONSTRUCTORS_FILE}
>diff --git a/Source/WebCore/PlatformPlayStation.cmake b/Source/WebCore/PlatformPlayStation.cmake
>index 6d44535d959..84edc2616b3 100644
>--- a/Source/WebCore/PlatformPlayStation.cmake
>+++ b/Source/WebCore/PlatformPlayStation.cmake
>@@ -4,7 +4,7 @@ include(platform/FreeType.cmake)
> include(platform/ImageDecoders.cmake)
> include(platform/TextureMapper.cmake)
> 
>-list(APPEND WebCore_INCLUDE_DIRECTORIES
>+list(APPEND WebCore_PRIVATE_INCLUDE_DIRECTORIES
>     ${THIRDPARTY_DIR}/ANGLE/
>     ${THIRDPARTY_DIR}/ANGLE/include/KHR
>     ${WEBCORE_DIR}/platform
>diff --git a/Source/WebCore/PlatformWPE.cmake b/Source/WebCore/PlatformWPE.cmake
>index 143d1348bcd..3bd9a067bcb 100644
>--- a/Source/WebCore/PlatformWPE.cmake
>+++ b/Source/WebCore/PlatformWPE.cmake
>@@ -3,6 +3,7 @@ include(platform/FreeType.cmake)
> include(platform/GCrypt.cmake)
> include(platform/GStreamer.cmake)
> include(platform/ImageDecoders.cmake)
>+include(platform/Soup.cmake)
> include(platform/TextureMapper.cmake)
> 
> if (USE_EXTERNAL_HOLEPUNCH)
>@@ -13,13 +14,12 @@ list(APPEND WebCore_UNIFIED_SOURCE_LIST_FILES
>     "SourcesWPE.txt"
> 
>     "platform/SourcesGLib.txt"
>-    "platform/SourcesSoup.txt"
> )
> 
> # Allow building ANGLE on platforms that don't provide X11 headers.
> list(APPEND ANGLE_PLATFORM_DEFINITIONS "USE_WPE")
> 
>-list(APPEND WebCore_INCLUDE_DIRECTORIES
>+list(APPEND WebCore_PRIVATE_INCLUDE_DIRECTORIES
>     "${THIRDPARTY_DIR}/ANGLE/"
>     "${THIRDPARTY_DIR}/ANGLE/include/KHR"
>     "${WEBCORE_DIR}/platform/graphics/egl"
>@@ -33,10 +33,14 @@ list(APPEND WebCore_INCLUDE_DIRECTORIES
>     "${WEBCORE_DIR}/platform/mock/mediasource"
>     "${WEBCORE_DIR}/platform/mediacapabilities"
>     "${WEBCORE_DIR}/platform/mediastream/gstreamer"
>-    "${WEBCORE_DIR}/platform/network/soup"
>     "${WEBCORE_DIR}/platform/text/icu"
> )
> 
>+list(APPEND WebCore_PRIVATE_FRAMEWORK_HEADERS
>+    platform/graphics/wayland/PlatformDisplayWayland.h
>+    platform/graphics/wayland/WlUniquePtr.h
>+)
>+
> list(APPEND WebCore_USER_AGENT_STYLE_SHEETS
>     ${WEBCORE_DIR}/Modules/mediacontrols/mediaControlsBase.css
> )
>@@ -49,24 +53,20 @@ set(WebCore_USER_AGENT_SCRIPTS
> set(WebCore_USER_AGENT_SCRIPTS_DEPENDENCIES ${WEBCORE_DIR}/platform/wpe/RenderThemeWPE.cpp)
> 
> list(APPEND WebCore_LIBRARIES
>-    ${CAIRO_LIBRARIES}
>     ${GLIB_GIO_LIBRARIES}
>     ${GLIB_GMODULE_LIBRARIES}
>     ${GLIB_GOBJECT_LIBRARIES}
>     ${GLIB_LIBRARIES}
>     ${ICU_LIBRARIES}
>-    ${LIBSOUP_LIBRARIES}
>     ${LIBTASN1_LIBRARIES}
>     ${UPOWERGLIB_LIBRARIES}
>     ${WPE_LIBRARIES}
> )
> 
> list(APPEND WebCore_SYSTEM_INCLUDE_DIRECTORIES
>-    ${CAIRO_INCLUDE_DIRS}
>     ${GIO_UNIX_INCLUDE_DIRS}
>     ${GLIB_INCLUDE_DIRS}
>     ${ICU_INCLUDE_DIRS}
>-    ${LIBSOUP_INCLUDE_DIRS}
>     ${LIBTASN1_INCLUDE_DIRS}
>     ${UPOWERGLIB_INCLUDE_DIRS}
>     ${WPE_INCLUDE_DIRS}
>diff --git a/Source/WebCore/PlatformWin.cmake b/Source/WebCore/PlatformWin.cmake
>index 0dab1310b61..0e91f6c45a1 100644
>--- a/Source/WebCore/PlatformWin.cmake
>+++ b/Source/WebCore/PlatformWin.cmake
>@@ -1,6 +1,6 @@
> add_definitions(/bigobj -D__STDC_CONSTANT_MACROS)
> 
>-list(APPEND WebCore_INCLUDE_DIRECTORIES
>+list(APPEND WebCore_PRIVATE_INCLUDE_DIRECTORIES
>     "${CMAKE_BINARY_DIR}/../include/private"
>     "${CMAKE_BINARY_DIR}/../include/private/JavaScriptCore"
>     "${WEBCORE_DIR}/accessibility/win"
>@@ -115,131 +115,47 @@ list(APPEND WebCore_SOURCES
>     rendering/RenderThemeWin.cpp
> )
> 
>+list(APPEND WebCore_PRIVATE_FRAMEWORK_HEADERS
>+    accessibility/win/AccessibilityObjectWrapperWin.h
>+
>+    page/win/FrameWin.h
>+
>+    platform/graphics/win/DIBPixelData.h
>+    platform/graphics/win/FullScreenController.h
>+    platform/graphics/win/FullScreenControllerClient.h
>+    platform/graphics/win/ImageBufferDataDirect2D.h
>+    platform/graphics/win/LocalWindowsContext.h
>+    platform/graphics/win/MediaPlayerPrivateFullscreenWindow.h
>+    platform/graphics/win/SharedGDIObject.h
>+
>+    platform/win/BString.h
>+    platform/win/BitmapInfo.h
>+    platform/win/COMPtr.h
>+    platform/win/DefWndProcWindowClass.h
>+    platform/win/GDIObjectCounter.h
>+    platform/win/GDIUtilities.h
>+    platform/win/HWndDC.h
>+    platform/win/PopupMenuWin.h
>+    platform/win/ScrollbarThemeWin.h
>+    platform/win/SearchPopupMenuDB.h
>+    platform/win/SearchPopupMenuWin.h
>+    platform/win/SystemInfo.h
>+    platform/win/WCDataObject.h
>+    platform/win/WebCoreBundleWin.h
>+    platform/win/WebCoreInstanceHandle.h
>+    platform/win/WebCoreTextRenderer.h
>+    platform/win/WindowMessageBroadcaster.h
>+    platform/win/WindowMessageListener.h
>+    platform/win/WindowsTouch.h
>+)
>+
> list(APPEND WebCore_USER_AGENT_STYLE_SHEETS
>     ${WEBCORE_DIR}/css/themeWin.css
>     ${WEBCORE_DIR}/css/themeWinQuirks.css
> )
> 
>-set(WebCore_FORWARDING_HEADERS_DIRECTORIES
>-    .
>-    accessibility
>-    animation
>-    bindings
>-    bridge
>-    contentextensions
>-    crypto
>-    css
>-    dom
>-    editing
>-    fileapi
>-    history
>-    html
>-    inspector
>-    loader
>-    page
>-    platform
>-    plugins
>-    rendering
>-    replay
>-    storage
>-    style
>-    svg
>-    websockets
>-    workers
>-    xml
>-
>-    Modules/cache
>-    Modules/fetch
>-    Modules/geolocation
>-    Modules/indexeddb
>-    Modules/mediastream
>-    Modules/websockets
>-
>-    Modules/indexeddb/client
>-    Modules/indexeddb/legacy
>-    Modules/indexeddb/server
>-    Modules/indexeddb/shared
>-    Modules/notifications
>-    Modules/webdatabase
>-
>-    accessibility/win
>-
>-    bindings/js
>-
>-    bridge/c
>-    bridge/jsc
>-
>-    css/parser
>-
>-    html/canvas
>-    html/forms
>-    html/parser
>-    html/shadow
>-    html/track
>-
>-    loader/appcache
>-    loader/archive
>-    loader/cache
>-    loader/icon
>-
>-    page/animation
>-    page/csp
>-    page/scrolling
>-    page/win
>-
>-    platform/animation
>-    platform/audio
>-    platform/graphics
>-    platform/mediacapabilities
>-    platform/mock
>-    platform/network
>-    platform/sql
>-    platform/text
>-    platform/win
>-
>-    platform/graphics/filters
>-    platform/graphics/opengl
>-    platform/graphics/opentype
>-    platform/graphics/texmap
>-    platform/graphics/transforms
>-    platform/graphics/win
>-
>-    platform/mediastream/libwebrtc
>-
>-    platform/text/transcoder
>-
>-    rendering/line
>-    rendering/shapes
>-    rendering/style
>-    rendering/svg
>-
>-    svg/animation
>-    svg/graphics
>-    svg/properties
>-
>-    svg/graphics/filters
>-
>-    workers/service
>-)
>-
>-if (ENABLE_WEBKIT)
>-    list(APPEND WebCore_FORWARDING_HEADERS_DIRECTORIES
>-        Modules/applicationmanifest
>-
>-        dom/messageports
>-
>-        inspector/agents
>-
>-        platform/mediacapabilities
>-        platform/mediastream
>-
>-        workers/service/context
>-        workers/service/server
>-    )
>-endif ()
>-
> if (USE_CF)
>-    list(APPEND WebCore_INCLUDE_DIRECTORIES
>+    list(APPEND WebCore_PRIVATE_INCLUDE_DIRECTORIES
>         "${WEBCORE_DIR}/platform/cf"
>         "${WEBCORE_DIR}/platform/cf/win"
>     )
>@@ -258,14 +174,10 @@ if (USE_CF)
>         platform/text/cf/HyphenationCF.cpp
>     )
> 
>-    list(APPEND WebCore_FORWARDING_HEADERS_DIRECTORIES
>-        history/cf
>-
>-        loader/archive/cf
>-
>-        platform/cf
>+    list(APPEND WebCore_PRIVATE_FRAMEWORK_HEADERS
>+        loader/archive/cf/LegacyWebArchive.h
> 
>-        platform/cf/win
>+        platform/cf/win/CertificateCFWin.h
>     )
> 
>     list(APPEND WebCore_LIBRARIES ${COREFOUNDATION_LIBRARY})
>@@ -277,10 +189,6 @@ else ()
> 
>         platform/text/Hyphenation.cpp
>     )
>-
>-    list(APPEND WebCore_FORWARDING_HEADERS_DIRECTORIES
>-        platform/generic
>-    )
> endif ()
> 
> if (CMAKE_SIZEOF_VOID_P EQUAL 4)
>@@ -324,49 +232,6 @@ if (WTF_PLATFORM_WIN_CAIRO AND EXISTS ${WEBKIT_LIBRARIES_DIR}/etc/ssl/cert.pem)
>     )
> endif ()
> 
>-set(WebCore_PRIVATE_FRAMEWORK_HEADERS
>-    ${WebCore_DERIVED_SOURCES_DIR}/CSSPropertyNames.h
>-    ${WebCore_DERIVED_SOURCES_DIR}/CSSValueKeywords.h
>-    ${WebCore_DERIVED_SOURCES_DIR}/EventInterfaces.h
>-    ${WebCore_DERIVED_SOURCES_DIR}/EventTargetInterfaces.h
>-    ${WebCore_DERIVED_SOURCES_DIR}/HTMLElementTypeHelpers.h
>-    ${WebCore_DERIVED_SOURCES_DIR}/HTMLNames.h
>-    ${WebCore_DERIVED_SOURCES_DIR}/HTTPHeaderNames.h
>-    ${WebCore_DERIVED_SOURCES_DIR}/JSBlob.h
>-    ${WebCore_DERIVED_SOURCES_DIR}/JSCSSStyleDeclaration.h
>-    ${WebCore_DERIVED_SOURCES_DIR}/JSDOMBindingInternalsBuiltins.h
>-    ${WebCore_DERIVED_SOURCES_DIR}/JSDOMWindow.h
>-    ${WebCore_DERIVED_SOURCES_DIR}/JSDocument.h
>-    ${WebCore_DERIVED_SOURCES_DIR}/JSElement.h
>-    ${WebCore_DERIVED_SOURCES_DIR}/JSEventTarget.h
>-    ${WebCore_DERIVED_SOURCES_DIR}/JSFile.h
>-    ${WebCore_DERIVED_SOURCES_DIR}/JSHTMLElement.h
>-    ${WebCore_DERIVED_SOURCES_DIR}/JSNode.h
>-    ${WebCore_DERIVED_SOURCES_DIR}/JSNotification.h
>-    ${WebCore_DERIVED_SOURCES_DIR}/JSRange.h
>-    ${WebCore_DERIVED_SOURCES_DIR}/JSReadableStream.h
>-    ${WebCore_DERIVED_SOURCES_DIR}/JSReadableStreamDefaultController.h
>-    ${WebCore_DERIVED_SOURCES_DIR}/RTCPeerConnectionInternalsBuiltins.h
>-    ${WebCore_DERIVED_SOURCES_DIR}/ReadableByteStreamInternalsBuiltins.h
>-    ${WebCore_DERIVED_SOURCES_DIR}/ReadableStreamInternalsBuiltins.h
>-    ${WebCore_DERIVED_SOURCES_DIR}/Settings.h
>-    ${WebCore_DERIVED_SOURCES_DIR}/StreamInternalsBuiltins.h
>-    ${WebCore_DERIVED_SOURCES_DIR}/WebCoreJSBuiltinInternals.h
>-    ${WebCore_DERIVED_SOURCES_DIR}/WebCoreJSBuiltins.h
>-    ${WebCore_DERIVED_SOURCES_DIR}/WebKitFontFamilyNames.h
>-    ${WebCore_DERIVED_SOURCES_DIR}/WritableStreamInternalsBuiltins.h
>-)
>-
>-WEBKIT_MAKE_FORWARDING_HEADERS(WebCore
>-    TARGET_NAME WebCorePrivateFrameworkHeaders
>-    DESTINATION ${WebCore_PRIVATE_FRAMEWORK_HEADERS_DIR}/WebCore
>-    FILES ${WebCore_PRIVATE_FRAMEWORK_HEADERS}
>-    DIRECTORIES ${WebCore_FORWARDING_HEADERS_DIRECTORIES}
>-    FLATTENED
>-)
>-
>-add_dependencies(WebCorePrivateFrameworkHeaders WebCoreBindings)
>-
> set(WebCore_OUTPUT_NAME
>     WebCore${DEBUG_SUFFIX}
> )
>diff --git a/Source/WebCore/PlatformWinCairo.cmake b/Source/WebCore/PlatformWinCairo.cmake
>index b0565a09c88..ed69d743ae5 100644
>--- a/Source/WebCore/PlatformWinCairo.cmake
>+++ b/Source/WebCore/PlatformWinCairo.cmake
>@@ -3,7 +3,7 @@ include(platform/Curl.cmake)
> include(platform/ImageDecoders.cmake)
> include(platform/TextureMapper.cmake)
> 
>-list(APPEND WebCore_INCLUDE_DIRECTORIES
>+list(APPEND WebCore_PRIVATE_INCLUDE_DIRECTORIES
>     "${DirectX_INCLUDE_DIRS}"
>     "${WEBKIT_LIBRARIES_DIR}/include"
>     "${WEBCORE_DIR}/loader/archive/cf"
>@@ -52,9 +52,3 @@ list(APPEND WebCoreTestSupport_LIBRARIES
>     ${CAIRO_LIBRARIES}
>     shlwapi
> )
>-
>-list(APPEND WebCore_FORWARDING_HEADERS_DIRECTORIES
>-    platform/mediacapabilities
>-    platform/graphics/cairo
>-    platform/network/curl
>-)
>diff --git a/Source/WebCore/platform/Cairo.cmake b/Source/WebCore/platform/Cairo.cmake
>index 2338f2b47d4..9a3a8bf943a 100644
>--- a/Source/WebCore/platform/Cairo.cmake
>+++ b/Source/WebCore/platform/Cairo.cmake
>@@ -1,4 +1,4 @@
>-list(APPEND WebCore_INCLUDE_DIRECTORIES
>+list(APPEND WebCore_PRIVATE_INCLUDE_DIRECTORIES
>     "${WEBCORE_DIR}/platform/graphics/cairo"
> )
> 
>@@ -6,6 +6,18 @@ list(APPEND WebCore_UNIFIED_SOURCE_LIST_FILES
>     "platform/SourcesCairo.txt"
> )
> 
>+list(APPEND WebCore_PRIVATE_FRAMEWORK_HEADERS
>+    platform/graphics/cairo/BackingStoreBackendCairo.h
>+    platform/graphics/cairo/BackingStoreBackendCairoImpl.h
>+    platform/graphics/cairo/BackingStoreBackendCairoX11.h
>+    platform/graphics/cairo/CairoOperations.h
>+    platform/graphics/cairo/CairoUtilities.h
>+    platform/graphics/cairo/GraphicsContextImplCairo.h
>+    platform/graphics/cairo/ImageBufferDataCairo.h
>+    platform/graphics/cairo/PlatformContextCairo.h
>+    platform/graphics/cairo/RefPtrCairo.h
>+)
>+
> list(APPEND WebCore_SYSTEM_INCLUDE_DIRECTORIES
>     ${CAIRO_INCLUDE_DIRS}
> )
>diff --git a/Source/WebCore/platform/Curl.cmake b/Source/WebCore/platform/Curl.cmake
>index e48a46c1077..0064adf0ac4 100644
>--- a/Source/WebCore/platform/Curl.cmake
>+++ b/Source/WebCore/platform/Curl.cmake
>@@ -1,4 +1,4 @@
>-list(APPEND WebCore_INCLUDE_DIRECTORIES
>+list(APPEND WebCore_PRIVATE_INCLUDE_DIRECTORIES
>     "${WEBCORE_DIR}/platform/network/curl"
> )
> 
>@@ -35,6 +35,34 @@ list(APPEND WebCore_SOURCES
>     platform/network/curl/SynchronousLoaderClientCurl.cpp
> )
> 
>+list(APPEND WebCore_PRIVATE_FRAMEWORK_HEADERS
>+    platform/network/curl/AuthenticationChallenge.h
>+    platform/network/curl/CertificateInfo.h
>+    platform/network/curl/CookieJarCurl.h
>+    platform/network/curl/CookieJarDB.h
>+    platform/network/curl/CookieUtil.h
>+    platform/network/curl/CurlCacheEntry.h
>+    platform/network/curl/CurlCacheManager.h
>+    platform/network/curl/CurlContext.h
>+    platform/network/curl/CurlDownload.h
>+    platform/network/curl/CurlFormDataStream.h
>+    platform/network/curl/CurlMultipartHandle.h
>+    platform/network/curl/CurlMultipartHandleClient.h
>+    platform/network/curl/CurlProxySettings.h
>+    platform/network/curl/CurlRequest.h
>+    platform/network/curl/CurlRequestClient.h
>+    platform/network/curl/CurlRequestSchedulerClient.h
>+    platform/network/curl/CurlResourceHandleDelegate.h
>+    platform/network/curl/CurlResponse.h
>+    platform/network/curl/CurlSSLHandle.h
>+    platform/network/curl/DownloadBundle.h
>+    platform/network/curl/ProtectionSpaceCurl.h
>+    platform/network/curl/ResourceError.h
>+    platform/network/curl/ResourceRequest.h
>+    platform/network/curl/ResourceResponse.h
>+    platform/network/curl/SocketStreamHandleImpl.h
>+)
>+
> list(APPEND WebCore_SYSTEM_INCLUDE_DIRECTORIES
>     ${CURL_INCLUDE_DIRS}
>     ${LIBPSL_INCLUDE_DIR}
>diff --git a/Source/WebCore/platform/FreeType.cmake b/Source/WebCore/platform/FreeType.cmake
>index 1be43cc8a76..f1d3a162e28 100644
>--- a/Source/WebCore/platform/FreeType.cmake
>+++ b/Source/WebCore/platform/FreeType.cmake
>@@ -1,4 +1,4 @@
>-list(APPEND WebCore_INCLUDE_DIRECTORIES
>+list(APPEND WebCore_PRIVATE_INCLUDE_DIRECTORIES
>     "${WEBCORE_DIR}/platform/graphics/freetype"
>     "${WEBCORE_DIR}/platform/graphics/harfbuzz"
>     "${WEBCORE_DIR}/platform/graphics/harfbuzz/ng"
>@@ -14,6 +14,13 @@ list(APPEND WebCore_SOURCES
>     platform/graphics/harfbuzz/ComplexTextControllerHarfBuzz.cpp
> )
> 
>+list(APPEND WebCore_PRIVATE_FRAMEWORK_HEADERS
>+    platform/graphics/freetype/FcUniquePtr.h
>+    platform/graphics/freetype/RefPtrFontconfig.h
>+
>+    platform/graphics/harfbuzz/HbUniquePtr.h
>+)
>+
> if (PORT STREQUAL "GTK")
>     list(APPEND WebCorePlatformGTK_SOURCES
>         platform/graphics/freetype/FontCacheFreeType.cpp
>diff --git a/Source/WebCore/platform/GStreamer.cmake b/Source/WebCore/platform/GStreamer.cmake
>index 3573899b5b5..f240ec7af10 100644
>--- a/Source/WebCore/platform/GStreamer.cmake
>+++ b/Source/WebCore/platform/GStreamer.cmake
>@@ -1,5 +1,5 @@
> if (ENABLE_VIDEO OR ENABLE_WEB_AUDIO)
>-    list(APPEND WebCore_INCLUDE_DIRECTORIES
>+    list(APPEND WebCore_PRIVATE_INCLUDE_DIRECTORIES
>         "${WEBCORE_DIR}/platform/graphics/gstreamer"
>         "${WEBCORE_DIR}/platform/graphics/gstreamer/mse"
>         "${WEBCORE_DIR}/platform/graphics/gstreamer/eme"
>@@ -59,6 +59,17 @@ if (ENABLE_VIDEO OR ENABLE_WEB_AUDIO)
>         platform/mediastream/gstreamer/RealtimeOutgoingVideoSourceLibWebRTC.cpp
>     )
> 
>+    list(APPEND WebCore_PRIVATE_FRAMEWORK_HEADERS
>+        platform/graphics/gstreamer/GRefPtrGStreamer.h
>+        platform/graphics/gstreamer/GStreamerCommon.h
>+        platform/graphics/gstreamer/GUniquePtrGStreamer.h
>+        platform/graphics/gstreamer/MediaPlayerRequestInstallMissingPluginsCallback.h
>+
>+        platform/mediastream/libwebrtc/GStreamerVideoDecoderFactory.h
>+        platform/mediastream/libwebrtc/GStreamerVideoEncoderFactory.h
>+        platform/mediastream/libwebrtc/LibWebRTCProviderGStreamer.h
>+    )
>+
>     list(APPEND WebCore_SYSTEM_INCLUDE_DIRECTORIES
>         ${GSTREAMER_INCLUDE_DIRS}
>         ${GSTREAMER_BASE_INCLUDE_DIRS}
>@@ -125,7 +136,7 @@ if (ENABLE_VIDEO)
> endif ()
> 
> if (ENABLE_WEB_AUDIO)
>-    list(APPEND WebCore_INCLUDE_DIRECTORIES
>+    list(APPEND WebCore_PRIVATE_INCLUDE_DIRECTORIES
>         "${WEBCORE_DIR}/platform/audio/gstreamer"
>     )
> 
>@@ -148,15 +159,20 @@ if (ENABLE_WEB_AUDIO)
> endif ()
> 
> if (ENABLE_ENCRYPTED_MEDIA)
>-    list(APPEND WebCore_INCLUDE_DIRECTORIES
>+    list(APPEND WebCore_PRIVATE_INCLUDE_DIRECTORIES
>         "${WEBCORE_DIR}/platform/encryptedmedia/clearkey"
>-        ${LIBGCRYPT_INCLUDE_DIRS}
>     )
>+
>     list(APPEND WebCore_SOURCES
>         platform/encryptedmedia/clearkey/CDMClearKey.cpp
> 
>         platform/graphics/gstreamer/eme/CDMFactoryGStreamer.cpp
>     )
>+
>+    list(APPEND WebCore_SYSTEM_INCLUDE_DIRECTORIES
>+        ${LIBGCRYPT_INCLUDE_DIRS}
>+    )
>+
>     list(APPEND WebCore_LIBRARIES
>         ${LIBGCRYPT_LIBRARIES} -lgpg-error
>     )
>diff --git a/Source/WebCore/platform/HolePunch.cmake b/Source/WebCore/platform/HolePunch.cmake
>index 4ac1631435f..e8087b06010 100644
>--- a/Source/WebCore/platform/HolePunch.cmake
>+++ b/Source/WebCore/platform/HolePunch.cmake
>@@ -1,4 +1,4 @@
>-list(APPEND WebCore_INCLUDE_DIRECTORIES
>+list(APPEND WebCore_PRIVATE_INCLUDE_DIRECTORIES
>     "${WEBCORE_DIR}/platform/graphics/holepunch"
> )
> list(APPEND WebCore_SOURCES
>diff --git a/Source/WebCore/platform/ImageDecoders.cmake b/Source/WebCore/platform/ImageDecoders.cmake
>index 292aa88cc88..20ad55f56d9 100644
>--- a/Source/WebCore/platform/ImageDecoders.cmake
>+++ b/Source/WebCore/platform/ImageDecoders.cmake
>@@ -1,4 +1,4 @@
>-list(APPEND WebCore_INCLUDE_DIRECTORIES
>+list(APPEND WebCore_PRIVATE_INCLUDE_DIRECTORIES
>     "${WEBCORE_DIR}/platform/image-decoders"
>     "${WEBCORE_DIR}/platform/image-decoders/bmp"
>     "${WEBCORE_DIR}/platform/image-decoders/gif"
>diff --git a/Source/WebCore/platform/Soup.cmake b/Source/WebCore/platform/Soup.cmake
>new file mode 100644
>index 00000000000..f31daf31e10
>--- /dev/null
>+++ b/Source/WebCore/platform/Soup.cmake
>@@ -0,0 +1,32 @@
>+list(APPEND WebCore_PRIVATE_INCLUDE_DIRECTORIES
>+    "${WEBCORE_DIR}/platform/network/soup"
>+)
>+
>+list(APPEND WebCore_UNIFIED_SOURCE_LIST_FILES
>+    "platform/SourcesSoup.txt"
>+)
>+
>+list(APPEND WebCore_PRIVATE_FRAMEWORK_HEADERS
>+    platform/network/soup/AuthenticationChallenge.h
>+    platform/network/soup/CertificateInfo.h
>+    platform/network/soup/DNSResolveQueueSoup.h
>+    platform/network/soup/GRefPtrSoup.h
>+    platform/network/soup/GUniquePtrSoup.h
>+    platform/network/soup/ResourceError.h
>+    platform/network/soup/ResourceRequest.h
>+    platform/network/soup/ResourceResponse.h
>+    platform/network/soup/SocketStreamHandleImpl.h
>+    platform/network/soup/SoupNetworkProxySettings.h
>+    platform/network/soup/SoupNetworkSession.h
>+    platform/network/soup/URLSoup.h
>+    platform/network/soup/WebKitSoupRequestGeneric.h
>+    platform/network/soup/WebKitSoupRequestGenericClient.h
>+)
>+
>+list(APPEND WebCore_SYSTEM_INCLUDE_DIRECTORIES
>+    ${LIBSOUP_INCLUDE_DIRS}
>+)
>+
>+list(APPEND WebCore_LIBRARIES
>+    ${LIBSOUP_LIBRARIES}
>+)
>diff --git a/Source/WebCore/platform/TextureMapper.cmake b/Source/WebCore/platform/TextureMapper.cmake
>index 0ce6d6abcd6..28b7e177a10 100644
>--- a/Source/WebCore/platform/TextureMapper.cmake
>+++ b/Source/WebCore/platform/TextureMapper.cmake
>@@ -1,6 +1,7 @@
>-list(APPEND WebCore_INCLUDE_DIRECTORIES
>+list(APPEND WebCore_PRIVATE_INCLUDE_DIRECTORIES
>     "${WEBCORE_DIR}/platform/graphics/texmap"
> )
>+
> list(APPEND WebCore_SOURCES
>     platform/graphics/texmap/BitmapTexture.cpp
>     platform/graphics/texmap/BitmapTexturePool.cpp
>@@ -14,6 +15,25 @@ list(APPEND WebCore_SOURCES
>     platform/graphics/texmap/TextureMapperTile.cpp
> )
> 
>+list(APPEND WebCore_PRIVATE_FRAMEWORK_HEADERS
>+    platform/graphics/texmap/BitmapTexture.h
>+    platform/graphics/texmap/ClipStack.h
>+    platform/graphics/texmap/GraphicsLayerTextureMapper.h
>+    platform/graphics/texmap/TextureMapper.h
>+    platform/graphics/texmap/TextureMapperAnimation.h
>+    platform/graphics/texmap/TextureMapperBackingStore.h
>+    platform/graphics/texmap/TextureMapperContextAttributes.h
>+    platform/graphics/texmap/TextureMapperFPSCounter.h
>+    platform/graphics/texmap/TextureMapperGL.h
>+    platform/graphics/texmap/TextureMapperGLHeaders.h
>+    platform/graphics/texmap/TextureMapperLayer.h
>+    platform/graphics/texmap/TextureMapperPlatformLayer.h
>+    platform/graphics/texmap/TextureMapperPlatformLayerProxy.h
>+    platform/graphics/texmap/TextureMapperPlatformLayerProxyProvider.h
>+    platform/graphics/texmap/TextureMapperTile.h
>+    platform/graphics/texmap/TextureMapperTiledBackingStore.h
>+)
>+
> if (USE_TEXTURE_MAPPER_GL)
>     list(APPEND WebCore_SOURCES
>         platform/graphics/texmap/BitmapTextureGL.cpp
>@@ -25,7 +45,7 @@ if (USE_TEXTURE_MAPPER_GL)
> endif ()
> 
> if (USE_COORDINATED_GRAPHICS)
>-    list(APPEND WebCore_INCLUDE_DIRECTORIES
>+    list(APPEND WebCore_PRIVATE_INCLUDE_DIRECTORIES
>         "${WEBCORE_DIR}/page/scrolling/nicosia"
>         "${WEBCORE_DIR}/platform/graphics/texmap/coordinated"
>     )
>@@ -38,9 +58,18 @@ if (USE_COORDINATED_GRAPHICS)
>         platform/graphics/texmap/coordinated/Tile.cpp
>         platform/graphics/texmap/coordinated/TiledBackingStore.cpp
>     )
>+    list(APPEND WebCore_PRIVATE_FRAMEWORK_HEADERS
>+        platform/graphics/texmap/coordinated/CoordinatedBackingStore.h
>+        platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.h
>+        platform/graphics/texmap/coordinated/CoordinatedGraphicsState.h
>+        platform/graphics/texmap/coordinated/SurfaceUpdateInfo.h
>+        platform/graphics/texmap/coordinated/Tile.h
>+        platform/graphics/texmap/coordinated/TiledBackingStore.h
>+        platform/graphics/texmap/coordinated/TiledBackingStoreClient.h
>+    )
> 
>     # FIXME: Move this into Nicosia.cmake once the component is set for long-term use.
>-    list(APPEND WebCore_INCLUDE_DIRECTORIES
>+    list(APPEND WebCore_PRIVATE_INCLUDE_DIRECTORIES
>         "${WEBCORE_DIR}/platform/graphics/nicosia"
>         "${WEBCORE_DIR}/platform/graphics/nicosia/cairo"
>         "${WEBCORE_DIR}/platform/graphics/nicosia/texmap"
>@@ -63,6 +92,20 @@ if (USE_COORDINATED_GRAPHICS)
>         platform/graphics/nicosia/texmap/NicosiaGC3DLayer.cpp
>         platform/graphics/nicosia/texmap/NicosiaImageBackingTextureMapperImpl.cpp
>     )
>+    list(APPEND WebCore_PRIVATE_FRAMEWORK_HEADERS
>+        page/scrolling/nicosia/ScrollingTreeFixedNode.h
>+        page/scrolling/nicosia/ScrollingTreeStickyNode.h
>+
>+        platform/graphics/nicosia/NicosiaBuffer.h
>+        platform/graphics/nicosia/NicosiaPaintingEngine.h
>+        platform/graphics/nicosia/NicosiaPlatformLayer.h
>+        platform/graphics/nicosia/NicosiaScene.h
>+
>+        platform/graphics/nicosia/texmap/NicosiaBackingStoreTextureMapperImpl.h
>+        platform/graphics/nicosia/texmap/NicosiaCompositionLayerTextureMapperImpl.h
>+        platform/graphics/nicosia/texmap/NicosiaContentLayerTextureMapperImpl.h
>+        platform/graphics/nicosia/texmap/NicosiaImageBackingTextureMapperImpl.h
>+    )
> else ()
>     list(APPEND WebCore_SOURCES
>         platform/graphics/texmap/GraphicsLayerTextureMapper.cpp
>diff --git a/Source/WebKit/CMakeLists.txt b/Source/WebKit/CMakeLists.txt
>index 6055b246005..8c3fefa95bb 100644
>--- a/Source/WebKit/CMakeLists.txt
>+++ b/Source/WebKit/CMakeLists.txt
>@@ -2,6 +2,10 @@ include(WebKitCommon)
> 
> set_property(DIRECTORY . PROPERTY FOLDER "WebKit")
> 
>+set(WebKit_PRIVATE_INCLUDE_DIRECTORIES
>+    "${CMAKE_BINARY_DIR}"
>+)
>+
> set(WebKit_INCLUDE_DIRECTORIES
>     "${WebCore_PRIVATE_FRAMEWORK_HEADERS_DIR}"
>     "${WebKit_FRAMEWORK_HEADERS_DIR}"
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 78bd79e7874..8c02582c4e5 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,17 @@
>+2019-04-15  Don Olmstead  <don.olmstead@sony.com>
>+
>+        [CMake] Make WebCore headers copies
>+        https://bugs.webkit.org/show_bug.cgi?id=182512
>+        <rdar://problem/37510435>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * CMakeLists.txt:
>+        * Scripts/generate-forwarding-headers.pl:
>+        * UIProcess/API/glib/WebKitUserContentFilterStore.cpp:
>+        * UIProcess/WebsiteData/win/WebsiteDataStoreWin.cpp:
>+        * UIProcess/win/PageClientImpl.cpp:
>+
> 2019-04-15  Chris Dumez  <cdumez@apple.com>
> 
>         URL set by document.open() is not communicated to the UIProcess
>diff --git a/Source/WebKit/Scripts/generate-forwarding-headers.pl b/Source/WebKit/Scripts/generate-forwarding-headers.pl
>index 27983099745..84598561384 100755
>--- a/Source/WebKit/Scripts/generate-forwarding-headers.pl
>+++ b/Source/WebKit/Scripts/generate-forwarding-headers.pl
>@@ -37,7 +37,7 @@ use Getopt::Long;
> 
> my $srcRoot = realpath(File::Spec->catfile(dirname(abs_path($0)), "../.."));
> my @platformPrefixes = ("ca", "cf", "cocoa", "Cocoa", "curl", "gtk", "ios", "mac", "soup", "win", "wpe");
>-my @frameworks = ("WebCore", "WebKit");
>+my @frameworks = ("WebKit");
> my @skippedPrefixes = ("PAL");
> my @frameworkHeaders;
> my $framework;
>diff --git a/Source/WebKit/UIProcess/API/glib/WebKitUserContentFilterStore.cpp b/Source/WebKit/UIProcess/API/glib/WebKitUserContentFilterStore.cpp
>index 53e0269e07a..6241bb5a0d0 100644
>--- a/Source/WebKit/UIProcess/API/glib/WebKitUserContentFilterStore.cpp
>+++ b/Source/WebKit/UIProcess/API/glib/WebKitUserContentFilterStore.cpp
>@@ -28,10 +28,10 @@
> 
> #include "APIContentRuleList.h"
> #include "APIContentRuleListStore.h"
>-#include "ContentExtensionError.h"
> #include "WebKitError.h"
> #include "WebKitUserContent.h"
> #include "WebKitUserContentPrivate.h"
>+#include <WebCore/ContentExtensionError.h>
> #include <glib/gi18n-lib.h>
> #include <wtf/CompletionHandler.h>
> #include <wtf/FileSystem.h>
>diff --git a/Source/WebKit/UIProcess/WebsiteData/win/WebsiteDataStoreWin.cpp b/Source/WebKit/UIProcess/WebsiteData/win/WebsiteDataStoreWin.cpp
>index 90b766033fc..60dd2e29514 100644
>--- a/Source/WebKit/UIProcess/WebsiteData/win/WebsiteDataStoreWin.cpp
>+++ b/Source/WebKit/UIProcess/WebsiteData/win/WebsiteDataStoreWin.cpp
>@@ -26,7 +26,7 @@
> #include "config.h"
> #include "WebsiteDataStore.h"
> 
>-#include "NotImplemented.h"
>+#include <WebCore/NotImplemented.h>
> 
> namespace WebKit {
> 
>diff --git a/Source/WebKit/UIProcess/win/PageClientImpl.cpp b/Source/WebKit/UIProcess/win/PageClientImpl.cpp
>index eb4b80b8fd9..cd6f08ff18b 100644
>--- a/Source/WebKit/UIProcess/win/PageClientImpl.cpp
>+++ b/Source/WebKit/UIProcess/win/PageClientImpl.cpp
>@@ -28,12 +28,12 @@
> #include "PageClientImpl.h"
> 
> #include "DrawingAreaProxyCoordinatedGraphics.h"
>-#include "NotImplemented.h"
> #include "WebContextMenuProxyWin.h"
> #include "WebPageProxy.h"
> #include "WebPopupMenuProxyWin.h"
> #include "WebView.h"
> #include <WebCore/DOMPasteAccess.h>
>+#include <WebCore/NotImplemented.h>
> 
> namespace WebKit {
> using namespace WebCore;
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 1d2fb20830f..af448e11791 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,17 @@
>+2019-04-15  Don Olmstead  <don.olmstead@sony.com>
>+
>+        [CMake] Make WebCore headers copies
>+        https://bugs.webkit.org/show_bug.cgi?id=182512
>+        <rdar://problem/37510435>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * TestWebKitAPI/CMakeLists.txt:
>+        * TestWebKitAPI/PlatformWin.cmake:
>+        * TestWebKitAPI/Tests/WebCore/AbortableTaskQueue.cpp:
>+        * TestWebKitAPI/Tests/WebCore/gstreamer/GstMappedBuffer.cpp:
>+        * WebKitTestRunner/win/PlatformWebViewWin.cpp:
>+
> 2019-04-15  Aakash Jain  <aakash_jain@apple.com>
> 
>         Regression (r244291): Broken API Test AutoLayoutRenderingProgressRelativeOrdering
>diff --git a/Tools/TestWebKitAPI/CMakeLists.txt b/Tools/TestWebKitAPI/CMakeLists.txt
>index 666b73db5bc..d2380f0fad3 100644
>--- a/Tools/TestWebKitAPI/CMakeLists.txt
>+++ b/Tools/TestWebKitAPI/CMakeLists.txt
>@@ -21,7 +21,10 @@ set(TestWebKitAPI_DEPENDENCIES
> )
> 
> if (ENABLE_WEBCORE)
>-    list(APPEND TestWebKitAPI_DEPENDENCIES PALFrameworkHeaders)
>+    list(APPEND TestWebKitAPI_DEPENDENCIES
>+        PALFrameworkHeaders
>+        WebCorePrivateFrameworkHeaders
>+    )
> endif ()
> 
> if (ENABLE_WEBKIT)
>diff --git a/Tools/TestWebKitAPI/PlatformWin.cmake b/Tools/TestWebKitAPI/PlatformWin.cmake
>index a7be864a22e..c25117ff656 100644
>--- a/Tools/TestWebKitAPI/PlatformWin.cmake
>+++ b/Tools/TestWebKitAPI/PlatformWin.cmake
>@@ -107,7 +107,6 @@ if (USE_CF)
>     )
> endif ()
> 
>-list(APPEND TestWebKitAPI_DEPENDENCIES WebCorePrivateFrameworkHeaders)
> if (ENABLE_WEBKIT)
>     list(APPEND TestWebKitAPI_DEPENDENCIES WebKitFrameworkHeaders)
> endif ()
>diff --git a/Tools/TestWebKitAPI/Tests/WebCore/AbortableTaskQueue.cpp b/Tools/TestWebKitAPI/Tests/WebCore/AbortableTaskQueue.cpp
>index 15dcb2076bb..c1dcc4cb487 100644
>--- a/Tools/TestWebKitAPI/Tests/WebCore/AbortableTaskQueue.cpp
>+++ b/Tools/TestWebKitAPI/Tests/WebCore/AbortableTaskQueue.cpp
>@@ -26,8 +26,8 @@
> 
> #include "config.h"
> 
>-#include <AbortableTaskQueue.h>
>-#include <Utilities.h>
>+#include "Utilities.h"
>+#include <WebCore/AbortableTaskQueue.h>
> #include <wtf/Threading.h>
> 
> using namespace WebCore;
>diff --git a/Tools/TestWebKitAPI/Tests/WebCore/gstreamer/GstMappedBuffer.cpp b/Tools/TestWebKitAPI/Tests/WebCore/gstreamer/GstMappedBuffer.cpp
>index df572aee5cc..d24fcb9e252 100644
>--- a/Tools/TestWebKitAPI/Tests/WebCore/gstreamer/GstMappedBuffer.cpp
>+++ b/Tools/TestWebKitAPI/Tests/WebCore/gstreamer/GstMappedBuffer.cpp
>@@ -29,9 +29,9 @@
> #if USE(GSTREAMER)
> 
> #include "GStreamerTest.h"
>-#include "SharedBuffer.h"
> #include "Test.h"
> #include <WebCore/GStreamerCommon.h>
>+#include <WebCore/SharedBuffer.h>
> 
> using namespace WebCore;
> 
>diff --git a/Tools/WebKitTestRunner/win/PlatformWebViewWin.cpp b/Tools/WebKitTestRunner/win/PlatformWebViewWin.cpp
>index 7879457528a..3913dba6855 100644
>--- a/Tools/WebKitTestRunner/win/PlatformWebViewWin.cpp
>+++ b/Tools/WebKitTestRunner/win/PlatformWebViewWin.cpp
>@@ -29,7 +29,7 @@
> #include "config.h"
> #include "PlatformWebView.h"
> 
>-#include <HWndDC.h>
>+#include <WebCore/HWndDC.h>
> #include <cairo.h>
> #include <cstdio>
> #include <windows.h>

Flags:

ews-watchlist: commit-queue-

Actions: View | Formatted Diff | Diff

Attachments on bug 182512: 333125 | 333142 | 333143 | 333146 | 333148 | 333355 | 333658 | 333659 | 333661 | 333663 | 333665 | 333667 | 333679 | 333699 | 333701 | 333704 | 333708 | 333714 | 354708 | 354710 | 354722 | 354746 | 354747 | 354768 | 354771 | 354773 | 355306 | 355307 | 355351 | 355355 | 355357 | 355359 | 355361 | 367480 | 367481 | 367483 | 367485 | 367496 | 367497 | 367498 | 367499 | 367500 | 367511 | 367540 | 367543 | 367570 | 367576 | 367601 | 367735 | 367736 | 367738 | 367742 | 367757 | 367773 | 367774