Skip to content
Permalink
Browse files
[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:


Canonical link: https://commits.webkit.org/198527@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@228431 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
donny-dont committed Feb 13, 2018
1 parent 53fe439 commit 9a5ae007cbd8c295286348c9bab63604e37c2e88
Showing with 1,865 additions and 401 deletions.
  1. +1,375 −9 Source/WebCore/CMakeLists.txt
  2. +24 −0 Source/WebCore/ChangeLog
  3. +39 −20 Source/WebCore/PlatformAppleWin.cmake
  4. +37 −4 Source/WebCore/PlatformGTK.cmake
  5. +102 −162 Source/WebCore/PlatformMac.cmake
  6. +21 −2 Source/WebCore/PlatformWPE.cmake
  7. +37 −128 Source/WebCore/PlatformWin.cmake
  8. +3 −9 Source/WebCore/PlatformWinCairo.cmake
  9. +13 −1 Source/WebCore/platform/Cairo.cmake
  10. +26 −1 Source/WebCore/platform/Curl.cmake
  11. +8 −1 Source/WebCore/platform/FreeType.cmake
  12. +9 −3 Source/WebCore/platform/GStreamer.cmake
  13. +1 −1 Source/WebCore/platform/ImageDecoders.cmake
  14. +34 −3 Source/WebCore/platform/TextureMapper.cmake
  15. +0 −1 Source/WebCore/platform/graphics/win/LocalWindowsContext.h
  16. +1 −1 Source/WebKit/CMakeLists.txt
  17. +22 −0 Source/WebKit/ChangeLog
  18. +2 −2 Source/WebKit/NetworkProcess/capture/NetworkCaptureManager.cpp
  19. +1 −1 Source/WebKit/NetworkProcess/webrtc/NetworkRTCMonitor.h
  20. +0 −5 Source/WebKit/PlatformWPE.cmake
  21. +1 −1 Source/WebKit/Scripts/generate-forwarding-headers.pl
  22. +3 −3 Source/WebKit/Shared/gtk/WebEventFactory.cpp
  23. +1 −1 Source/WebKit/UIProcess/API/gtk/PageClientImpl.cpp
  24. +1 −1 Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp
  25. +1 −1 Source/WebKit/UIProcess/gtk/WebPageProxyGtk.cpp
  26. +2 −2 Source/WebKit/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp
  27. +1 −1 Source/WebKit/WebProcess/WebCoreSupport/gtk/WebEditorClientGtk.cpp
  28. +1 −1 Source/WebKit/WebProcess/WebCoreSupport/wpe/WebEditorClientWPE.cpp
  29. +2 −2 Source/WebKit/WebProcess/WebPage/gtk/WebPageGtk.cpp
  30. +1 −1 Source/WebKit/WebProcess/WebPage/wpe/WebPageWPE.cpp
  31. +9 −0 Source/WebKitLegacy/ChangeLog
  32. +0 −1 Source/WebKitLegacy/PlatformWin.cmake
  33. +23 −0 Source/WebKitLegacy/win/ChangeLog
  34. +1 −2 Source/WebKitLegacy/win/FullscreenVideoController.h
  35. +0 −1 Source/WebKitLegacy/win/Plugins/PluginDatabase.cpp
  36. +0 −1 Source/WebKitLegacy/win/Plugins/PluginDatabaseWin.cpp
  37. +0 −1 Source/WebKitLegacy/win/Plugins/PluginDebug.cpp
  38. +0 −1 Source/WebKitLegacy/win/Plugins/PluginMainThreadScheduler.cpp
  39. +0 −1 Source/WebKitLegacy/win/Plugins/PluginMessageThrottlerWin.cpp
  40. +0 −1 Source/WebKitLegacy/win/Plugins/PluginPackage.cpp
  41. +0 −2 Source/WebKitLegacy/win/Plugins/PluginPackageWin.cpp
  42. +0 −1 Source/WebKitLegacy/win/Plugins/PluginStream.cpp
  43. +0 −1 Source/WebKitLegacy/win/Plugins/PluginView.cpp
  44. +0 −1 Source/WebKitLegacy/win/Plugins/PluginViewWin.cpp
  45. +0 −2 Source/WebKitLegacy/win/Plugins/npapi.cpp
  46. +0 −1 Source/WebKitLegacy/win/WebKitMessageLoop.cpp
  47. +25 −1 Source/WebKitLegacy/win/WebKitPrefix.h
  48. +0 −1 Source/WebKitLegacy/win/storage/WebDatabaseProvider.cpp
  49. +23 −0 Tools/ChangeLog
  50. +1 −0 Tools/DumpRenderTree/CMakeLists.txt
  51. +1 −2 Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt
  52. +1 −1 Tools/DumpRenderTree/TestNetscapePlugIn/ForwardingHeaders/WebKit/npapi.h
  53. +1 −1 Tools/DumpRenderTree/TestNetscapePlugIn/ForwardingHeaders/WebKit/npfunctions.h
  54. +1 −1 Tools/DumpRenderTree/TestNetscapePlugIn/ForwardingHeaders/WebKit/npruntime.h
  55. +1 −1 Tools/TestWebKitAPI/PlatformGTK.cmake
  56. +1 −1 Tools/TestWebKitAPI/PlatformWPE.cmake
  57. +1 −0 Tools/TestWebKitAPI/PlatformWin.cmake
  58. +2 −2 Tools/TestWebKitAPI/win/TestWebCoreStubs.cpp
  59. +1 −1 Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp
  60. +1 −1 Tools/WebKitTestRunner/InjectedBundle/wpe/AccessibilityControllerWPE.cpp
  61. +1 −1 Tools/WebKitTestRunner/InjectedBundle/wpe/AccessibilityUIElementWPE.cpp
  62. +1 −1 Tools/WebKitTestRunner/gtk/EventSenderProxyGtk.cpp
  63. +1 −1 Tools/WebKitTestRunner/wpe/EventSenderProxyWPE.cpp

Large diffs are not rendered by default.

@@ -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
@@ -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 ()
@@ -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/"
)

0 comments on commit 9a5ae00

Please sign in to comment.