[CMake] Make WebCore headers copies

https://bugs.webkit.org/show_bug.cgi?id=182512

Reviewed by Keith Miller.

Source/WebCore:

No new tests. No change in behavior.

* CMakeLists.txt:
* PlatformAppleWin.cmake:
* PlatformGTK.cmake:
* PlatformMac.cmake:
* PlatformWPE.cmake:
* PlatformWin.cmake:
* PlatformWinCairo.cmake:
* platform/Cairo.cmake:
* platform/Curl.cmake:
* platform/FreeType.cmake:
* platform/GStreamer.cmake:
* platform/ImageDecoders.cmake:
* platform/TextureMapper.cmake:
* platform/graphics/win/LocalWindowsContext.h:

Source/WebKit:

* CMakeLists.txt:
* NetworkProcess/capture/NetworkCaptureManager.cpp:
* NetworkProcess/webrtc/NetworkRTCMonitor.h:
* PlatformWPE.cmake:
* Scripts/generate-forwarding-headers.pl:
* Shared/gtk/WebEventFactory.cpp:
* UIProcess/API/gtk/PageClientImpl.cpp:
* UIProcess/API/gtk/WebKitWebViewBase.cpp:
* UIProcess/gtk/WebPageProxyGtk.cpp:
* WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp:
* WebProcess/WebCoreSupport/gtk/WebEditorClientGtk.cpp:
* WebProcess/WebCoreSupport/wpe/WebEditorClientWPE.cpp:
* WebProcess/WebPage/gtk/WebPageGtk.cpp:
* WebProcess/WebPage/wpe/WebPageWPE.cpp:

Source/WebKitLegacy:

* PlatformWin.cmake:

Source/WebKitLegacy/win:

* FullscreenVideoController.h:
* Plugins/PluginDatabase.cpp:
* Plugins/PluginDatabaseWin.cpp:
* Plugins/PluginDebug.cpp:
* Plugins/PluginMainThreadScheduler.cpp:
* Plugins/PluginMessageThrottlerWin.cpp:
* Plugins/PluginPackage.cpp:
* Plugins/PluginPackageWin.cpp:
* Plugins/PluginStream.cpp:
* Plugins/PluginView.cpp:
* Plugins/PluginViewWin.cpp:
* Plugins/npapi.cpp:
* WebKitMessageLoop.cpp:
* WebKitPrefix.h:
* storage/WebDatabaseProvider.cpp:

Tools:

* DumpRenderTree/CMakeLists.txt:
* DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt:
* DumpRenderTree/TestNetscapePlugIn/ForwardingHeaders/WebKit/npapi.h:
* DumpRenderTree/TestNetscapePlugIn/ForwardingHeaders/WebKit/npfunctions.h:
* DumpRenderTree/TestNetscapePlugIn/ForwardingHeaders/WebKit/npruntime.h:
* TestWebKitAPI/PlatformGTK.cmake:
* TestWebKitAPI/PlatformWPE.cmake:
* TestWebKitAPI/PlatformWin.cmake:
* TestWebKitAPI/win/TestWebCoreStubs.cpp:
(loadResourceIntoBuffer):
* WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp:
* WebKitTestRunner/InjectedBundle/wpe/AccessibilityControllerWPE.cpp:
* WebKitTestRunner/InjectedBundle/wpe/AccessibilityUIElementWPE.cpp:
* WebKitTestRunner/gtk/EventSenderProxyGtk.cpp:
* WebKitTestRunner/wpe/EventSenderProxyWPE.cpp:

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

diff --git a/Source/WebCore/CMakeLists.txt b/Source/WebCore/CMakeLists.txt
index 8f252dd..6637d7d 100644 (file)
--- a/Source/WebCore/CMakeLists.txt
+++ b/Source/WebCore/CMakeLists.txt
@@ -15,7 +15,1368 @@ list(APPEND WebCore_UNIFIED_SOURCE_LIST_FILES
     "Sources.txt"
 )
 
-set(WebCore_INCLUDE_DIRECTORIES
+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/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/navigatorcontentutils/NavigatorContentUtilsClient.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/cbor/CBORReader.h
+    Modules/webauthn/cbor/CBORValue.h
+    Modules/webauthn/cbor/CBORWriter.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/AccessibilityRenderObject.h
+
+    animation/AnimationEffectTimingProperties.h
+    animation/CSSPropertyBlendingClient.h
+    animation/CompositeOperation.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/CachedModuleScriptLoader.h
+    bindings/js/CachedModuleScriptLoaderClient.h
+    bindings/js/CachedScriptFetcher.h
+    bindings/js/CachedScriptSourceProvider.h
+    bindings/js/CallTracer.h
+    bindings/js/CallTracerTypes.h
+    bindings/js/CommonVM.h
+    bindings/js/DOMGCOutputConstraint.h
+    bindings/js/DOMPromiseProxy.h
+    bindings/js/DOMWrapperWorld.h
+    bindings/js/GCController.h
+    bindings/js/IDBBindingUtilities.h
+    bindings/js/JSCSSRuleCustom.h
+    bindings/js/JSCSSStyleDeclarationCustom.h
+    bindings/js/JSCallbackData.h
+    bindings/js/JSCustomElementInterface.h
+    bindings/js/JSCustomXPathNSResolver.h
+    bindings/js/JSDOMAbstractOperations.h
+    bindings/js/JSDOMAttribute.h
+    bindings/js/JSDOMBinding.h
+    bindings/js/JSDOMBindingSecurity.h
+    bindings/js/JSDOMBuiltinConstructor.h
+    bindings/js/JSDOMBuiltinConstructorBase.h
+    bindings/js/JSDOMCastedThisErrorBehavior.h
+    bindings/js/JSDOMConstructor.h
+    bindings/js/JSDOMConstructorBase.h
+    bindings/js/JSDOMConstructorNotConstructable.h
+    bindings/js/JSDOMConstructorWithDocument.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/JSDOMConvertPromise.h
+    bindings/js/JSDOMConvertRecord.h
+    bindings/js/JSDOMConvertScheduledAction.h
+    bindings/js/JSDOMConvertSequences.h
+    bindings/js/JSDOMConvertSerializedScriptValue.h
+    bindings/js/JSDOMConvertStrings.h
+    bindings/js/JSDOMConvertUnion.h
+    bindings/js/JSDOMConvertVariadic.h
+    bindings/js/JSDOMConvertWebGL.h
+    bindings/js/JSDOMConvertXPathNSResolver.h
+    bindings/js/JSDOMExceptionHandling.h
+    bindings/js/JSDOMGlobalObject.h
+    bindings/js/JSDOMGlobalObjectTask.h
+    bindings/js/JSDOMGuardedObject.h
+    bindings/js/JSDOMIterator.h
+    bindings/js/JSDOMMapLike.h
+    bindings/js/JSDOMNamedConstructor.h
+    bindings/js/JSDOMOperation.h
+    bindings/js/JSDOMOperationReturningPromise.h
+    bindings/js/JSDOMPromise.h
+    bindings/js/JSDOMPromiseDeferred.h
+    bindings/js/JSDOMWindowBase.h
+    bindings/js/JSDOMWindowCustom.h
+    bindings/js/JSDOMWindowProperties.h
+    bindings/js/JSDOMWindowProxy.h
+    bindings/js/JSDOMWrapper.h
+    bindings/js/JSDOMWrapperCache.h
+    bindings/js/JSDocumentCustom.h
+    bindings/js/JSDynamicDowncast.h
+    bindings/js/JSElementCustom.h
+    bindings/js/JSErrorHandler.h
+    bindings/js/JSEventCustom.h
+    bindings/js/JSEventListener.h
+    bindings/js/JSEventTargetCustom.h
+    bindings/js/JSLazyEventListener.h
+    bindings/js/JSMainThreadExecState.h
+    bindings/js/JSMainThreadExecStateInstrumentation.h
+    bindings/js/JSMediaListCustom.h
+    bindings/js/JSNodeCustom.h
+    bindings/js/JSNodeListCustom.h
+    bindings/js/JSPluginElementFunctions.h
+    bindings/js/JSReadableStreamPrivateConstructors.h
+    bindings/js/JSStyleSheetCustom.h
+    bindings/js/JSTrackCustom.h
+    bindings/js/JSValueInWrappedObject.h
+    bindings/js/JSWorkerGlobalScopeBase.h
+    bindings/js/ModuleFetchFailureKind.h
+    bindings/js/ReadableStream.h
+    bindings/js/ReadableStreamDefaultController.h
+    bindings/js/ScheduledAction.h
+    bindings/js/ScriptCachedFrameData.h
+    bindings/js/ScriptController.h
+    bindings/js/ScriptModuleLoader.h
+    bindings/js/ScriptSourceCode.h
+    bindings/js/ScriptState.h
+    bindings/js/ScriptWrappable.h
+    bindings/js/ScriptWrappableInlines.h
+    bindings/js/SerializedScriptValue.h
+    bindings/js/StringAdaptors.h
+    bindings/js/StructuredClone.h
+    bindings/js/WebCoreBuiltinNames.h
+    bindings/js/WebCoreJSClientData.h
+    bindings/js/WebCoreTypedArrayController.h
+    bindings/js/WorkerScriptController.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/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/CSSCustomPropertyValue.h
+    css/CSSFontFaceRule.h
+    css/CSSGroupingRule.h
+    css/CSSImportRule.h
+    css/CSSLineBoxContainValue.h
+    css/CSSMediaRule.h
+    css/CSSPageRule.h
+    css/CSSPrimitiveValue.h
+    css/CSSProperty.h
+    css/CSSReflectionDirection.h
+    css/CSSRule.h
+    css/CSSRuleList.h
+    css/CSSStyleDeclaration.h
+    css/CSSStyleRule.h
+    css/CSSStyleSheet.h
+    css/CSSUnknownRule.h
+    css/CSSValue.h
+    css/CSSValueList.h
+    css/CSSVariableData.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/RGBColor.h
+    css/Rect.h
+    css/StyleProperties.h
+    css/StyleSheet.h
+    css/StyleSheetContents.h
+    css/StyleSheetList.h
+
+    css/parser/CSSParser.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/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/DocumentOrderedMap.h
+    dom/DocumentTiming.h
+    dom/DocumentType.h
+    dom/Element.h
+    dom/ElementAncestorIterator.h
+    dom/ElementChildIterator.h
+    dom/ElementData.h
+    dom/ElementDescendantIterator.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/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/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/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/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/FrameSelection.h
+    editing/HTMLInterchange.h
+    editing/SelectionRectGatherer.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/CachedFrame.h
+    history/CachedFramePlatformData.h
+    history/HistoryItem.h
+    history/PageCache.h
+
+    html/AttachmentTypes.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/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/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/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/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/TextTrackList.h
+    html/track/TrackBase.h
+    html/track/TrackListBase.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/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/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/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/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/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/LayerFlushThrottleState.h
+    page/LayoutContext.h
+    page/LayoutMilestones.h
+    page/MainFrame.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/PointerLockController.h
+    page/PrintContext.h
+    page/RuntimeEnabledFeatures.h
+    page/ScrollToOptions.h
+    page/SecurityOrigin.h
+    page/SecurityOriginData.h
+    page/SecurityOriginHash.h
+    page/SecurityPolicy.h
+    page/SettingsBase.h
+    page/SocketProvider.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/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/ScrollingMomentumCalculator.h
+    page/scrolling/ScrollingStateFixedNode.h
+    page/scrolling/ScrollingStateFrameScrollingNode.h
+    page/scrolling/ScrollingStateNode.h
+    page/scrolling/ScrollingStateOverflowScrollingNode.h
+    page/scrolling/ScrollingStateScrollingNode.h
+    page/scrolling/ScrollingStateStickyNode.h
+    page/scrolling/ScrollingStateTree.h
+    page/scrolling/ScrollingThread.h
+    page/scrolling/ScrollingTree.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/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/CookiesStrategy.h
+    platform/CountedUserActivity.h
+    platform/Cursor.h
+    platform/DateComponents.h
+    platform/Decimal.h
+    platform/DragData.h
+    platform/DragImage.h
+    platform/DragItem.h
+    platform/EventTrackingRegions.h
+    platform/FileChooser.h
+    platform/FileHandle.h
+    platform/FileMetadata.h
+    platform/FileMonitor.h
+    platform/FileStream.h
+    platform/FileStreamClient.h
+    platform/FileSystem.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/PlatformStrategies.h
+    platform/PlatformTouchEvent.h
+    platform/PlatformTouchPoint.h
+    platform/PlatformWheelEvent.h
+    platform/PopupMenu.h
+    platform/PopupMenuClient.h
+    platform/PopupMenuStyle.h
+    platform/Process.h
+    platform/PromisedBlobInfo.h
+    platform/PublicSuffix.h
+    platform/RectEdges.h
+    platform/ReferrerPolicy.h
+    platform/RemoteCommandListener.h
+    platform/RuntimeApplicationChecks.h
+    platform/SchemeRegistry.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/Timer.h
+    platform/URL.h
+    platform/URLHash.h
+    platform/URLParser.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/AnimationTrigger.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/audio/WebAudioBufferList.h
+
+    platform/gamepad/GamepadProvider.h
+    platform/gamepad/GamepadProviderClient.h
+    platform/gamepad/PlatformGamepad.h
+
+    platform/geoclue/GeolocationProviderGeoclue.h
+    platform/geoclue/GeolocationProviderGeoclueClient.h
+
+    platform/graphics/ANGLEWebKitBridge.h
+    platform/graphics/AudioTrackPrivate.h
+    platform/graphics/BitmapImage.h
+    platform/graphics/Color.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/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/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/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/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/RoundedRect.h
+    platform/graphics/ShadowBlur.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/filters/FilterOperation.h
+    platform/graphics/filters/FilterOperations.h
+
+    platform/graphics/gpu/GPUBuffer.h
+    platform/graphics/gpu/GPUCommandQueue.h
+    platform/graphics/gpu/GPUDevice.h
+    platform/graphics/gpu/GPUFunction.h
+    platform/graphics/gpu/GPULibrary.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/RealtimeMediaSourceSettings.h
+    platform/mediastream/RealtimeMediaSourceSupportedConstraints.h
+    platform/mediastream/WebAudioSourceProvider.h
+
+    platform/mediastream/libwebrtc/LibWebRTCMacros.h
+    platform/mediastream/libwebrtc/LibWebRTCProvider.h
+    platform/mediastream/libwebrtc/LibWebRTCProviderCocoa.h
+
+    platform/mock/DeviceOrientationClientMock.h
+    platform/mock/MediaPlaybackTargetMock.h
+    platform/mock/MediaPlaybackTargetPickerMock.h
+    platform/mock/MockRealtimeAudioSource.h
+    platform/mock/MockRealtimeMediaSource.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/CookieStorage.h
+    platform/network/Credential.h
+    platform/network/CredentialBase.h
+    platform/network/CredentialStorage.h
+    platform/network/DNS.h
+    platform/network/FormData.h
+    platform/network/HTTPHeaderMap.h
+    platform/network/HTTPParsers.h
+    platform/network/NetworkLoadMetrics.h
+    platform/network/NetworkStorageSession.h
+    platform/network/NetworkingContext.h
+    platform/network/ParsedContentRange.h
+    platform/network/PingHandle.h
+    platform/network/PlatformCookieJar.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/SocketStreamError.h
+    platform/network/SocketStreamHandle.h
+    platform/network/SocketStreamHandleClient.h
+    platform/network/StoredCredentialsPolicy.h
+    platform/network/SynchronousLoaderClient.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/FloatingObjects.h
+    rendering/GapRects.h
+    rendering/HitTestLocation.h
+    rendering/HitTestRequest.h
+    rendering/HitTestResult.h
+    rendering/InlineBox.h
+    rendering/InlineFlowBox.h
+    rendering/LayerFragment.h
+    rendering/MarkerSubrange.h
+    rendering/OrderIterator.h
+    rendering/OverlapTestRequestClient.h
+    rendering/Pagination.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/StyleSurroundData.h
+    rendering/style/StyleTransformData.h
+    rendering/style/StyleVisualData.h
+    rendering/style/TextSizeAdjustment.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/StorageType.h
+
+    style/StyleChange.h
+    style/StyleScope.h
+    style/StyleValidity.h
+
+    svg/SVGLengthContext.h
+    svg/SVGLengthValue.h
+    svg/SVGParsingError.h
+    svg/SVGStringListValues.h
+    svg/SVGTests.h
+    svg/SVGUnitTypes.h
+
+    svg/graphics/SVGImageCache.h
+
+    svg/properties/SVGAnimatedProperty.h
+    svg/properties/SVGAnimatedPropertyDescription.h
+    svg/properties/SVGAnimatedPropertyMacros.h
+    svg/properties/SVGAttributeToPropertyMap.h
+    svg/properties/SVGPropertyInfo.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/RegistrationStore.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
+)
+
+set(WebCore_PRIVATE_INCLUDE_DIRECTORIES
     "${CMAKE_BINARY_DIR}"
     "${WEBCORE_DIR}"
     "${WEBCORE_DIR}/Modules/airplay"
@@ -1021,7 +2382,7 @@ else ()
 endif ()
 
 if (ENABLE_GAMEPAD)
-    list(APPEND WebCore_INCLUDE_DIRECTORIES
+    list(APPEND WebCore_PRIVATE_INCLUDE_DIRECTORIES
         "${WEBCORE_DIR}/Modules/gamepad"
     )
 
@@ -1362,7 +2723,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"
     )
@@ -1524,21 +2885,21 @@ if (ENABLE_USER_MESSAGE_HANDLERS)
 endif ()
 
 if (USE_OPENVR)
-  list(APPEND WebCore_INCLUDE_DIRECTORIES "${THIRDPARTY_DIR}/openvr/headers")
+  list(APPEND WebCore_PRIVATE_INCLUDE_DIRECTORIES "${THIRDPARTY_DIR}/openvr/headers")
   list(APPEND WebCore_LIBRARIES openvr_api)
 endif ()
 
 if (USE_WOFF2)
-  list(APPEND WebCore_INCLUDE_DIRECTORIES "${WOFF2DEC_INCLUDE_DIRS}")
+  list(APPEND WebCore_PRIVATE_INCLUDE_DIRECTORIES "${WOFF2DEC_INCLUDE_DIRS}")
   list(APPEND WebCore_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 ()
 
-set(WebCoreTestSupport_INCLUDE_DIRECTORIES
+set(WebCoreTestSupport_PRIVATE_INCLUDE_DIRECTORIES
     "${WEBCORE_DIR}/platform/mock"
     "${WEBCORE_DIR}/testing"
     "${WEBCORE_DIR}/testing/js"
@@ -1926,9 +3287,14 @@ if (MSVC)
     WEBKIT_ADD_PRECOMPILED_HEADER("WebCorePrefix.h" "WebCorePrefix.cpp" WebCore_SOURCES)
 endif ()
 
-
 WEBKIT_FRAMEWORK(WebCore)
 
+WEBKIT_MAKE_FORWARDING_HEADERS(WebCore
+    FILES ${WebCore_PRIVATE_FRAMEWORK_HEADERS}
+    DERIVED_SOURCE_DIRECTORIES ${DERIVED_SOURCES_WEBCORE_DIR} ${DERIVED_SOURCES_PAL_DIR}
+    FLATTENED
+)
+
 add_dependencies(WebCore WebCoreBindings)
 
 if (APPLE)
@@ -1949,7 +3315,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 3d503c5..e580277 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,27 @@
+2018-02-13  Don Olmstead  <don.olmstead@sony.com>
+
+        [CMake] Make WebCore headers copies
+        https://bugs.webkit.org/show_bug.cgi?id=182512
+
+        Reviewed by Keith Miller.
+
+        No new tests. No change in behavior.
+
+        * CMakeLists.txt:
+        * PlatformAppleWin.cmake:
+        * PlatformGTK.cmake:
+        * PlatformMac.cmake:
+        * PlatformWPE.cmake:
+        * PlatformWin.cmake:
+        * PlatformWinCairo.cmake:
+        * platform/Cairo.cmake:
+        * platform/Curl.cmake:
+        * platform/FreeType.cmake:
+        * platform/GStreamer.cmake:
+        * platform/ImageDecoders.cmake:
+        * platform/TextureMapper.cmake:
+        * platform/graphics/win/LocalWindowsContext.h:
+
 2018-02-13  Chris Dumez  <cdumez@apple.com>
 
         REGRESSION (r228299): Broke reader mode in Safari

diff --git a/Source/WebCore/PlatformAppleWin.cmake b/Source/WebCore/PlatformAppleWin.cmake
index ee7b407..362637f 100644 (file)
--- 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,12 +12,8 @@ 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
+if (NOT ${USE_DIRECT2D})
+    list(APPEND WebCore_PRIVATE_INCLUDE_DIRECTORIES
         "${WEBCORE_DIR}/platform/graphics/avfoundation"
         "${WEBCORE_DIR}/platform/graphics/avfoundation/cf"
         "${WEBCORE_DIR}/platform/graphics/ca"
@@ -66,6 +62,20 @@ list(APPEND WebCore_SOURCES
     platform/network/cf/SynchronousLoaderClientCFNet.cpp
 )
 
+list(APPEND WebCore_PRIVATE_FRAMEWORK_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_SOURCES
         page/win/FrameWinDirect2D.cpp
@@ -146,21 +156,30 @@ else ()
     )
 endif ()
 
-list(APPEND WebCore_FORWARDING_HEADERS_DIRECTORIES
-    platform/network/cf
-)
-
 if (${USE_DIRECT2D})
-    list(APPEND WebCore_FORWARDING_HEADERS_DIRECTORIES
-        platform/graphics/win
+    list(APPEND WebCore_PRIVATE_FRAMEWORK_HEADERS
+        platform/graphics/win/ImageBufferDataDirect2D.h
     )
 else ()
-    list(APPEND WebCore_FORWARDING_HEADERS_DIRECTORIES
-        platform/graphics/ca
-        platform/graphics/cg
-
-        platform/graphics/ca/win
-
-        platform/network/cf
+    list(APPEND WebCore_PRIVATE_FRAMEWORK_HEADERS
+        platform/graphics/ca/GraphicsLayerCA.h
+        platform/graphics/ca/LayerFlushScheduler.h
+        platform/graphics/ca/LayerFlushSchedulerClient.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/PDFDocumentImage.h
     )
 endif ()

diff --git a/Source/WebCore/PlatformGTK.cmake b/Source/WebCore/PlatformGTK.cmake
index 32c6ccc..a1b8532 100644 (file)
--- a/Source/WebCore/PlatformGTK.cmake
+++ b/Source/WebCore/PlatformGTK.cmake
@@ -14,7 +14,7 @@ list(APPEND WebCore_UNIFIED_SOURCE_LIST_FILES
     "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"
@@ -70,6 +70,39 @@ list(APPEND WebCorePlatformGTK_SOURCES
     rendering/RenderThemeGtk.cpp
 )
 
+list(APPEND WebCore_PRIVATE_FRAMEWORK_HEADERS
+    platform/graphics/wayland/PlatformDisplayWayland.h
+    platform/graphics/wayland/WlUniquePtr.h
+
+    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/network/soup/AuthenticationChallenge.h
+    platform/network/soup/CertificateInfo.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/WebKitSoupRequestGeneric.h
+    platform/network/soup/WebKitSoupRequestGenericClient.h
+
+    platform/text/enchant/TextCheckerEnchant.h
+)
+
 if (ENABLE_GEOLOCATION)
     list(APPEND WebCore_SOURCES
         ${DERIVED_SOURCES_WEBCORE_DIR}/Geoclue2Interface.c
@@ -155,7 +188,7 @@ if (ENABLE_PLUGIN_PROCESS_GTK2)
         PROPERTY COMPILE_DEFINITIONS GTK_API_VERSION_2=1
     )
     target_include_directories(WebCorePlatformGTK2 PRIVATE
-        ${WebCore_INCLUDE_DIRECTORIES}
+        ${WebCore_PRIVATE_INCLUDE_DIRECTORIES}
         ${GTK2_INCLUDE_DIRS}
         ${GDK2_INCLUDE_DIRS}
     )
@@ -181,7 +214,7 @@ endif ()
 add_library(WebCorePlatformGTK ${WebCore_LIBRARY_TYPE} ${WebCorePlatformGTK_SOURCES})
 add_dependencies(WebCorePlatformGTK WebCore)
 target_include_directories(WebCorePlatformGTK PRIVATE
-    ${WebCore_INCLUDE_DIRECTORIES}
+    ${WebCore_PRIVATE_INCLUDE_DIRECTORIES}
 )
 target_include_directories(WebCorePlatformGTK SYSTEM PRIVATE
     ${WebCore_SYSTEM_INCLUDE_DIRECTORIES}
@@ -195,7 +228,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 3e87233..84fa63d 100644 (file)
--- a/Source/WebCore/PlatformMac.cmake
+++ b/Source/WebCore/PlatformMac.cmake
@@ -66,7 +66,7 @@ if (NOT LOOKUP_FRAMEWORK-NOTFOUND)
     list(APPEND WebCore_LIBRARIES ${LOOKUP_FRAMEWORK})
 endif ()
 
-list(APPEND WebCore_INCLUDE_DIRECTORIES
+list(APPEND WebCore_PRIVATE_INCLUDE_DIRECTORIES
     "${THIRDPARTY_DIR}/ANGLE"
     "${THIRDPARTY_DIR}/ANGLE/include/KHR"
     "${WEBCORE_DIR}/accessibility/mac"
@@ -460,183 +460,123 @@ 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
-
-    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/graphics
-    platform/mac
-    platform/mediastream
-    platform/mock
-    platform/network
-    platform/sql
-    platform/text
-
-    platform/audio/cocoa
-
-    platform/gamepad/cocoa
-    platform/gamepad/mac
-
-    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
-
-    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
+list(APPEND WebCore_PRIVATE_FRAMEWORK_HEADERS
+    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
-
-    html/HTMLMediaElement.h
-
-    loader/appcache/ApplicationCacheStorage.h
-
-    loader/icon/IconDatabase.h
-    loader/icon/IconDatabaseBase.h
-    loader/icon/IconDatabaseClient.h
+    loader/archive/cf/LegacyWebArchive.h
 
     loader/mac/LoaderNSURLExtras.h
 
-    platform/PlatformExportMacros.h
+    page/mac/TextIndicatorWindow.h
+    page/mac/WebCoreFrameView.h
+
+    page/scrolling/mac/ScrollingTreeFixedNode.h
+    page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.h
+    page/scrolling/mac/ScrollingTreeStickyNode.h
 
-    platform/audio/AudioHardwareListener.h
+    platform/audio/mac/CAAudioStreamDescription.h
+    platform/audio/mac/CARingBuffer.h
 
+    platform/cf/CFURLExtras.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/cocoa/WebKitAvailability.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/ca/GraphicsLayerCA.h
+    platform/graphics/ca/LayerFlushScheduler.h
+    platform/graphics/ca/LayerFlushSchedulerClient.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/PDFDocumentImage.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/WebLayer.h
+
+    platform/mac/DynamicLinkerInterposing.h
+    platform/mac/LegacyNSPasteboardTypes.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/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/WebCoreURLResponse.h
 )
 
 list(APPEND WebCore_IDL_FILES

diff --git a/Source/WebCore/PlatformWPE.cmake b/Source/WebCore/PlatformWPE.cmake
index b18b794..0ac9b3a 100644 (file)
--- a/Source/WebCore/PlatformWPE.cmake
+++ b/Source/WebCore/PlatformWPE.cmake
@@ -12,16 +12,35 @@ list(APPEND WebCore_UNIFIED_SOURCE_LIST_FILES
     "platform/SourcesSoup.txt"
 )
 
+list(APPEND WebCore_PRIVATE_FRAMEWORK_HEADERS
+    platform/graphics/wayland/PlatformDisplayWayland.h
+    platform/graphics/wayland/WlUniquePtr.h
+
+    platform/graphics/wpe/PlatformDisplayWPE.h
+
+    platform/network/soup/AuthenticationChallenge.h
+    platform/network/soup/CertificateInfo.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/WebKitSoupRequestGeneric.h
+    platform/network/soup/WebKitSoupRequestGenericClient.h
+)
+
 # 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"
     "${WEBCORE_DIR}/platform/graphics/epoxy"
     "${WEBCORE_DIR}/platform/graphics/glx"
-    "${WEBCORE_DIR}/platform/graphics/gstreamer"
     "${WEBCORE_DIR}/platform/graphics/opengl"
     "${WEBCORE_DIR}/platform/graphics/opentype"
     "${WEBCORE_DIR}/platform/graphics/wpe"

diff --git a/Source/WebCore/PlatformWin.cmake b/Source/WebCore/PlatformWin.cmake
index 497cde6..6f9f63a 100644 (file)
--- 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"
@@ -113,127 +113,44 @@ 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/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/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
-    css
-    dom
-    editing
-    fileapi
-    history
-    html
-    inspector
-    loader
-    page
-    platform
-    plugins
-    rendering
-    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/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/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/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"
     )
@@ -253,14 +170,12 @@ if (USE_CF)
         platform/text/cf/HyphenationCF.cpp
     )
 
-    list(APPEND WebCore_FORWARDING_HEADERS_DIRECTORIES
-        history/cf
+    list(APPEND WebCore_PRIVATE_FRAMEWORK_HEADERS
+        loader/archive/cf/LegacyWebArchive.h
 
-        loader/archive/cf
+        platform/cf/CFURLExtras.h
 
-        platform/cf
-
-        platform/cf/win
+        platform/cf/win/CertificateCFWin.h
     )
 endif ()
 
@@ -305,12 +220,6 @@ if (WTF_PLATFORM_WIN_CAIRO AND EXISTS ${WEBKIT_LIBRARIES_DIR}/etc/ssl/cert.pem)
     )
 endif ()
 
-WEBKIT_MAKE_FORWARDING_HEADERS(WebCore
-    DIRECTORIES ${WebCore_FORWARDING_HEADERS_DIRECTORIES}
-    DERIVED_SOURCE_DIRECTORIES ${DERIVED_SOURCES_WEBCORE_DIR} ${DERIVED_SOURCES_PAL_DIR}
-    FLATTENED
-)
-
 set(WebCore_OUTPUT_NAME
     WebCore${DEBUG_SUFFIX}
 )

diff --git a/Source/WebCore/PlatformWinCairo.cmake b/Source/WebCore/PlatformWinCairo.cmake
index 830b51c..70a03a2 100644 (file)
--- 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"
@@ -36,7 +36,7 @@ list(APPEND WebCore_SOURCES
 list(APPEND WebCore_LIBRARIES
     ${CURL_LIBRARY}
     ${DirectX_LIBRARIES}
-    CFLite
+    ${COREFOUNDATION_LIBRARY}
     comctl32
     crypt32
     iphlpapi
@@ -50,12 +50,6 @@ list(APPEND WebCore_LIBRARIES
 
 list(APPEND WebCoreTestSupport_LIBRARIES
     ${CAIRO_LIBRARIES}
-    CFLite
+    ${COREFOUNDATION_LIBRARY}
     shlwapi
 )
-
-list(APPEND WebCore_FORWARDING_HEADERS_DIRECTORIES
-    platform/graphics/cairo
-
-    platform/network/curl
-)

diff --git a/Source/WebCore/platform/Cairo.cmake b/Source/WebCore/platform/Cairo.cmake
index 2338f2b..9a3a8bf 100644 (file)
--- 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 73c014f..1f80759 100644 (file)
--- 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"
 )
 
@@ -31,6 +31,31 @@ 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/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/CurlRequest.h
+    platform/network/curl/CurlRequestClient.h
+    platform/network/curl/CurlRequestSchedulerClient.h
+    platform/network/curl/CurlResponse.h
+    platform/network/curl/CurlSSLHandle.h
+    platform/network/curl/CurlSSLVerifier.h
+    platform/network/curl/DownloadBundle.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}
     ${OPENSSL_INCLUDE_DIR}

diff --git a/Source/WebCore/platform/FreeType.cmake b/Source/WebCore/platform/FreeType.cmake
index 6ed5cd1..97252df 100644 (file)
--- 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"
 )
@@ -13,6 +13,13 @@ list(APPEND WebCore_SOURCES
     platform/graphics/harfbuzz/HarfBuzzFace.cpp
 )
 
+list(APPEND WebCore_PRIVATE_FRAMEWORK_HEADERS
+    platform/graphics/freetype/FcUniquePtr.h
+
+    platform/graphics/harfbuzz/HarfBuzzFace.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 e1ec233..709a18f 100644 (file)
--- a/Source/WebCore/platform/GStreamer.cmake
+++ b/Source/WebCore/platform/GStreamer.cmake
@@ -1,5 +1,11 @@
+
+list(APPEND WebCore_PRIVATE_FRAMEWORK_HEADERS
+    platform/graphics/gstreamer/GUniquePtrGStreamer.h
+    platform/graphics/gstreamer/MediaPlayerRequestInstallMissingPluginsCallback.h
+)
+
 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"
@@ -88,7 +94,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"
     )
 
@@ -111,7 +117,7 @@ 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}
     )

diff --git a/Source/WebCore/platform/ImageDecoders.cmake b/Source/WebCore/platform/ImageDecoders.cmake
index 440cc2f..9f74117 100644 (file)
--- 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/TextureMapper.cmake b/Source/WebCore/platform/TextureMapper.cmake
index 242d430..388cb7b 100644 (file)
--- a/Source/WebCore/platform/TextureMapper.cmake
+++ b/Source/WebCore/platform/TextureMapper.cmake
@@ -1,4 +1,4 @@
-list(APPEND WebCore_INCLUDE_DIRECTORIES
+list(APPEND WebCore_PRIVATE_INCLUDE_DIRECTORIES
     "${WEBCORE_DIR}/platform/graphics/texmap"
 )
 list(APPEND WebCore_SOURCES
@@ -13,6 +13,37 @@ list(APPEND WebCore_SOURCES
     platform/graphics/texmap/TextureMapperLayer.cpp
     platform/graphics/texmap/TextureMapperTile.cpp
 )
+list(APPEND WebCore_PRIVATE_FRAMEWORK_HEADERS
+    platform/graphics/nicosia/NicosiaBuffer.h
+    platform/graphics/nicosia/NicosiaPaintingEngine.h
+
+    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
+
+    platform/graphics/texmap/coordinated/AreaAllocator.h
+    platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.h
+    platform/graphics/texmap/coordinated/CoordinatedGraphicsState.h
+    platform/graphics/texmap/coordinated/CoordinatedImageBacking.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
+    platform/graphics/texmap/coordinated/UpdateAtlas.h
+)
 
 if (USE_TEXTURE_MAPPER_GL)
     list(APPEND WebCore_SOURCES
@@ -25,7 +56,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/coordinatedgraphics"
         "${WEBCORE_DIR}/platform/graphics/texmap/coordinated"
     )
@@ -45,7 +76,7 @@ if (USE_COORDINATED_GRAPHICS)
     )
 
     # 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"
     )
     list(APPEND WebCore_SOURCES

diff --git a/Source/WebCore/platform/graphics/win/LocalWindowsContext.h b/Source/WebCore/platform/graphics/win/LocalWindowsContext.h
index 9911b65..93450ef 100644 (file)
--- a/Source/WebCore/platform/graphics/win/LocalWindowsContext.h
+++ b/Source/WebCore/platform/graphics/win/LocalWindowsContext.h
@@ -26,7 +26,6 @@
 #ifndef LocalWindowsContext_h
 #define LocalWindowsContext_h
 
-#include "config.h"
 #include "GraphicsContext.h"
 
 namespace WebCore {

diff --git a/Source/WebKit/CMakeLists.txt b/Source/WebKit/CMakeLists.txt
index 11ef594..b2a41c7 100644 (file)
--- a/Source/WebKit/CMakeLists.txt
+++ b/Source/WebKit/CMakeLists.txt
@@ -934,7 +934,7 @@ if ("${PORT}" STREQUAL "GTK")
 endif ()
 
 WEBKIT_FRAMEWORK(WebKit)
-add_dependencies(WebKit WebCore ${WEBKIT_EXTRA_DEPENDENCIES})
+add_dependencies(WebKit WebCore WebCoreForwardingHeaders ${WEBKIT_EXTRA_DEPENDENCIES})
 ADD_WEBKIT_PREFIX_HEADER(WebKit)
 
 add_executable(WebProcess ${WebProcess_SOURCES})

diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
index 199af6e..41b0eaa 100644 (file)
--- a/Source/WebKit/ChangeLog
+++ b/Source/WebKit/ChangeLog
@@ -1,3 +1,25 @@
+2018-02-13  Don Olmstead  <don.olmstead@sony.com>
+
+        [CMake] Make WebCore headers copies
+        https://bugs.webkit.org/show_bug.cgi?id=182512
+
+        Reviewed by Keith Miller.
+
+        * CMakeLists.txt:
+        * NetworkProcess/capture/NetworkCaptureManager.cpp:
+        * NetworkProcess/webrtc/NetworkRTCMonitor.h:
+        * PlatformWPE.cmake:
+        * Scripts/generate-forwarding-headers.pl:
+        * Shared/gtk/WebEventFactory.cpp:
+        * UIProcess/API/gtk/PageClientImpl.cpp:
+        * UIProcess/API/gtk/WebKitWebViewBase.cpp:
+        * UIProcess/gtk/WebPageProxyGtk.cpp:
+        * WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp:
+        * WebProcess/WebCoreSupport/gtk/WebEditorClientGtk.cpp:
+        * WebProcess/WebCoreSupport/wpe/WebEditorClientWPE.cpp:
+        * WebProcess/WebPage/gtk/WebPageGtk.cpp:
+        * WebProcess/WebPage/wpe/WebPageWPE.cpp:
+
 2018-02-13  Brent Fulgham  <bfulgham@apple.com>
 
         [iOS] whitelist iokit-get-properties

diff --git a/Source/WebKit/NetworkProcess/capture/NetworkCaptureManager.cpp b/Source/WebKit/NetworkProcess/capture/NetworkCaptureManager.cpp
index d3ce252..5613be8 100644 (file)
--- a/Source/WebKit/NetworkProcess/capture/NetworkCaptureManager.cpp
+++ b/Source/WebKit/NetworkProcess/capture/NetworkCaptureManager.cpp
@@ -30,8 +30,8 @@
 
 #include "NetworkCaptureLogging.h"
 #include "NetworkCaptureResource.h"
-#include "WebCore/ResourceRequest.h"
-#include "WebCore/URL.h"
+#include <WebCore/ResourceRequest.h>
+#include <WebCore/URL.h>
 #include <algorithm>
 #include <iterator>
 #include <limits>

diff --git a/Source/WebKit/NetworkProcess/webrtc/NetworkRTCMonitor.h b/Source/WebKit/NetworkProcess/webrtc/NetworkRTCMonitor.h
index 14882cd..33cc73b 100644 (file)
--- a/Source/WebKit/NetworkProcess/webrtc/NetworkRTCMonitor.h
+++ b/Source/WebKit/NetworkProcess/webrtc/NetworkRTCMonitor.h
@@ -27,7 +27,7 @@
 
 #if USE(LIBWEBRTC)
 
-#include "WebCore/LibWebRTCMacros.h"
+#include <WebCore/LibWebRTCMacros.h>
 #include <webrtc/base/network.h>
 #include <webrtc/base/sigslot.h>
 #include <webrtc/base/thread.h>

diff --git a/Source/WebKit/PlatformWPE.cmake b/Source/WebKit/PlatformWPE.cmake
index ac9d003..f1b1fe2 100644 (file)
--- a/Source/WebKit/PlatformWPE.cmake
+++ b/Source/WebKit/PlatformWPE.cmake
@@ -394,11 +394,6 @@ list(APPEND WebKit_INCLUDE_DIRECTORIES
     "${FORWARDING_HEADERS_WPE_EXTENSION_DIR}"
     "${DERIVED_SOURCES_DIR}"
     "${DERIVED_SOURCES_WPE_API_DIR}"
-    "${WEBCORE_DIR}/platform/graphics/cairo"
-    "${WEBCORE_DIR}/platform/graphics/freetype"
-    "${WEBCORE_DIR}/platform/graphics/opentype"
-    "${WEBCORE_DIR}/platform/graphics/texmap/coordinated"
-    "${WEBCORE_DIR}/platform/network/soup"
     "${WEBKIT_DIR}/NetworkProcess/CustomProtocols/soup"
     "${WEBKIT_DIR}/NetworkProcess/Downloads/soup"
     "${WEBKIT_DIR}/NetworkProcess/soup"

diff --git a/Source/WebKit/Scripts/generate-forwarding-headers.pl b/Source/WebKit/Scripts/generate-forwarding-headers.pl
index 2798309..8459856 100755 (executable)
--- 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/Shared/gtk/WebEventFactory.cpp b/Source/WebKit/Shared/gtk/WebEventFactory.cpp
index 8be918b..dd94e19 100644 (file)
--- a/Source/WebKit/Shared/gtk/WebEventFactory.cpp
+++ b/Source/WebKit/Shared/gtk/WebEventFactory.cpp
@@ -28,11 +28,11 @@
 #include "config.h"
 #include "WebEventFactory.h"
 
-#include "PlatformKeyboardEvent.h"
-#include "Scrollbar.h"
-#include "WindowsKeyboardCodes.h"
 #include <WebCore/GtkUtilities.h>
 #include <WebCore/GtkVersioning.h>
+#include <WebCore/PlatformKeyboardEvent.h>
+#include <WebCore/Scrollbar.h>
+#include <WebCore/WindowsKeyboardCodes.h>
 #include <gdk/gdk.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>

diff --git a/Source/WebKit/UIProcess/API/gtk/PageClientImpl.cpp b/Source/WebKit/UIProcess/API/gtk/PageClientImpl.cpp
index 6d465a5..3ed5be9 100644 (file)
--- a/Source/WebKit/UIProcess/API/gtk/PageClientImpl.cpp
+++ b/Source/WebKit/UIProcess/API/gtk/PageClientImpl.cpp
@@ -32,7 +32,6 @@
 #include "NativeWebKeyboardEvent.h"
 #include "NativeWebMouseEvent.h"
 #include "NativeWebWheelEvent.h"
-#include "NotImplemented.h"
 #include "WebColorPickerGtk.h"
 #include "WebContextMenuProxyGtk.h"
 #include "WebEventFactory.h"
@@ -46,6 +45,7 @@
 #include <WebCore/Cursor.h>
 #include <WebCore/EventNames.h>
 #include <WebCore/GtkUtilities.h>
+#include <WebCore/NotImplemented.h>
 #include <WebCore/RefPtrCairo.h>
 #include <wtf/Compiler.h>
 #include <wtf/text/CString.h>

diff --git a/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp b/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp
index f339a40..8c1436f 100644 (file)
--- a/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp
+++ b/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp
@@ -31,7 +31,6 @@
 
 #include "APIPageConfiguration.h"
 #include "AcceleratedBackingStore.h"
-#include "ActivityState.h"
 #include "DrawingAreaProxyImpl.h"
 #include "InputMethodFilter.h"
 #include "KeyBindingTranslator.h"
@@ -50,6 +49,7 @@
 #include "WebPreferences.h"
 #include "WebProcessPool.h"
 #include "WebUserContentControllerProxy.h"
+#include <WebCore/ActivityState.h>
 #include <WebCore/CairoUtilities.h>
 #include <WebCore/GUniquePtrGtk.h>
 #include <WebCore/GtkUtilities.h>

diff --git a/Source/WebKit/UIProcess/gtk/WebPageProxyGtk.cpp b/Source/WebKit/UIProcess/gtk/WebPageProxyGtk.cpp
index 962e838..94cd84c 100644 (file)
--- a/Source/WebKit/UIProcess/gtk/WebPageProxyGtk.cpp
+++ b/Source/WebKit/UIProcess/gtk/WebPageProxyGtk.cpp
@@ -27,13 +27,13 @@
 #include "config.h"
 #include "WebPageProxy.h"
 
-#include "NotImplemented.h"
 #include "PageClientImpl.h"
 #include "WebKitWebViewBasePrivate.h"
 #include "WebPageMessages.h"
 #include "WebPasteboardProxy.h"
 #include "WebProcessProxy.h"
 #include "WebsiteDataStore.h"
+#include <WebCore/NotImplemented.h>
 #include <WebCore/PlatformDisplay.h>
 #include <WebCore/UserAgent.h>
 #include <gtk/gtkx.h>

diff --git a/Source/WebKit/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp b/Source/WebKit/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp
index 6d7c9bd..3a6d66c 100644 (file)
--- a/Source/WebKit/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp
+++ b/Source/WebKit/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp
@@ -47,8 +47,8 @@
 #endif
 
 #if USE(CAIRO)
-#include "PlatformContextCairo.h"
-#include "RefPtrCairo.h"
+#include <WebCore/PlatformContextCairo.h>
+#include <WebCore/RefPtrCairo.h>
 #include <cairo/cairo-xlib.h>
 #endif
 

diff --git a/Source/WebKit/WebProcess/WebCoreSupport/gtk/WebEditorClientGtk.cpp b/Source/WebKit/WebProcess/WebCoreSupport/gtk/WebEditorClientGtk.cpp
index d579178..bcaa211 100644 (file)
--- a/Source/WebKit/WebProcess/WebCoreSupport/gtk/WebEditorClientGtk.cpp
+++ b/Source/WebKit/WebProcess/WebCoreSupport/gtk/WebEditorClientGtk.cpp
@@ -20,13 +20,13 @@
 #include "config.h"
 #include "WebEditorClient.h"
 
-#include "PlatformKeyboardEvent.h"
 #include <WebCore/Document.h>
 #include <WebCore/Editor.h>
 #include <WebCore/EventNames.h>
 #include <WebCore/Frame.h>
 #include <WebCore/KeyboardEvent.h>
 #include <WebCore/Pasteboard.h>
+#include <WebCore/PlatformKeyboardEvent.h>
 #include <WebCore/markup.h>
 #include <wtf/glib/GRefPtr.h>
 

diff --git a/Source/WebKit/WebProcess/WebCoreSupport/wpe/WebEditorClientWPE.cpp b/Source/WebKit/WebProcess/WebCoreSupport/wpe/WebEditorClientWPE.cpp
index 4801cd3..b05b865 100644 (file)
--- a/Source/WebKit/WebProcess/WebCoreSupport/wpe/WebEditorClientWPE.cpp
+++ b/Source/WebKit/WebProcess/WebCoreSupport/wpe/WebEditorClientWPE.cpp
@@ -26,13 +26,13 @@
 #include "config.h"
 #include "WebEditorClient.h"
 
-#include "PlatformKeyboardEvent.h"
 #include <WebCore/Document.h>
 #include <WebCore/Editor.h>
 #include <WebCore/EventNames.h>
 #include <WebCore/Frame.h>
 #include <WebCore/KeyboardEvent.h>
 #include <WebCore/Node.h>
+#include <WebCore/PlatformKeyboardEvent.h>
 #include <WebCore/WindowsKeyboardCodes.h>
 #include <wtf/NeverDestroyed.h>
 

diff --git a/Source/WebKit/WebProcess/WebPage/gtk/WebPageGtk.cpp b/Source/WebKit/WebProcess/WebPage/gtk/WebPageGtk.cpp
index 6c0cae7..493cb16 100644 (file)
--- a/Source/WebKit/WebProcess/WebPage/gtk/WebPageGtk.cpp
+++ b/Source/WebKit/WebProcess/WebPage/gtk/WebPageGtk.cpp
@@ -29,13 +29,11 @@
 #include "WebPage.h"
 
 #include "EditorState.h"
-#include "NotImplemented.h"
 #include "WebEvent.h"
 #include "WebFrame.h"
 #include "WebPageAccessibilityObject.h"
 #include "WebPageProxyMessages.h"
 #include "WebProcess.h"
-#include "WindowsKeyboardCodes.h"
 #include <WebCore/BackForwardController.h>
 #include <WebCore/Editor.h>
 #include <WebCore/EventHandler.h>
@@ -43,12 +41,14 @@
 #include <WebCore/Frame.h>
 #include <WebCore/FrameView.h>
 #include <WebCore/KeyboardEvent.h>
+#include <WebCore/NotImplemented.h>
 #include <WebCore/Page.h>
 #include <WebCore/PasteboardHelper.h>
 #include <WebCore/PlatformKeyboardEvent.h>
 #include <WebCore/Settings.h>
 #include <WebCore/SharedBuffer.h>
 #include <WebCore/UserAgent.h>
+#include <WebCore/WindowsKeyboardCodes.h>
 #include <wtf/glib/GUniquePtr.h>
 
 namespace WebKit {

diff --git a/Source/WebKit/WebProcess/WebPage/wpe/WebPageWPE.cpp b/Source/WebKit/WebProcess/WebPage/wpe/WebPageWPE.cpp
index cdd73bb..2f4ab94 100644 (file)
--- a/Source/WebKit/WebProcess/WebPage/wpe/WebPageWPE.cpp
+++ b/Source/WebKit/WebProcess/WebPage/wpe/WebPageWPE.cpp
@@ -26,9 +26,9 @@
 #include "config.h"
 #include "WebPage.h"
 
-#include "NotImplemented.h"
 #include "WebPreferencesKeys.h"
 #include "WebPreferencesStore.h"
+#include <WebCore/NotImplemented.h>
 #include <WebCore/Settings.h>
 #include <WebCore/SharedBuffer.h>
 

diff --git a/Source/WebKitLegacy/ChangeLog b/Source/WebKitLegacy/ChangeLog
index ddde6e0..2af49be 100644 (file)
--- a/Source/WebKitLegacy/ChangeLog
+++ b/Source/WebKitLegacy/ChangeLog
@@ -1,3 +1,12 @@
+2018-02-13  Don Olmstead  <don.olmstead@sony.com>
+
+        [CMake] Make WebCore headers copies
+        https://bugs.webkit.org/show_bug.cgi?id=182512
+
+        Reviewed by Keith Miller.
+
+        * PlatformWin.cmake:
+
 2018-02-08  Per Arne Vollan  <pvollan@apple.com>
 
         Move WebVideoFullscreenController from WebCore to WebKitLegacy.

diff --git a/Source/WebKitLegacy/PlatformWin.cmake b/Source/WebKitLegacy/PlatformWin.cmake
index 66005ba..016d419 100644 (file)
--- a/Source/WebKitLegacy/PlatformWin.cmake
+++ b/Source/WebKitLegacy/PlatformWin.cmake
@@ -3,7 +3,6 @@ if (${WTF_PLATFORM_WIN_CAIRO})
     list(APPEND WebKitLegacy_INCLUDE_DIRECTORIES
         ${CAIRO_INCLUDE_DIRS}
         "${WEBKIT_LIBRARIES_DIR}/include"
-        "${WEBCORE_DIR}/platform/graphics/cairo"
     )
     list(APPEND WebKitLegacy_SOURCES_Classes
         win/WebDownloadCURL.cpp

diff --git a/Source/WebKitLegacy/win/ChangeLog b/Source/WebKitLegacy/win/ChangeLog
index 36d0c3e..a58fe81 100644 (file)
--- a/Source/WebKitLegacy/win/ChangeLog
+++ b/Source/WebKitLegacy/win/ChangeLog
@@ -1,3 +1,26 @@
+2018-02-13  Don Olmstead  <don.olmstead@sony.com>
+
+        [CMake] Make WebCore headers copies
+        https://bugs.webkit.org/show_bug.cgi?id=182512
+
+        Reviewed by Keith Miller.
+
+        * FullscreenVideoController.h:
+        * Plugins/PluginDatabase.cpp:
+        * Plugins/PluginDatabaseWin.cpp:
+        * Plugins/PluginDebug.cpp:
+        * Plugins/PluginMainThreadScheduler.cpp:
+        * Plugins/PluginMessageThrottlerWin.cpp:
+        * Plugins/PluginPackage.cpp:
+        * Plugins/PluginPackageWin.cpp:
+        * Plugins/PluginStream.cpp:
+        * Plugins/PluginView.cpp:
+        * Plugins/PluginViewWin.cpp:
+        * Plugins/npapi.cpp:
+        * WebKitMessageLoop.cpp:
+        * WebKitPrefix.h:
+        * storage/WebDatabaseProvider.cpp:
+
 2018-01-13  Darin Adler  <darin@apple.com>
 
         Event improvements

diff --git a/Source/WebKitLegacy/win/FullscreenVideoController.h b/Source/WebKitLegacy/win/FullscreenVideoController.h
index 4df74c1..f1de8dd 100644 (file)
--- a/Source/WebKitLegacy/win/FullscreenVideoController.h
+++ b/Source/WebKitLegacy/win/FullscreenVideoController.h
@@ -28,12 +28,11 @@
 
 #if ENABLE(VIDEO)
 
-#include "MediaPlayerPrivateFullscreenWindow.h"
-
 #include <WebCore/HTMLVideoElement.h>
 #include <WebCore/Image.h>
 #include <WebCore/IntPoint.h>
 #include <WebCore/IntSize.h>
+#include <WebCore/MediaPlayerPrivateFullscreenWindow.h>
 #include <wtf/RefPtr.h>
 #include <wtf/win/GDIObject.h>
 

diff --git a/Source/WebKitLegacy/win/Plugins/PluginDatabase.cpp b/Source/WebKitLegacy/win/Plugins/PluginDatabase.cpp
index 8fab5c0..7e9c929 100644 (file)
--- a/Source/WebKitLegacy/win/Plugins/PluginDatabase.cpp
+++ b/Source/WebKitLegacy/win/Plugins/PluginDatabase.cpp
@@ -24,7 +24,6 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "config.h"
 #include "PluginDatabase.h"
 
 #include "Frame.h"

diff --git a/Source/WebKitLegacy/win/Plugins/PluginDatabaseWin.cpp b/Source/WebKitLegacy/win/Plugins/PluginDatabaseWin.cpp
index 5260da7..12693b3 100644 (file)
--- a/Source/WebKitLegacy/win/Plugins/PluginDatabaseWin.cpp
+++ b/Source/WebKitLegacy/win/Plugins/PluginDatabaseWin.cpp
@@ -25,7 +25,6 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#include "config.h"
 #include "PluginDatabase.h"
 
 #include "Frame.h"

diff --git a/Source/WebKitLegacy/win/Plugins/PluginDebug.cpp b/Source/WebKitLegacy/win/Plugins/PluginDebug.cpp
index 4e7e978..b0ff5e9 100644 (file)
--- a/Source/WebKitLegacy/win/Plugins/PluginDebug.cpp
+++ b/Source/WebKitLegacy/win/Plugins/PluginDebug.cpp
@@ -24,7 +24,6 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "config.h"
 #include "PluginDebug.h"
 
 #include <wtf/text/WTFString.h>

diff --git a/Source/WebKitLegacy/win/Plugins/PluginMainThreadScheduler.cpp b/Source/WebKitLegacy/win/Plugins/PluginMainThreadScheduler.cpp
index 1c59b33..4ecc30d 100644 (file)
--- a/Source/WebKitLegacy/win/Plugins/PluginMainThreadScheduler.cpp
+++ b/Source/WebKitLegacy/win/Plugins/PluginMainThreadScheduler.cpp
@@ -23,7 +23,6 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#include "config.h"
 #include "PluginMainThreadScheduler.h"
 
 #include <wtf/NeverDestroyed.h>

diff --git a/Source/WebKitLegacy/win/Plugins/PluginMessageThrottlerWin.cpp b/Source/WebKitLegacy/win/Plugins/PluginMessageThrottlerWin.cpp
index 4331afa..ad52147 100644 (file)
--- a/Source/WebKitLegacy/win/Plugins/PluginMessageThrottlerWin.cpp
+++ b/Source/WebKitLegacy/win/Plugins/PluginMessageThrottlerWin.cpp
@@ -24,7 +24,6 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "config.h"
 #include "PluginMessageThrottlerWin.h"
 
 #include "PluginView.h"

diff --git a/Source/WebKitLegacy/win/Plugins/PluginPackage.cpp b/Source/WebKitLegacy/win/Plugins/PluginPackage.cpp
index 6aff51d..4e59be3 100644 (file)
--- a/Source/WebKitLegacy/win/Plugins/PluginPackage.cpp
+++ b/Source/WebKitLegacy/win/Plugins/PluginPackage.cpp
@@ -25,7 +25,6 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "config.h"
 #include "PluginPackage.h"
 
 #include "PluginDatabase.h"

diff --git a/Source/WebKitLegacy/win/Plugins/PluginPackageWin.cpp b/Source/WebKitLegacy/win/Plugins/PluginPackageWin.cpp
index e0094b9..1679296 100644 (file)
--- a/Source/WebKitLegacy/win/Plugins/PluginPackageWin.cpp
+++ b/Source/WebKitLegacy/win/Plugins/PluginPackageWin.cpp
@@ -25,8 +25,6 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-
-#include "config.h"
 #include "PluginPackage.h"
 
 #include "MIMETypeRegistry.h"

diff --git a/Source/WebKitLegacy/win/Plugins/PluginStream.cpp b/Source/WebKitLegacy/win/Plugins/PluginStream.cpp
index c89d336..cb54e85 100644 (file)
--- a/Source/WebKitLegacy/win/Plugins/PluginStream.cpp
+++ b/Source/WebKitLegacy/win/Plugins/PluginStream.cpp
@@ -24,7 +24,6 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#include "config.h"
 #include "PluginStream.h"
 
 #include "DocumentLoader.h"

diff --git a/Source/WebKitLegacy/win/Plugins/PluginView.cpp b/Source/WebKitLegacy/win/Plugins/PluginView.cpp
index 1f6bdae..58ef3dc 100644 (file)
--- a/Source/WebKitLegacy/win/Plugins/PluginView.cpp
+++ b/Source/WebKitLegacy/win/Plugins/PluginView.cpp
@@ -25,7 +25,6 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#include "config.h"
 #include "PluginView.h"
 
 #include "PluginDatabase.h"

diff --git a/Source/WebKitLegacy/win/Plugins/PluginViewWin.cpp b/Source/WebKitLegacy/win/Plugins/PluginViewWin.cpp
index 6775266..e35e9fc 100644 (file)
--- a/Source/WebKitLegacy/win/Plugins/PluginViewWin.cpp
+++ b/Source/WebKitLegacy/win/Plugins/PluginViewWin.cpp
@@ -25,7 +25,6 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#include "config.h"
 #include "PluginView.h"
 
 #include "PluginDatabase.h"

diff --git a/Source/WebKitLegacy/win/Plugins/npapi.cpp b/Source/WebKitLegacy/win/Plugins/npapi.cpp
index 3c48b77..11faf11 100644 (file)
--- a/Source/WebKitLegacy/win/Plugins/npapi.cpp
+++ b/Source/WebKitLegacy/win/Plugins/npapi.cpp
@@ -23,8 +23,6 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#include "config.h"
-
 #include "Page.h"
 #include "PluginMainThreadScheduler.h"
 #include "PluginView.h"

diff --git a/Source/WebKitLegacy/win/WebKitMessageLoop.cpp b/Source/WebKitLegacy/win/WebKitMessageLoop.cpp
index 7f6c8e5..f76a66c 100644 (file)
--- a/Source/WebKitLegacy/win/WebKitMessageLoop.cpp
+++ b/Source/WebKitLegacy/win/WebKitMessageLoop.cpp
@@ -23,7 +23,6 @@
 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#include "config.h"
 #include "WebKitMessageLoop.h"
 
 #include "WebKitDLL.h"

diff --git a/Source/WebKitLegacy/win/WebKitPrefix.h b/Source/WebKitLegacy/win/WebKitPrefix.h
index 1596ae2..7583629 100644 (file)
--- a/Source/WebKitLegacy/win/WebKitPrefix.h
+++ b/Source/WebKitLegacy/win/WebKitPrefix.h
@@ -41,7 +41,31 @@
 
 #include <CoreFoundation/CoreFoundation.h>
 #include <WebKit.h>
-#include "config.h"
+
+#include <WebCore/PlatformExportMacros.h>
+#include <JavaScriptCore/JSExportMacros.h>
+#include <pal/ExportMacros.h>
+
+#ifdef __cplusplus
+
+// These undefs match up with defines in WebCorePrefix.h for Mac OS X.
+// Helps us catch if anyone uses new or delete by accident in code and doesn't include "config.h".
+#undef new
+#undef delete
+#include <wtf/FastMalloc.h>
+
+#endif
+
+#if USE(CG)
+#ifndef CGFLOAT_DEFINED
+#if (defined(__LP64__) && __LP64__) || (defined(__x86_64__) && __x86_64__) || defined(_M_X64) || defined(__amd64__)
+typedef double CGFloat;
+#else
+typedef float CGFloat;
+#endif
+#define CGFLOAT_DEFINED 1
+#endif
+#endif /* USE(CG) */
 
 // WebKit.dll is expected to export the symbols in WebCore that have been marked
 // as WEBCORE_EXPORT

diff --git a/Source/WebKitLegacy/win/storage/WebDatabaseProvider.cpp b/Source/WebKitLegacy/win/storage/WebDatabaseProvider.cpp
index 5b9ddc0..66cbf96 100644 (file)
--- a/Source/WebKitLegacy/win/storage/WebDatabaseProvider.cpp
+++ b/Source/WebKitLegacy/win/storage/WebDatabaseProvider.cpp
@@ -23,7 +23,6 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "config.h"
 #include "WebDatabaseProvider.h"
 
 #include <shlobj.h>

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index ebc4607..82dc4cb 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,26 @@
+2018-02-13  Don Olmstead  <don.olmstead@sony.com>
+
+        [CMake] Make WebCore headers copies
+        https://bugs.webkit.org/show_bug.cgi?id=182512
+
+        Reviewed by Keith Miller.
+
+        * DumpRenderTree/CMakeLists.txt:
+        * DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt:
+        * DumpRenderTree/TestNetscapePlugIn/ForwardingHeaders/WebKit/npapi.h:
+        * DumpRenderTree/TestNetscapePlugIn/ForwardingHeaders/WebKit/npfunctions.h:
+        * DumpRenderTree/TestNetscapePlugIn/ForwardingHeaders/WebKit/npruntime.h:
+        * TestWebKitAPI/PlatformGTK.cmake:
+        * TestWebKitAPI/PlatformWPE.cmake:
+        * TestWebKitAPI/PlatformWin.cmake:
+        * TestWebKitAPI/win/TestWebCoreStubs.cpp:
+        (loadResourceIntoBuffer):
+        * WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp:
+        * WebKitTestRunner/InjectedBundle/wpe/AccessibilityControllerWPE.cpp:
+        * WebKitTestRunner/InjectedBundle/wpe/AccessibilityUIElementWPE.cpp:
+        * WebKitTestRunner/gtk/EventSenderProxyGtk.cpp:
+        * WebKitTestRunner/wpe/EventSenderProxyWPE.cpp:
+
 2018-02-13  Chris Dumez  <cdumez@apple.com>
 
         REGRESSION (r228299): Broke reader mode in Safari

diff --git a/Tools/DumpRenderTree/CMakeLists.txt b/Tools/DumpRenderTree/CMakeLists.txt
index a34ba0a..dd706e2 100644 (file)
--- a/Tools/DumpRenderTree/CMakeLists.txt
+++ b/Tools/DumpRenderTree/CMakeLists.txt
@@ -92,6 +92,7 @@ add_dependencies(DumpRenderTree DumpRenderTreeBindings)
 
 if (ENABLE_NETSCAPE_PLUGIN_API)
     add_library(TestNetscapePlugIn SHARED ${TestNetscapePlugIn_SOURCES})
+    add_dependencies(TestNetscapePlugIn WebCoreForwardingHeaders)
     target_link_libraries(TestNetscapePlugIn ${TestNetscapePlugIn_LIBRARIES})
 endif ()
 

diff --git a/Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt b/Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt
index f99da6c..c1b9b37 100644 (file)
--- a/Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt
+++ b/Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt
@@ -30,10 +30,9 @@ set(WebKitTestNetscapePlugIn_SOURCES
 )
 
 set(WebKitTestNetscapePlugIn_INCLUDE_DIRECTORIES
+    ${FORWARDING_HEADERS_DIR}
     ${WEBKIT_TESTNETSCAPEPLUGIN_DIR}
     ${WEBKIT_TESTNETSCAPEPLUGIN_DIR}/ForwardingHeaders
-    ${WEBCORE_DIR}
-    ${WTF_DIR}
 )
 
 if (MOZ_X11)

diff --git a/Tools/DumpRenderTree/TestNetscapePlugIn/ForwardingHeaders/WebKit/npapi.h b/Tools/DumpRenderTree/TestNetscapePlugIn/ForwardingHeaders/WebKit/npapi.h
index 627bc97..eec4e44 100644 (file)
--- a/Tools/DumpRenderTree/TestNetscapePlugIn/ForwardingHeaders/WebKit/npapi.h
+++ b/Tools/DumpRenderTree/TestNetscapePlugIn/ForwardingHeaders/WebKit/npapi.h
@@ -1 +1 @@
-#include <plugins/npapi.h>
+#include <WebCore/npapi.h>

diff --git a/Tools/DumpRenderTree/TestNetscapePlugIn/ForwardingHeaders/WebKit/npfunctions.h b/Tools/DumpRenderTree/TestNetscapePlugIn/ForwardingHeaders/WebKit/npfunctions.h
index 54a603d..41a1eb3 100644 (file)
--- a/Tools/DumpRenderTree/TestNetscapePlugIn/ForwardingHeaders/WebKit/npfunctions.h
+++ b/Tools/DumpRenderTree/TestNetscapePlugIn/ForwardingHeaders/WebKit/npfunctions.h
@@ -1 +1 @@
-#include <plugins/npfunctions.h>
+#include <WebCore/npfunctions.h>

diff --git a/Tools/DumpRenderTree/TestNetscapePlugIn/ForwardingHeaders/WebKit/npruntime.h b/Tools/DumpRenderTree/TestNetscapePlugIn/ForwardingHeaders/WebKit/npruntime.h
index e435ae2..2e5b4b0 100644 (file)
--- a/Tools/DumpRenderTree/TestNetscapePlugIn/ForwardingHeaders/WebKit/npruntime.h
+++ b/Tools/DumpRenderTree/TestNetscapePlugIn/ForwardingHeaders/WebKit/npruntime.h
@@ -1 +1 @@
-#include <plugins/npruntime.h>
+#include <WebCore/npruntime.h>

diff --git a/Tools/TestWebKitAPI/PlatformGTK.cmake b/Tools/TestWebKitAPI/PlatformGTK.cmake
index 4aef695..aaf7184 100644 (file)
--- a/Tools/TestWebKitAPI/PlatformGTK.cmake
+++ b/Tools/TestWebKitAPI/PlatformGTK.cmake
@@ -104,7 +104,7 @@ add_executable(TestWebCore
 )
 
 target_link_libraries(TestWebCore ${test_webcore_LIBRARIES})
-add_dependencies(TestWebCore ${ForwardingHeadersForTestWebKitAPI_NAME})
+add_dependencies(TestWebCore WebCoreForwardingHeaders ${ForwardingHeadersForTestWebKitAPI_NAME})
 
 add_test(TestWebCore ${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY}/WebCore/TestWebCore)
 set_tests_properties(TestWebCore PROPERTIES TIMEOUT 60)

diff --git a/Tools/TestWebKitAPI/PlatformWPE.cmake b/Tools/TestWebKitAPI/PlatformWPE.cmake
index 96a357f..815374e 100644 (file)
--- a/Tools/TestWebKitAPI/PlatformWPE.cmake
+++ b/Tools/TestWebKitAPI/PlatformWPE.cmake
@@ -65,7 +65,7 @@ add_executable(TestWebCore
 )
 
 target_link_libraries(TestWebCore ${test_webcore_LIBRARIES})
-add_dependencies(TestWebCore ${ForwardingHeadersForTestWebKitAPI_NAME})
+add_dependencies(TestWebCore WebCoreForwardingHeaders ${ForwardingHeadersForTestWebKitAPI_NAME})
 
 add_test(TestWebCore ${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY}/WebCore/TestWebCore)
 set_tests_properties(TestWebCore PROPERTIES TIMEOUT 60)

diff --git a/Tools/TestWebKitAPI/PlatformWin.cmake b/Tools/TestWebKitAPI/PlatformWin.cmake
index 8486ab9..daac9d6 100644 (file)
--- a/Tools/TestWebKitAPI/PlatformWin.cmake
+++ b/Tools/TestWebKitAPI/PlatformWin.cmake
@@ -166,4 +166,5 @@ set(test_main_SOURCES
     ${TOOLS_DIR}/win/DLLLauncher/DLLLauncherMain.cpp
 )
 
+add_dependencies(TestWebCoreLib WebCoreForwardingHeaders)
 add_dependencies(TestWebCore TestWebCoreLib)

diff --git a/Tools/TestWebKitAPI/win/TestWebCoreStubs.cpp b/Tools/TestWebKitAPI/win/TestWebCoreStubs.cpp
index 1f930f2..2ba33a0 100644 (file)
--- a/Tools/TestWebKitAPI/win/TestWebCoreStubs.cpp
+++ b/Tools/TestWebKitAPI/win/TestWebCoreStubs.cpp
@@ -21,12 +21,12 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 #include "config.h"
 
-#include "SharedBuffer.h"
+#include <WebCore/SharedBuffer.h>
 
 RefPtr<WebCore::SharedBuffer> loadResourceIntoBuffer(const char*)
 {
     return nullptr;
 }
-

diff --git a/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp b/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp
index 66a8b4e..4b2b82d 100644 (file)
--- a/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp
+++ b/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp
@@ -32,9 +32,9 @@
 
 #include "InjectedBundle.h"
 #include "InjectedBundlePage.h"
-#include "NotImplemented.h"
 #include <JavaScriptCore/JSStringRef.h>
 #include <JavaScriptCore/OpaqueJSString.h>
+#include <WebCore/NotImplemented.h>
 #if ATK_CHECK_VERSION(2,11,90)
 #include <WebKit/WKBundleFrame.h>
 #endif

diff --git a/Tools/WebKitTestRunner/InjectedBundle/wpe/AccessibilityControllerWPE.cpp b/Tools/WebKitTestRunner/InjectedBundle/wpe/AccessibilityControllerWPE.cpp
index e94c2aa..fbea914 100644 (file)
--- a/Tools/WebKitTestRunner/InjectedBundle/wpe/AccessibilityControllerWPE.cpp
+++ b/Tools/WebKitTestRunner/InjectedBundle/wpe/AccessibilityControllerWPE.cpp
@@ -21,7 +21,7 @@
 
 #if HAVE(ACCESSIBILITY)
 
-#include "NotImplemented.h"
+#include <WebCore/NotImplemented.h>
 
 namespace WTR {
 

diff --git a/Tools/WebKitTestRunner/InjectedBundle/wpe/AccessibilityUIElementWPE.cpp b/Tools/WebKitTestRunner/InjectedBundle/wpe/AccessibilityUIElementWPE.cpp
index a43f6db..ac7ca94 100644 (file)
--- a/Tools/WebKitTestRunner/InjectedBundle/wpe/AccessibilityUIElementWPE.cpp
+++ b/Tools/WebKitTestRunner/InjectedBundle/wpe/AccessibilityUIElementWPE.cpp
@@ -21,7 +21,7 @@
 
 #if HAVE(ACCESSIBILITY)
 
-#include "NotImplemented.h"
+#include <WebCore/NotImplemented.h>
 
 namespace WTR {
 

diff --git a/Tools/WebKitTestRunner/gtk/EventSenderProxyGtk.cpp b/Tools/WebKitTestRunner/gtk/EventSenderProxyGtk.cpp
index 378141d..6b916df 100644 (file)
--- a/Tools/WebKitTestRunner/gtk/EventSenderProxyGtk.cpp
+++ b/Tools/WebKitTestRunner/gtk/EventSenderProxyGtk.cpp
@@ -33,9 +33,9 @@
 #include "config.h"
 #include "EventSenderProxy.h"
 
-#include "NotImplemented.h"
 #include "PlatformWebView.h"
 #include "TestController.h"
+#include <WebCore/NotImplemented.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 #include <wtf/StdLibExtras.h>

diff --git a/Tools/WebKitTestRunner/wpe/EventSenderProxyWPE.cpp b/Tools/WebKitTestRunner/wpe/EventSenderProxyWPE.cpp
index b271188..c2c8be1 100644 (file)
--- a/Tools/WebKitTestRunner/wpe/EventSenderProxyWPE.cpp
+++ b/Tools/WebKitTestRunner/wpe/EventSenderProxyWPE.cpp
@@ -27,9 +27,9 @@
 #include "EventSenderProxy.h"
 
 #include "HeadlessViewBackend.h"
-#include "NotImplemented.h"
 #include "PlatformWebView.h"
 #include "TestController.h"
+#include <WebCore/NotImplemented.h>
 #include <wpe/view-backend.h>
 #include <xkbcommon/xkbcommon-keysyms.h>
 #include <xkbcommon/xkbcommon.h>