Changeset 244443 in webkit


Ignore:
Timestamp:
Apr 18, 2019 4:20:26 PM (5 years ago)
Author:
don.olmstead@sony.com
Message:

[CMake] Make WebCore headers copies
​https://bugs.webkit.org/show_bug.cgi?id=182512
<rdar://problem/37510435>

Reviewed by Alex Christensen.

Source/WebCore:

The header copying is moved to a target WebCorePrivateFrameworkHeaders. This target was
originally Windows only but now this is enabled for all CMake based ports.

Enumerated all headers within WebCore that are used for WebKit(Legacy), tools and
tests. Shared headers are within Headers.cmake while port and platform specific headers
are in their respective CMake files. Listing out all headers is preferred because globbing
will break the build whenever a file is added.

All include directories within the WebCore source tree are now PRIVATE. They were
modified to use WebCore_PRIVATE_INCLUDE_DIRECTORIES. They will not propagate to other targets
which will prevent erroneous includes in targets dependent on WebCore.

  • CMakeLists.txt:
  • Headers.cmake: Added.
  • PlatformAppleWin.cmake:
  • PlatformGTK.cmake:
  • PlatformMac.cmake:
  • PlatformPlayStation.cmake:
  • PlatformWPE.cmake:
  • PlatformWin.cmake:
  • PlatformWinCairo.cmake:
  • platform/Cairo.cmake:
  • platform/Curl.cmake:
  • platform/FreeType.cmake:
  • platform/GStreamer.cmake:
  • platform/HolePunch.cmake:
  • platform/ImageDecoders.cmake:
  • platform/Soup.cmake: Added.
  • platform/TextureMapper.cmake:

Source/WebKit:

WebCore now uses WebCore_PRIVATE_INCLUDE_DIRECTORIES for all ports. This revealed
problems with WebKit's usage of WebCore headers. All include directories directly
referencing the WebCore source tree we're removed from the CMake files. Any includes
of WebCore headers using "*.h" were modified to <WebCore/*.h>

Removed generation of forwarding headers for WebCore using the perl script.

  • CMakeLists.txt:
  • NetworkProcess/curl/NetworkDataTaskCurl.h:
  • PlatformWPE.cmake:
  • PlatformWin.cmake:
  • Scripts/generate-forwarding-headers.pl:
  • UIProcess/API/glib/WebKitUserContentFilterStore.cpp:
  • UIProcess/API/wpe/WebKitColorPrivate.h:
  • UIProcess/WebsiteData/win/WebsiteDataStoreWin.cpp:
  • UIProcess/win/PageClientImpl.cpp:

Source/WebKitLegacy:

Added WebCorePrivateFrameworkHeaders as a dependency of WebKitLegacy for all
ports.

WebCore now uses WebCore_PRIVATE_INCLUDE_DIRECTORIES for all ports. This revealed
problems with WebKit's usage of WebCore headers. All include directories directly
referencing the WebCore source tree we're removed from the CMake files.

  • CMakeLists.txt:
  • PlatformWin.cmake:

Tools:

Added WebCorePrivateFrameworkHeaders as a dependency of TestWebKitAPI for all
ports.

WebCore now uses WebCore_PRIVATE_INCLUDE_DIRECTORIES for all ports. Any includes
of WebCore headers using "*.h" were modified to <WebCore/*.h>

  • DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt:
  • DumpRenderTree/TestNetscapePlugIn/ForwardingHeaders/WebKit/npapi.h:
  • DumpRenderTree/TestNetscapePlugIn/ForwardingHeaders/WebKit/npfunctions.h:
  • DumpRenderTree/TestNetscapePlugIn/ForwardingHeaders/WebKit/npruntime.h:
  • TestWebKitAPI/CMakeLists.txt:
  • TestWebKitAPI/PlatformWin.cmake:
  • TestWebKitAPI/Tests/WebCore/AbortableTaskQueue.cpp:
  • TestWebKitAPI/Tests/WebCore/gstreamer/GstMappedBuffer.cpp:
  • WebKitTestRunner/win/PlatformWebViewWin.cpp:
Location:
trunk
Files:
2 added
39 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/CMakeLists.txt

    r244440 r244443  
    33include(WebKitCommon)
    44include(WebCoreMacros.cmake)
     5include(Headers.cmake)
    56
    67set_property(DIRECTORY . PROPERTY FOLDER "WebCore")
    … …  
    1617)
    1718
     19set(WebCore_INCLUDE_DIRECTORIES
     20    "${JavaScriptCore_PRIVATE_FRAMEWORK_HEADERS_DIR}"
     21    "${PAL_FRAMEWORK_HEADERS_DIR}"
     22)
     23
    1824set(WebCore_PRIVATE_INCLUDE_DIRECTORIES
    1925    "${CMAKE_BINARY_DIR}"
    20 )
    21 
    22 set(WebCore_INCLUDE_DIRECTORIES
    2326    "${WebCore_DERIVED_SOURCES_DIR}"
    24     "${JavaScriptCore_PRIVATE_FRAMEWORK_HEADERS_DIR}"
    25     "${PAL_FRAMEWORK_HEADERS_DIR}"
    2627    "${WEBCORE_DIR}"
    2728    "${WEBCORE_DIR}/Modules/airplay"
    … …  
    11441145
    11451146if (ENABLE_GAMEPAD)
    1146     list(APPEND WebCore_INCLUDE_DIRECTORIES
     1147    list(APPEND WebCore_PRIVATE_INCLUDE_DIRECTORIES
    11471148        "${WEBCORE_DIR}/Modules/gamepad"
    11481149    )
    … …  
    14891490    endif ()
    14901491
    1491     list(APPEND WebCore_INCLUDE_DIRECTORIES
     1492    list(APPEND WebCore_PRIVATE_INCLUDE_DIRECTORIES
    14921493        "${ANGLE_FORWARDING_HEADERS_DIR}"
    14931494        "${WEBCORE_DIR}/platform/graphics/gpu"
    … …  
    16511652
    16521653if (USE_OPENVR)
    1653   list(APPEND WebCore_INCLUDE_DIRECTORIES "${THIRDPARTY_DIR}/openvr/headers")
    1654   list(APPEND WebCore_INCLUDE_DIRECTORIES "${WEBCORE_DIR}/platform/vr/openvr")
     1654  list(APPEND WebCore_PRIVATE_INCLUDE_DIRECTORIES "${THIRDPARTY_DIR}/openvr/headers")
     1655  list(APPEND WebCore_PRIVATE_INCLUDE_DIRECTORIES "${WEBCORE_DIR}/platform/vr/openvr")
    16551656  list(APPEND WebCore_LIBRARIES openvr_api)
    16561657endif ()
    16571658
    16581659if (USE_WOFF2)
    1659   list(APPEND WebCore_INCLUDE_DIRECTORIES "${WOFF2DEC_INCLUDE_DIRS}")
     1660  list(APPEND WebCore_PRIVATE_INCLUDE_DIRECTORIES "${WOFF2DEC_INCLUDE_DIRS}")
    16601661  list(APPEND WebCore_LIBRARIES "${WOFF2DEC_LIBRARIES}")
    16611662endif ()
    16621663
    16631664if (USE_XDGMIME)
    1664     list(APPEND WebCore_INCLUDE_DIRECTORIES "${THIRDPARTY_DIR}/xdgmime/src")
     1665    list(APPEND WebCore_PRIVATE_INCLUDE_DIRECTORIES "${THIRDPARTY_DIR}/xdgmime/src")
    16651666    list(APPEND WebCore_LIBRARIES xdgmime)
    16661667endif ()
    16671668
    16681669if (USE_LIBWEBRTC)
    1669   list(APPEND WebCore_SYSTEM_INCLUDE_DIRECTORIES "${THIRDPARTY_DIR}/libwebrtc/Source/"
    1670       "${THIRDPARTY_DIR}/libwebrtc/Source/webrtc"
    1671       "${THIRDPARTY_DIR}/libwebrtc/Source/third_party/abseil-cpp")
    1672   list(APPEND WebCore_LIBRARIES webrtc)
    1673   list(APPEND WebCore_SOURCES
    1674       Modules/mediastream/libwebrtc/LibWebRTCStatsCollector.cpp
    1675       Modules/mediastream/libwebrtc/LibWebRTCDataChannelHandler.cpp
    1676       Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.cpp
    1677       Modules/mediastream/libwebrtc/LibWebRTCPeerConnectionBackend.cpp
    1678       Modules/mediastream/libwebrtc/LibWebRTCRtpReceiverBackend.cpp
    1679       Modules/mediastream/libwebrtc/LibWebRTCRtpSenderBackend.cpp
    1680       Modules/mediastream/libwebrtc/LibWebRTCRtpTransceiverBackend.cpp
    1681       Modules/mediastream/libwebrtc/LibWebRTCUtils.cpp
    1682       )
    1683 endif ()
    1684 
    1685 set(WebCoreTestSupport_INCLUDE_DIRECTORIES
     1670    list(APPEND WebCore_SYSTEM_INCLUDE_DIRECTORIES "${THIRDPARTY_DIR}/libwebrtc/Source/"
     1671        "${THIRDPARTY_DIR}/libwebrtc/Source/webrtc"
     1672        "${THIRDPARTY_DIR}/libwebrtc/Source/third_party/abseil-cpp")
     1673    list(APPEND WebCore_LIBRARIES webrtc)
     1674    list(APPEND WebCore_SOURCES
     1675        Modules/mediastream/libwebrtc/LibWebRTCDataChannelHandler.cpp
     1676        Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.cpp
     1677        Modules/mediastream/libwebrtc/LibWebRTCPeerConnectionBackend.cpp
     1678        Modules/mediastream/libwebrtc/LibWebRTCRtpReceiverBackend.cpp
     1679        Modules/mediastream/libwebrtc/LibWebRTCRtpSenderBackend.cpp
     1680        Modules/mediastream/libwebrtc/LibWebRTCRtpTransceiverBackend.cpp
     1681        Modules/mediastream/libwebrtc/LibWebRTCStatsCollector.cpp
     1682        Modules/mediastream/libwebrtc/LibWebRTCUtils.cpp
     1683    )
     1684endif ()
     1685
     1686set(WebCoreTestSupport_PRIVATE_INCLUDE_DIRECTORIES
    16861687    "${WEBCORE_DIR}/platform/mock"
    16871688    "${WEBCORE_DIR}/testing"
    … …  
    17591760WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
    17601761
     1762WEBKIT_MAKE_FORWARDING_HEADERS(WebCore
     1763    TARGET_NAME WebCorePrivateFrameworkHeaders
     1764    DESTINATION ${WebCore_PRIVATE_FRAMEWORK_HEADERS_DIR}/WebCore
     1765    FILES ${WebCore_PRIVATE_FRAMEWORK_HEADERS}
     1766    FLATTENED
     1767)
    17611768
    17621769# Generate CommandLineAPIModuleSource.h
    … …  
    20552062list(APPEND WebCore_SOURCES ${WebCore_DERIVED_SOURCES_DIR}/XMLNSNames.cpp)
    20562063
    2057 
    20582064GENERATE_DOM_NAMES(XML ${WEBCORE_DIR}/xml/xmlattrs.in)
    20592065list(APPEND WebCore_SOURCES ${WebCore_DERIVED_SOURCES_DIR}/XMLNames.cpp)
    … …  
    20682074endif ()
    20692075
    2070 
    20712076WEBKIT_FRAMEWORK(WebCore)
    20722077
    20732078add_dependencies(WebCore WebCoreBindings)
     2079add_dependencies(WebCorePrivateFrameworkHeaders WebCoreBindings)
    20742080
    20752081if (APPLE)
    … …  
    21012107add_dependencies(WebCoreTestSupport WebCore WebCoreTestSupportBindings)
    21022108target_include_directories(WebCoreTestSupport PUBLIC ${WebCoreTestSupport_INCLUDE_DIRECTORIES} ${WebCore_INCLUDE_DIRECTORIES})
     2109target_include_directories(WebCoreTestSupport PRIVATE ${WebCoreTestSupport_PRIVATE_INCLUDE_DIRECTORIES} ${WebCore_PRIVATE_INCLUDE_DIRECTORIES})
    21032110target_include_directories(WebCoreTestSupport SYSTEM PUBLIC ${WebCore_SYSTEM_INCLUDE_DIRECTORIES})
    21042111target_link_libraries(WebCoreTestSupport ${WebCoreTestSupport_LIBRARIES})

  • trunk/Source/WebCore/ChangeLog

    r244442 r244443  
     12019-04-18  Don Olmstead  <don.olmstead@sony.com>
     2
     3        [CMake] Make WebCore headers copies
     4        https://bugs.webkit.org/show_bug.cgi?id=182512
     5        <rdar://problem/37510435>
     6
     7        Reviewed by Alex Christensen.
     8
     9        The header copying is moved to a target WebCorePrivateFrameworkHeaders. This target was
     10        originally Windows only but now this is enabled for all CMake based ports.
     11
     12        Enumerated all headers within WebCore that are used for WebKit(Legacy), tools and
     13        tests. Shared headers are within Headers.cmake while port and platform specific headers
     14        are in their respective CMake files. Listing out all headers is preferred because globbing
     15        will break the build whenever a file is added.
     16
     17        All include directories within the WebCore source tree are now PRIVATE. They were
     18        modified to use WebCore_PRIVATE_INCLUDE_DIRECTORIES. They will not propagate to other targets
     19        which will prevent erroneous includes in targets dependent on WebCore.
     20
     21        * CMakeLists.txt:
     22        * Headers.cmake: Added.
     23        * PlatformAppleWin.cmake:
     24        * PlatformGTK.cmake:
     25        * PlatformMac.cmake:
     26        * PlatformPlayStation.cmake:
     27        * PlatformWPE.cmake:
     28        * PlatformWin.cmake:
     29        * PlatformWinCairo.cmake:
     30        * platform/Cairo.cmake:
     31        * platform/Curl.cmake:
     32        * platform/FreeType.cmake:
     33        * platform/GStreamer.cmake:
     34        * platform/HolePunch.cmake:
     35        * platform/ImageDecoders.cmake:
     36        * platform/Soup.cmake: Added.
     37        * platform/TextureMapper.cmake:
     38
    1392019-04-18  Justin Fan  <justin_fan@apple.com>
    240

  • trunk/Source/WebCore/PlatformAppleWin.cmake

    r241876 r244443  
    22    -DDISABLE_3D_TRANSFORMS -DWEBCORE_CONTEXT_MENUS -DPSAPI_VERSION=1)
    33
    4 list(APPEND WebCore_INCLUDE_DIRECTORIES
     4list(APPEND WebCore_PRIVATE_INCLUDE_DIRECTORIES
    55    "${WEBKIT_LIBRARIES_DIR}/include"
    66    "${WEBCORE_DIR}/loader/archive/cf"
    … …  
    1212    "${WEBCORE_DIR}/platform/network/cf"
    1313)
    14 
    15 if (${USE_DIRECT2D})
    16     list(APPEND WebCore_INCLUDE_DIRECTORIES
    17         "${WEBCORE_DIR}/platform/graphics/win"
    18     )
    19 else ()
    20     list(APPEND WebCore_INCLUDE_DIRECTORIES
    21         "${WEBCORE_DIR}/platform/graphics/avfoundation"
    22         "${WEBCORE_DIR}/platform/graphics/avfoundation/cf"
    23         "${WEBCORE_DIR}/platform/graphics/ca"
    24         "${WEBCORE_DIR}/platform/graphics/ca/win"
    25         "${WEBCORE_DIR}/platform/graphics/cg"
    26     )
    27 endif ()
    2814
    2915list(APPEND WebCore_SOURCES
    … …  
    7056)
    7157
     58list(APPEND WebCore_PRIVATE_FRAMEWORK_HEADERS
     59    platform/network/cf/AuthenticationCF.h
     60    platform/network/cf/AuthenticationChallenge.h
     61    platform/network/cf/CertificateInfo.h
     62    platform/network/cf/DownloadBundle.h
     63    platform/network/cf/LoaderRunLoopCF.h
     64    platform/network/cf/ProtectionSpaceCFNet.h
     65    platform/network/cf/ResourceError.h
     66    platform/network/cf/ResourceRequest.h
     67    platform/network/cf/ResourceRequestCFNet.h
     68    platform/network/cf/ResourceResponse.h
     69    platform/network/cf/SocketStreamHandleImpl.h
     70)
     71
    7272if (${USE_DIRECT2D})
     73    list(APPEND WebCore_PRIVATE_INCLUDE_DIRECTORIES
     74        "${WEBCORE_DIR}/platform/graphics/win"
     75    )
     76
    7377    list(APPEND WebCore_SOURCES
    7478        page/win/FrameWinDirect2D.cpp
    … …  
    9397    )
    9498else ()
     99    list(APPEND WebCore_PRIVATE_INCLUDE_DIRECTORIES
     100        "${WEBCORE_DIR}/platform/graphics/avfoundation"
     101        "${WEBCORE_DIR}/platform/graphics/avfoundation/cf"
     102        "${WEBCORE_DIR}/platform/graphics/ca"
     103        "${WEBCORE_DIR}/platform/graphics/ca/win"
     104        "${WEBCORE_DIR}/platform/graphics/cg"
     105    )
     106
    95107    list(APPEND WebCore_SOURCES
    96108        page/win/FrameCGWin.cpp
    … …  
    148160        platform/win/DragImageCGWin.cpp
    149161    )
    150 endif ()
    151162
    152 list(APPEND WebCore_FORWARDING_HEADERS_DIRECTORIES
    153     platform/network/cf
    154 )
     163    list(APPEND WebCore_PRIVATE_FRAMEWORK_HEADERS
     164        platform/graphics/ca/GraphicsLayerCA.h
     165        platform/graphics/ca/LayerPool.h
     166        platform/graphics/ca/PlatformCAAnimation.h
     167        platform/graphics/ca/PlatformCAFilters.h
     168        platform/graphics/ca/PlatformCALayer.h
     169        platform/graphics/ca/PlatformCALayerClient.h
     170        platform/graphics/ca/TileController.h
    155171
    156 if (${USE_DIRECT2D})
    157     list(APPEND WebCore_FORWARDING_HEADERS_DIRECTORIES
    158         platform/graphics/win
    159     )
    160 else ()
    161     list(APPEND WebCore_FORWARDING_HEADERS_DIRECTORIES
    162         platform/graphics/ca
    163         platform/graphics/cg
     172        platform/graphics/ca/win/AbstractCACFLayerTreeHost.h
     173        platform/graphics/ca/win/CACFLayerTreeHost.h
     174        platform/graphics/ca/win/CACFLayerTreeHostClient.h
     175        platform/graphics/ca/win/PlatformCALayerWin.h
    164176
    165         platform/graphics/ca/win
    166 
    167         platform/network/cf
     177        platform/graphics/cg/GraphicsContextCG.h
     178        platform/graphics/cg/IOSurfacePool.h
     179        platform/graphics/cg/ImageBufferDataCG.h
     180        platform/graphics/cg/ImageBufferUtilitiesCG.h
     181        platform/graphics/cg/PDFDocumentImage.h
     182        platform/graphics/cg/UTIRegistry.h
    168183    )
    169184endif ()

  • trunk/Source/WebCore/PlatformGTK.cmake

    r244292 r244443  
    44include(platform/GStreamer.cmake)
    55include(platform/ImageDecoders.cmake)
     6include(platform/Soup.cmake)
    67include(platform/TextureMapper.cmake)
    78
    … …  
    1213
    1314    "platform/SourcesGLib.txt"
    14     "platform/SourcesSoup.txt"
    15 )
    16 
    17 list(APPEND WebCore_INCLUDE_DIRECTORIES
     15)
     16
     17list(APPEND WebCore_PRIVATE_INCLUDE_DIRECTORIES
    1818    "${THIRDPARTY_DIR}/ANGLE/"
    1919    "${THIRDPARTY_DIR}/ANGLE/include/KHR"
    … …  
    3636    "${WEBCORE_DIR}/platform/mock/mediasource"
    3737    "${WEBCORE_DIR}/platform/network/gtk"
    38     "${WEBCORE_DIR}/platform/network/soup"
    3938    "${WEBCORE_DIR}/platform/text/gtk"
    4039)
    … …  
    7574)
    7675
     76list(APPEND WebCore_PRIVATE_FRAMEWORK_HEADERS
     77    platform/graphics/x11/PlatformDisplayX11.h
     78    platform/graphics/x11/XErrorTrapper.h
     79    platform/graphics/x11/XUniquePtr.h
     80    platform/graphics/x11/XUniqueResource.h
     81
     82    platform/gtk/CompositionResults.h
     83    platform/gtk/GRefPtrGtk.h
     84    platform/gtk/GUniquePtrGtk.h
     85    platform/gtk/GtkUtilities.h
     86    platform/gtk/GtkVersioning.h
     87    platform/gtk/PasteboardHelper.h
     88    platform/gtk/SelectionData.h
     89
     90    platform/text/enchant/TextCheckerEnchant.h
     91)
     92
    7793list(APPEND WebCore_USER_AGENT_STYLE_SHEETS
    7894    ${WEBCORE_DIR}/css/mediaControlsGtk.css
    … …  
    89105list(APPEND WebCore_LIBRARIES
    90106    ${ATK_LIBRARIES}
    91     ${CAIRO_LIBRARIES}
    92107    ${ENCHANT_LIBRARIES}
    93108    ${GLIB_GIO_LIBRARIES}
    … …  
    97112    ${LIBSECCOMP_LIBRARIES}
    98113    ${LIBSECRET_LIBRARIES}
    99     ${LIBSOUP_LIBRARIES}
    100114    ${LIBTASN1_LIBRARIES}
    101115    ${HYPHEN_LIBRARIES}
    … …  
    111125list(APPEND WebCore_SYSTEM_INCLUDE_DIRECTORIES
    112126    ${ATK_INCLUDE_DIRS}
    113     ${CAIRO_INCLUDE_DIRS}
    114127    ${ENCHANT_INCLUDE_DIRS}
    115128    ${GIO_UNIX_INCLUDE_DIRS}
    … …  
    117130    ${LIBSECCOMP_INCLUDE_DIRS}
    118131    ${LIBSECRET_INCLUDE_DIRS}
    119     ${LIBSOUP_INCLUDE_DIRS}
    120132    ${LIBTASN1_INCLUDE_DIRS}
    121133    ${UPOWERGLIB_INCLUDE_DIRS}
    … …  
    165177
    166178if (ENABLE_WAYLAND_TARGET)
     179    list(APPEND WebCore_PRIVATE_FRAMEWORK_HEADERS
     180        platform/graphics/wayland/PlatformDisplayWayland.h
     181        platform/graphics/wayland/WlUniquePtr.h
     182    )
    167183    list(APPEND WebCore_SYSTEM_INCLUDE_DIRECTORIES
    168184        ${WAYLAND_INCLUDE_DIRS}
    … …  
    192208include_directories(
    193209    ${WebCore_INCLUDE_DIRECTORIES}
     210    ${WebCore_PRIVATE_INCLUDE_DIRECTORIES}
    194211    "${WEBCORE_DIR}/bindings/gobject/"
    195212)

  • trunk/Source/WebCore/PlatformMac.cmake

    r244081 r244443  
    7171endif ()
    7272
    73 list(APPEND WebCore_INCLUDE_DIRECTORIES
     73list(APPEND WebCore_PRIVATE_INCLUDE_DIRECTORIES
    7474    "${CMAKE_SOURCE_DIR}/Source"
    7575    "${THIRDPARTY_DIR}/ANGLE"
    … …  
    429429)
    430430
    431 # FIXME: We do not need everything from all of these directories.
    432 # Move some to WebCore_FORWARDING_HEADERS_FILES once people start actually maintaining this.
    433 set(WebCore_FORWARDING_HEADERS_DIRECTORIES
    434     accessibility
    435     bridge
    436     contentextensions
    437     crypto
    438     css
    439     dom
    440     editing
    441     fileapi
    442     history
    443     html
    444     inspector
    445     loader
    446     page
    447     platform
    448     plugins
    449     rendering
    450     replay
    451     storage
    452     style
    453     svg
    454     workers
    455 
    456     workers/service/context
    457 
    458     Modules/applepay
    459     Modules/applicationmanifest
    460     Modules/cache
    461     Modules/geolocation
    462     Modules/indexeddb
    463     Modules/mediastream
    464     Modules/notifications
    465     Modules/webdatabase
    466     Modules/websockets
    467 
    468     Modules/indexeddb/client
    469     Modules/indexeddb/shared
    470     Modules/indexeddb/server
    471 
    472     bindings/js
    473 
    474     bridge/objc
    475     bridge/jsc
    476 
    477     css/parser
    478 
    479     editing/cocoa
    480     editing/mac
    481     editing/ios
    482 
    483     html/canvas
    484     html/forms
    485     html/parser
    486     html/shadow
    487     html/track
    488 
    489     inspector/agents
    490 
    491     loader/appcache
    492     loader/archive
    493     loader/cache
    494     loader/cocoa
    495 
    496     loader/archive/cf
    497 
    498     page/animation
    499     page/cocoa
    500     page/csp
    501     page/mac
    502     page/scrolling
    503 
    504     page/scrolling/mac
    505 
    506     platform/animation
    507     platform/audio
    508     platform/cf
    509     platform/cocoa
    510     platform/ios
    511     platform/graphics
    512     platform/mac
    513     platform/mediastream
    514     platform/mock
    515     platform/network
    516     platform/sql
    517     platform/text
    518 
    519     platform/audio/cocoa
    520 
    521     platform/gamepad/cocoa
    522     platform/gamepad/mac
    523 
    524     platform/graphics/avfoundation
    525     platform/graphics/ca
    526     platform/graphics/cocoa
    527     platform/graphics/cg
    528     platform/graphics/filters
    529     platform/graphics/opentype
    530     platform/graphics/mac
    531     platform/graphics/transforms
    532 
    533     platform/graphics/ca/cocoa
    534 
    535     platform/mediastream/libwebrtc
    536 
    537     platform/network/cf
    538     platform/network/cocoa
    539     platform/network/mac
    540 
    541     platform/spi/cf
    542     platform/spi/cg
    543     platform/spi/cocoa
    544     platform/spi/mac
    545 
    546     rendering/line
    547     rendering/style
    548 
    549     svg/graphics
    550     svg/properties
    551 
    552     workers/service
    553 
    554     workers/service/server
    555 
    556     xml
    557 )
    558 
    559 set(WebCore_FORWARDING_HEADERS_FILES
    560     Modules/webdatabase/DatabaseDetails.h
    561 
    562     bridge/IdentifierRep.h
    563     bridge/npruntime_impl.h
    564     bridge/npruntime_internal.h
    565 
    566     contentextensions/CompiledContentExtension.h
    567 
    568     editing/EditAction.h
    569     editing/EditingBehaviorTypes.h
    570     editing/EditingBoundary.h
    571     editing/FindOptions.h
    572     editing/FrameSelection.h
    573     editing/TextAffinity.h
    574 
     431list(APPEND WebCore_PRIVATE_FRAMEWORK_HEADERS
     432    accessibility/mac/WebAccessibilityObjectWrapperBase.h
     433    accessibility/mac/WebAccessibilityObjectWrapperMac.h
     434
     435    editing/cocoa/DataDetection.h
     436    editing/cocoa/HTMLConverter.h
     437
     438    editing/mac/AlternativeTextUIController.h
     439    editing/mac/DictionaryLookup.h
    575440    editing/mac/TextAlternativeWithRange.h
    576 
    577     history/HistoryItem.h
    578     history/PageCache.h
    579 
    580     html/HTMLMediaElement.h
    581 
    582     loader/appcache/ApplicationCacheStorage.h
    583 
    584     loader/icon/IconDatabase.h
    585     loader/icon/IconDatabaseBase.h
    586     loader/icon/IconDatabaseClient.h
     441    editing/mac/TextUndoInsertionMarkupMac.h
     442
     443    loader/archive/cf/LegacyWebArchive.h
    587444
    588445    loader/mac/LoaderNSURLExtras.h
    589446
    590     platform/PlatformExportMacros.h
    591 
    592     platform/audio/AudioHardwareListener.h
     447    page/mac/TextIndicatorWindow.h
     448    page/mac/WebCoreFrameView.h
     449
     450    page/scrolling/cocoa/ScrollingTreeFixedNode.h
     451    page/scrolling/cocoa/ScrollingTreePositionedNode.h
     452    page/scrolling/cocoa/ScrollingTreeStickyNode.h
     453
     454    page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.h
     455    page/scrolling/mac/ScrollingTreeOverflowScrollingNodeMac.h
     456    page/scrolling/mac/ScrollingTreeScrollingNodeDelegateMac.h
     457
     458    platform/audio/cocoa/MediaSessionManagerCocoa.h
     459    platform/audio/cocoa/WebAudioBufferList.h
     460
     461    platform/audio/mac/CAAudioStreamDescription.h
     462    platform/audio/mac/CARingBuffer.h
    593463
    594464    platform/cf/RunLoopObserver.h
    595465
    596     platform/cocoa/MachSendRight.h
    597     platform/cocoa/SoftLinking.h
    598 
     466    platform/cocoa/PlatformView.h
     467    platform/cocoa/PlaybackSessionInterface.h
     468    platform/cocoa/PlaybackSessionModel.h
     469    platform/cocoa/PlaybackSessionModelMediaElement.h
     470    platform/cocoa/ScrollController.h
     471    platform/cocoa/ScrollSnapAnimatorState.h
     472    platform/cocoa/SearchPopupMenuCocoa.h
     473    platform/cocoa/SystemVersion.h
     474    platform/cocoa/VideoFullscreenChangeObserver.h
     475    platform/cocoa/VideoFullscreenModel.h
     476    platform/cocoa/VideoFullscreenModelVideoElement.h
     477
     478    platform/gamepad/cocoa/GameControllerGamepadProvider.h
     479
     480    platform/gamepad/mac/HIDGamepad.h
     481    platform/gamepad/mac/HIDGamepadProvider.h
     482
     483    platform/graphics/avfoundation/MediaPlaybackTargetMac.h
     484    platform/graphics/avfoundation/WebMediaSessionManagerMac.h
     485
     486    platform/graphics/avfoundation/objc/AVFoundationMIMETypeCache.h
     487
     488    platform/graphics/ca/GraphicsLayerCA.h
     489    platform/graphics/ca/LayerPool.h
     490    platform/graphics/ca/PlatformCAAnimation.h
     491    platform/graphics/ca/PlatformCAFilters.h
     492    platform/graphics/ca/PlatformCALayer.h
     493    platform/graphics/ca/PlatformCALayerClient.h
     494    platform/graphics/ca/TileController.h
     495
     496    platform/graphics/ca/cocoa/PlatformCAAnimationCocoa.h
     497    platform/graphics/ca/cocoa/PlatformCALayerCocoa.h
     498
     499    platform/graphics/cg/GraphicsContextCG.h
     500    platform/graphics/cg/IOSurfacePool.h
     501    platform/graphics/cg/ImageBufferDataCG.h
     502    platform/graphics/cg/ImageBufferUtilitiesCG.h
     503    platform/graphics/cg/PDFDocumentImage.h
     504    platform/graphics/cg/UTIRegistry.h
     505
     506    platform/graphics/cocoa/FontCacheCoreText.h
     507    platform/graphics/cocoa/FontFamilySpecificationCoreText.h
    599508    platform/graphics/cocoa/IOSurface.h
    600 
    601     platform/graphics/transforms/AffineTransform.h
    602 
     509    platform/graphics/cocoa/WebActionDisablingCALayerDelegate.h
     510    platform/graphics/cocoa/WebCoreCALayerExtras.h
     511
     512    platform/graphics/mac/ColorMac.h
     513    platform/graphics/mac/SwitchingGPUClient.h
     514    platform/graphics/mac/WebLayer.h
     515
     516    platform/mac/DynamicLinkerInterposing.h
     517    platform/mac/LegacyNSPasteboardTypes.h
     518    platform/mac/LocalDefaultSystemAppearance.h
     519    platform/mac/NSScrollerImpDetails.h
     520    platform/mac/PasteboardWriter.h
     521    platform/mac/PlatformEventFactoryMac.h
     522    platform/mac/PlaybackSessionInterfaceMac.h
     523    platform/mac/PluginBlacklist.h
     524    platform/mac/ScrollbarThemeMac.h
     525    platform/mac/StringUtilities.h
     526    platform/mac/VideoFullscreenInterfaceMac.h
     527    platform/mac/WebCoreFullScreenPlaceholderView.h
     528    platform/mac/WebCoreFullScreenWindow.h
     529    platform/mac/WebCoreNSFontManagerExtras.h
     530    platform/mac/WebCoreNSURLExtras.h
     531    platform/mac/WebCoreObjCExtras.h
     532    platform/mac/WebCoreView.h
     533    platform/mac/WebGLBlacklist.h
     534    platform/mac/WebNSAttributedStringExtras.h
     535    platform/mac/WebPlaybackControlsManager.h
     536
     537    platform/mediastream/libwebrtc/LibWebRTCProviderCocoa.h
     538
     539    platform/mediastream/mac/WebAudioSourceProviderAVFObjC.h
     540
     541    platform/network/cf/AuthenticationCF.h
     542    platform/network/cf/AuthenticationChallenge.h
    603543    platform/network/cf/CertificateInfo.h
     544    platform/network/cf/DownloadBundle.h
     545    platform/network/cf/LoaderRunLoopCF.h
     546    platform/network/cf/ProtectionSpaceCFNet.h
     547    platform/network/cf/ResourceError.h
     548    platform/network/cf/ResourceRequest.h
     549    platform/network/cf/ResourceRequestCFNet.h
    604550    platform/network/cf/ResourceResponse.h
     551    platform/network/cf/SocketStreamHandleImpl.h
     552
     553    platform/network/cocoa/CookieStorageObserver.h
     554    platform/network/cocoa/CredentialCocoa.h
     555    platform/network/cocoa/ProtectionSpaceCocoa.h
     556    platform/network/cocoa/WebCoreNSURLSession.h
    605557
    606558    platform/network/mac/AuthenticationMac.h
    607 
    608     platform/sql/SQLiteDatabase.h
    609 
    610     rendering/style/RenderStyleConstants.h
     559    platform/network/mac/FormDataStreamMac.h
     560    platform/network/mac/UTIUtilities.h
     561    platform/network/mac/WebCoreURLResponse.h
    611562)
    612563
    … …  
    614565    Modules/plugins/QuickTimePluginReplacement.idl
    615566)
    616 
    617 WEBKIT_CREATE_FORWARDING_HEADERS(WebCore DIRECTORIES ${WebCore_FORWARDING_HEADERS_DIRECTORIES} FILES ${WebCore_FORWARDING_HEADERS_FILES})
    618567
    619568set(FEATURE_DEFINES_OBJECTIVE_C "LANGUAGE_OBJECTIVE_C=1 ${FEATURE_DEFINES_WITH_SPACE_SEPARATOR}")

  • trunk/Source/WebCore/PlatformPlayStation.cmake

    r240437 r244443  
    55include(platform/TextureMapper.cmake)
    66
    7 list(APPEND WebCore_INCLUDE_DIRECTORIES
     7list(APPEND WebCore_PRIVATE_INCLUDE_DIRECTORIES
    88    ${THIRDPARTY_DIR}/ANGLE/
    99    ${THIRDPARTY_DIR}/ANGLE/include/KHR

  • trunk/Source/WebCore/PlatformWPE.cmake

    r242033 r244443  
    44include(platform/GStreamer.cmake)
    55include(platform/ImageDecoders.cmake)
     6include(platform/Soup.cmake)
    67include(platform/TextureMapper.cmake)
    78
    … …  
    1415
    1516    "platform/SourcesGLib.txt"
    16     "platform/SourcesSoup.txt"
    1717)
    1818
    … …  
    2020list(APPEND ANGLE_PLATFORM_DEFINITIONS "USE_WPE")
    2121
    22 list(APPEND WebCore_INCLUDE_DIRECTORIES
     22list(APPEND WebCore_PRIVATE_INCLUDE_DIRECTORIES
    2323    "${THIRDPARTY_DIR}/ANGLE/"
    2424    "${THIRDPARTY_DIR}/ANGLE/include/KHR"
    … …  
    3434    "${WEBCORE_DIR}/platform/mediacapabilities"
    3535    "${WEBCORE_DIR}/platform/mediastream/gstreamer"
    36     "${WEBCORE_DIR}/platform/network/soup"
    3736    "${WEBCORE_DIR}/platform/text/icu"
     37)
     38
     39list(APPEND WebCore_PRIVATE_FRAMEWORK_HEADERS
     40    platform/graphics/wayland/PlatformDisplayWayland.h
     41    platform/graphics/wayland/WlUniquePtr.h
    3842)
    3943
    … …  
    5054
    5155list(APPEND WebCore_LIBRARIES
    52     ${CAIRO_LIBRARIES}
    5356    ${GLIB_GIO_LIBRARIES}
    5457    ${GLIB_GMODULE_LIBRARIES}
    … …  
    5659    ${GLIB_LIBRARIES}
    5760    ${ICU_LIBRARIES}
    58     ${LIBSOUP_LIBRARIES}
    5961    ${LIBTASN1_LIBRARIES}
    6062    ${UPOWERGLIB_LIBRARIES}
    … …  
    6365
    6466list(APPEND WebCore_SYSTEM_INCLUDE_DIRECTORIES
    65     ${CAIRO_INCLUDE_DIRS}
    6667    ${GIO_UNIX_INCLUDE_DIRS}
    6768    ${GLIB_INCLUDE_DIRS}
    6869    ${ICU_INCLUDE_DIRS}
    69     ${LIBSOUP_INCLUDE_DIRS}
    7070    ${LIBTASN1_INCLUDE_DIRS}
    7171    ${UPOWERGLIB_INCLUDE_DIRS}

  • trunk/Source/WebCore/PlatformWin.cmake

    r244292 r244443  
    11add_definitions(/bigobj -D__STDC_CONSTANT_MACROS)
    22
    3 list(APPEND WebCore_INCLUDE_DIRECTORIES
     3list(APPEND WebCore_PRIVATE_INCLUDE_DIRECTORIES
    44    "${CMAKE_BINARY_DIR}/../include/private"
    55    "${CMAKE_BINARY_DIR}/../include/private/JavaScriptCore"
    … …  
    116116)
    117117
     118list(APPEND WebCore_PRIVATE_FRAMEWORK_HEADERS
     119    accessibility/win/AccessibilityObjectWrapperWin.h
     120
     121    page/win/FrameWin.h
     122
     123    platform/graphics/win/DIBPixelData.h
     124    platform/graphics/win/FullScreenController.h
     125    platform/graphics/win/FullScreenControllerClient.h
     126    platform/graphics/win/ImageBufferDataDirect2D.h
     127    platform/graphics/win/LocalWindowsContext.h
     128    platform/graphics/win/MediaPlayerPrivateFullscreenWindow.h
     129    platform/graphics/win/SharedGDIObject.h
     130
     131    platform/win/BString.h
     132    platform/win/BitmapInfo.h
     133    platform/win/COMPtr.h
     134    platform/win/DefWndProcWindowClass.h
     135    platform/win/GDIObjectCounter.h
     136    platform/win/GDIUtilities.h
     137    platform/win/HWndDC.h
     138    platform/win/PopupMenuWin.h
     139    platform/win/ScrollbarThemeWin.h
     140    platform/win/SearchPopupMenuDB.h
     141    platform/win/SearchPopupMenuWin.h
     142    platform/win/SystemInfo.h
     143    platform/win/WCDataObject.h
     144    platform/win/WebCoreBundleWin.h
     145    platform/win/WebCoreInstanceHandle.h
     146    platform/win/WebCoreTextRenderer.h
     147    platform/win/WindowMessageBroadcaster.h
     148    platform/win/WindowMessageListener.h
     149    platform/win/WindowsTouch.h
     150)
     151
    118152list(APPEND WebCore_USER_AGENT_STYLE_SHEETS
    119153    ${WEBCORE_DIR}/css/themeWin.css
    … …  
    121155)
    122156
    123 set(WebCore_FORWARDING_HEADERS_DIRECTORIES
    124     .
    125     accessibility
    126     animation
    127     bindings
    128     bridge
    129     contentextensions
    130     crypto
    131     css
    132     dom
    133     editing
    134     fileapi
    135     history
    136     html
    137     inspector
    138     loader
    139     page
    140     platform
    141     plugins
    142     rendering
    143     replay
    144     storage
    145     style
    146     svg
    147     websockets
    148     workers
    149     xml
    150 
    151     Modules/cache
    152     Modules/fetch
    153     Modules/geolocation
    154     Modules/indexeddb
    155     Modules/mediastream
    156     Modules/websockets
    157 
    158     Modules/indexeddb/client
    159     Modules/indexeddb/legacy
    160     Modules/indexeddb/server
    161     Modules/indexeddb/shared
    162     Modules/notifications
    163     Modules/webdatabase
    164 
    165     accessibility/win
    166 
    167     bindings/js
    168 
    169     bridge/c
    170     bridge/jsc
    171 
    172     css/parser
    173 
    174     html/canvas
    175     html/forms
    176     html/parser
    177     html/shadow
    178     html/track
    179 
    180     loader/appcache
    181     loader/archive
    182     loader/cache
    183     loader/icon
    184 
    185     page/animation
    186     page/csp
    187     page/scrolling
    188     page/win
    189 
    190     platform/animation
    191     platform/audio
    192     platform/graphics
    193     platform/mediacapabilities
    194     platform/mock
    195     platform/network
    196     platform/sql
    197     platform/text
    198     platform/win
    199 
    200     platform/graphics/filters
    201     platform/graphics/opengl
    202     platform/graphics/opentype
    203     platform/graphics/texmap
    204     platform/graphics/transforms
    205     platform/graphics/win
    206 
    207     platform/mediastream/libwebrtc
    208 
    209     platform/text/transcoder
    210 
    211     rendering/line
    212     rendering/shapes
    213     rendering/style
    214     rendering/svg
    215 
    216     svg/animation
    217     svg/graphics
    218     svg/properties
    219 
    220     svg/graphics/filters
    221 
    222     workers/service
    223 )
    224 
    225 if (ENABLE_WEBKIT)
    226     list(APPEND WebCore_FORWARDING_HEADERS_DIRECTORIES
    227         Modules/applicationmanifest
    228 
    229         dom/messageports
    230 
    231         inspector/agents
    232 
    233         platform/mediacapabilities
    234         platform/mediastream
    235 
    236         workers/service/context
    237         workers/service/server
    238     )
    239 endif ()
    240 
    241157if (USE_CF)
    242     list(APPEND WebCore_INCLUDE_DIRECTORIES
     158    list(APPEND WebCore_PRIVATE_INCLUDE_DIRECTORIES
    243159        "${WEBCORE_DIR}/platform/cf"
    244160        "${WEBCORE_DIR}/platform/cf/win"
    … …  
    259175    )
    260176
    261     list(APPEND WebCore_FORWARDING_HEADERS_DIRECTORIES
    262         history/cf
    263 
    264         loader/archive/cf
    265 
    266         platform/cf
    267 
    268         platform/cf/win
     177    list(APPEND WebCore_PRIVATE_FRAMEWORK_HEADERS
     178        loader/archive/cf/LegacyWebArchive.h
     179
     180        platform/cf/win/CertificateCFWin.h
    269181    )
    270182
    … …  
    277189
    278190        platform/text/Hyphenation.cpp
    279     )
    280 
    281     list(APPEND WebCore_FORWARDING_HEADERS_DIRECTORIES
    282         platform/generic
    283191    )
    284192endif ()
    … …  
    325233endif ()
    326234
    327 set(WebCore_PRIVATE_FRAMEWORK_HEADERS
    328     ${WebCore_DERIVED_SOURCES_DIR}/CSSPropertyNames.h
    329     ${WebCore_DERIVED_SOURCES_DIR}/CSSValueKeywords.h
    330     ${WebCore_DERIVED_SOURCES_DIR}/EventInterfaces.h
    331     ${WebCore_DERIVED_SOURCES_DIR}/EventTargetInterfaces.h
    332     ${WebCore_DERIVED_SOURCES_DIR}/HTMLElementTypeHelpers.h
    333     ${WebCore_DERIVED_SOURCES_DIR}/HTMLNames.h
    334     ${WebCore_DERIVED_SOURCES_DIR}/HTTPHeaderNames.h
    335     ${WebCore_DERIVED_SOURCES_DIR}/JSBlob.h
    336     ${WebCore_DERIVED_SOURCES_DIR}/JSCSSStyleDeclaration.h
    337     ${WebCore_DERIVED_SOURCES_DIR}/JSDOMBindingInternalsBuiltins.h
    338     ${WebCore_DERIVED_SOURCES_DIR}/JSDOMWindow.h
    339     ${WebCore_DERIVED_SOURCES_DIR}/JSDocument.h
    340     ${WebCore_DERIVED_SOURCES_DIR}/JSElement.h
    341     ${WebCore_DERIVED_SOURCES_DIR}/JSEventTarget.h
    342     ${WebCore_DERIVED_SOURCES_DIR}/JSFile.h
    343     ${WebCore_DERIVED_SOURCES_DIR}/JSHTMLElement.h
    344     ${WebCore_DERIVED_SOURCES_DIR}/JSNode.h
    345     ${WebCore_DERIVED_SOURCES_DIR}/JSNotification.h
    346     ${WebCore_DERIVED_SOURCES_DIR}/JSRange.h
    347     ${WebCore_DERIVED_SOURCES_DIR}/JSReadableStream.h
    348     ${WebCore_DERIVED_SOURCES_DIR}/JSReadableStreamDefaultController.h
    349     ${WebCore_DERIVED_SOURCES_DIR}/RTCPeerConnectionInternalsBuiltins.h
    350     ${WebCore_DERIVED_SOURCES_DIR}/ReadableByteStreamInternalsBuiltins.h
    351     ${WebCore_DERIVED_SOURCES_DIR}/ReadableStreamInternalsBuiltins.h
    352     ${WebCore_DERIVED_SOURCES_DIR}/Settings.h
    353     ${WebCore_DERIVED_SOURCES_DIR}/StreamInternalsBuiltins.h
    354     ${WebCore_DERIVED_SOURCES_DIR}/WebCoreJSBuiltinInternals.h
    355     ${WebCore_DERIVED_SOURCES_DIR}/WebCoreJSBuiltins.h
    356     ${WebCore_DERIVED_SOURCES_DIR}/WebKitFontFamilyNames.h
    357     ${WebCore_DERIVED_SOURCES_DIR}/WritableStreamInternalsBuiltins.h
    358 )
    359 
    360 WEBKIT_MAKE_FORWARDING_HEADERS(WebCore
    361     TARGET_NAME WebCorePrivateFrameworkHeaders
    362     DESTINATION ${WebCore_PRIVATE_FRAMEWORK_HEADERS_DIR}/WebCore
    363     FILES ${WebCore_PRIVATE_FRAMEWORK_HEADERS}
    364     DIRECTORIES ${WebCore_FORWARDING_HEADERS_DIRECTORIES}
    365     FLATTENED
    366 )
    367 
    368 add_dependencies(WebCorePrivateFrameworkHeaders WebCoreBindings)
    369 
    370235set(WebCore_OUTPUT_NAME
    371236    WebCore${DEBUG_SUFFIX}

  • trunk/Source/WebCore/PlatformWinCairo.cmake

    r241876 r244443  
    44include(platform/TextureMapper.cmake)
    55
    6 list(APPEND WebCore_INCLUDE_DIRECTORIES
     6list(APPEND WebCore_PRIVATE_INCLUDE_DIRECTORIES
    77    "${DirectX_INCLUDE_DIRS}"
    88    "${WEBKIT_LIBRARIES_DIR}/include"
    … …  
    5353    shlwapi
    5454)
    55 
    56 list(APPEND WebCore_FORWARDING_HEADERS_DIRECTORIES
    57     platform/mediacapabilities
    58     platform/graphics/cairo
    59     platform/network/curl
    60 )

  • trunk/Source/WebCore/platform/Cairo.cmake

    r228451 r244443  
    1 list(APPEND WebCore_INCLUDE_DIRECTORIES
     1list(APPEND WebCore_PRIVATE_INCLUDE_DIRECTORIES
    22    "${WEBCORE_DIR}/platform/graphics/cairo"
    33)
    … …  
    55list(APPEND WebCore_UNIFIED_SOURCE_LIST_FILES
    66    "platform/SourcesCairo.txt"
     7)
     8
     9list(APPEND WebCore_PRIVATE_FRAMEWORK_HEADERS
     10    platform/graphics/cairo/BackingStoreBackendCairo.h
     11    platform/graphics/cairo/BackingStoreBackendCairoImpl.h
     12    platform/graphics/cairo/BackingStoreBackendCairoX11.h
     13    platform/graphics/cairo/CairoOperations.h
     14    platform/graphics/cairo/CairoUtilities.h
     15    platform/graphics/cairo/GraphicsContextImplCairo.h
     16    platform/graphics/cairo/ImageBufferDataCairo.h
     17    platform/graphics/cairo/PlatformContextCairo.h
     18    platform/graphics/cairo/RefPtrCairo.h
    719)
    820

  • trunk/Source/WebCore/platform/Curl.cmake

    r242207 r244443  
    1 list(APPEND WebCore_INCLUDE_DIRECTORIES
     1list(APPEND WebCore_PRIVATE_INCLUDE_DIRECTORIES
    22    "${WEBCORE_DIR}/platform/network/curl"
    33)
    … …  
    3636)
    3737
     38list(APPEND WebCore_PRIVATE_FRAMEWORK_HEADERS
     39    platform/network/curl/AuthenticationChallenge.h
     40    platform/network/curl/CertificateInfo.h
     41    platform/network/curl/CookieJarCurl.h
     42    platform/network/curl/CookieJarDB.h
     43    platform/network/curl/CookieUtil.h
     44    platform/network/curl/CurlCacheEntry.h
     45    platform/network/curl/CurlCacheManager.h
     46    platform/network/curl/CurlContext.h
     47    platform/network/curl/CurlDownload.h
     48    platform/network/curl/CurlFormDataStream.h
     49    platform/network/curl/CurlMultipartHandle.h
     50    platform/network/curl/CurlMultipartHandleClient.h
     51    platform/network/curl/CurlProxySettings.h
     52    platform/network/curl/CurlRequest.h
     53    platform/network/curl/CurlRequestClient.h
     54    platform/network/curl/CurlRequestSchedulerClient.h
     55    platform/network/curl/CurlResourceHandleDelegate.h
     56    platform/network/curl/CurlResponse.h
     57    platform/network/curl/CurlSSLHandle.h
     58    platform/network/curl/DownloadBundle.h
     59    platform/network/curl/ProtectionSpaceCurl.h
     60    platform/network/curl/ResourceError.h
     61    platform/network/curl/ResourceRequest.h
     62    platform/network/curl/ResourceResponse.h
     63    platform/network/curl/SocketStreamHandleImpl.h
     64)
     65
    3866list(APPEND WebCore_SYSTEM_INCLUDE_DIRECTORIES
    3967    ${CURL_INCLUDE_DIRS}

  • trunk/Source/WebCore/platform/FreeType.cmake

    r239379 r244443  
    1 list(APPEND WebCore_INCLUDE_DIRECTORIES
     1list(APPEND WebCore_PRIVATE_INCLUDE_DIRECTORIES
    22    "${WEBCORE_DIR}/platform/graphics/freetype"
    33    "${WEBCORE_DIR}/platform/graphics/harfbuzz"
    … …  
    1313
    1414    platform/graphics/harfbuzz/ComplexTextControllerHarfBuzz.cpp
     15)
     16
     17list(APPEND WebCore_PRIVATE_FRAMEWORK_HEADERS
     18    platform/graphics/freetype/FcUniquePtr.h
     19    platform/graphics/freetype/RefPtrFontconfig.h
     20
     21    platform/graphics/harfbuzz/HbUniquePtr.h
    1522)
    1623

  • trunk/Source/WebCore/platform/GStreamer.cmake

    r241585 r244443  
    11if (ENABLE_VIDEO OR ENABLE_WEB_AUDIO)
    2     list(APPEND WebCore_INCLUDE_DIRECTORIES
     2    list(APPEND WebCore_PRIVATE_INCLUDE_DIRECTORIES
    33        "${WEBCORE_DIR}/platform/graphics/gstreamer"
    44        "${WEBCORE_DIR}/platform/graphics/gstreamer/mse"
    … …  
    5858        platform/mediastream/gstreamer/RealtimeOutgoingAudioSourceLibWebRTC.cpp
    5959        platform/mediastream/gstreamer/RealtimeOutgoingVideoSourceLibWebRTC.cpp
     60    )
     61
     62    list(APPEND WebCore_PRIVATE_FRAMEWORK_HEADERS
     63        platform/graphics/gstreamer/GRefPtrGStreamer.h
     64        platform/graphics/gstreamer/GStreamerCommon.h
     65        platform/graphics/gstreamer/GUniquePtrGStreamer.h
     66        platform/graphics/gstreamer/MediaPlayerRequestInstallMissingPluginsCallback.h
     67
     68        platform/mediastream/libwebrtc/GStreamerVideoDecoderFactory.h
     69        platform/mediastream/libwebrtc/GStreamerVideoEncoderFactory.h
     70        platform/mediastream/libwebrtc/LibWebRTCProviderGStreamer.h
    6071    )
    6172
    … …  
    126137
    127138if (ENABLE_WEB_AUDIO)
    128     list(APPEND WebCore_INCLUDE_DIRECTORIES
     139    list(APPEND WebCore_PRIVATE_INCLUDE_DIRECTORIES
    129140        "${WEBCORE_DIR}/platform/audio/gstreamer"
    130141    )
    … …  
    149160
    150161if (ENABLE_ENCRYPTED_MEDIA)
    151     list(APPEND WebCore_INCLUDE_DIRECTORIES
     162    list(APPEND WebCore_PRIVATE_INCLUDE_DIRECTORIES
    152163        "${WEBCORE_DIR}/platform/encryptedmedia/clearkey"
    153         ${LIBGCRYPT_INCLUDE_DIRS}
    154164    )
     165
    155166    list(APPEND WebCore_SOURCES
    156167        platform/encryptedmedia/clearkey/CDMClearKey.cpp
    … …  
    158169        platform/graphics/gstreamer/eme/CDMFactoryGStreamer.cpp
    159170    )
     171
     172    list(APPEND WebCore_SYSTEM_INCLUDE_DIRECTORIES
     173        ${LIBGCRYPT_INCLUDE_DIRS}
     174    )
     175
    160176    list(APPEND WebCore_LIBRARIES
    161177        ${LIBGCRYPT_LIBRARIES} -lgpg-error

  • trunk/Source/WebCore/platform/HolePunch.cmake

    r242033 r244443  
    1 list(APPEND WebCore_INCLUDE_DIRECTORIES
     1list(APPEND WebCore_PRIVATE_INCLUDE_DIRECTORIES
    22    "${WEBCORE_DIR}/platform/graphics/holepunch"
    33)

  • trunk/Source/WebCore/platform/ImageDecoders.cmake

    r240428 r244443  
    1 list(APPEND WebCore_INCLUDE_DIRECTORIES
     1list(APPEND WebCore_PRIVATE_INCLUDE_DIRECTORIES
    22    "${WEBCORE_DIR}/platform/image-decoders"
    33    "${WEBCORE_DIR}/platform/image-decoders/bmp"

  • trunk/Source/WebCore/platform/TextureMapper.cmake

    r239667 r244443  
    1 list(APPEND WebCore_INCLUDE_DIRECTORIES
     1list(APPEND WebCore_PRIVATE_INCLUDE_DIRECTORIES
    22    "${WEBCORE_DIR}/platform/graphics/texmap"
    33)
     4
    45list(APPEND WebCore_SOURCES
    56    platform/graphics/texmap/BitmapTexture.cpp
    … …  
    1516)
    1617
     18list(APPEND WebCore_PRIVATE_FRAMEWORK_HEADERS
     19    platform/graphics/texmap/BitmapTexture.h
     20    platform/graphics/texmap/ClipStack.h
     21    platform/graphics/texmap/GraphicsLayerTextureMapper.h
     22    platform/graphics/texmap/TextureMapper.h
     23    platform/graphics/texmap/TextureMapperAnimation.h
     24    platform/graphics/texmap/TextureMapperBackingStore.h
     25    platform/graphics/texmap/TextureMapperContextAttributes.h
     26    platform/graphics/texmap/TextureMapperFPSCounter.h
     27    platform/graphics/texmap/TextureMapperGL.h
     28    platform/graphics/texmap/TextureMapperGLHeaders.h
     29    platform/graphics/texmap/TextureMapperLayer.h
     30    platform/graphics/texmap/TextureMapperPlatformLayer.h
     31    platform/graphics/texmap/TextureMapperPlatformLayerProxy.h
     32    platform/graphics/texmap/TextureMapperPlatformLayerProxyProvider.h
     33    platform/graphics/texmap/TextureMapperTile.h
     34    platform/graphics/texmap/TextureMapperTiledBackingStore.h
     35)
     36
    1737if (USE_TEXTURE_MAPPER_GL)
    1838    list(APPEND WebCore_SOURCES
    … …  
    2646
    2747if (USE_COORDINATED_GRAPHICS)
    28     list(APPEND WebCore_INCLUDE_DIRECTORIES
     48    list(APPEND WebCore_PRIVATE_INCLUDE_DIRECTORIES
    2949        "${WEBCORE_DIR}/page/scrolling/nicosia"
    3050        "${WEBCORE_DIR}/platform/graphics/texmap/coordinated"
    … …  
    3959        platform/graphics/texmap/coordinated/TiledBackingStore.cpp
    4060    )
     61    list(APPEND WebCore_PRIVATE_FRAMEWORK_HEADERS
     62        platform/graphics/texmap/coordinated/CoordinatedBackingStore.h
     63        platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.h
     64        platform/graphics/texmap/coordinated/CoordinatedGraphicsState.h
     65        platform/graphics/texmap/coordinated/SurfaceUpdateInfo.h
     66        platform/graphics/texmap/coordinated/Tile.h
     67        platform/graphics/texmap/coordinated/TiledBackingStore.h
     68        platform/graphics/texmap/coordinated/TiledBackingStoreClient.h
     69    )
    4170
    4271    # FIXME: Move this into Nicosia.cmake once the component is set for long-term use.
    43     list(APPEND WebCore_INCLUDE_DIRECTORIES
     72    list(APPEND WebCore_PRIVATE_INCLUDE_DIRECTORIES
    4473        "${WEBCORE_DIR}/platform/graphics/nicosia"
    4574        "${WEBCORE_DIR}/platform/graphics/nicosia/cairo"
    … …  
    6493        platform/graphics/nicosia/texmap/NicosiaImageBackingTextureMapperImpl.cpp
    6594    )
     95    list(APPEND WebCore_PRIVATE_FRAMEWORK_HEADERS
     96        page/scrolling/nicosia/ScrollingTreeFixedNode.h
     97        page/scrolling/nicosia/ScrollingTreeStickyNode.h
     98
     99        platform/graphics/nicosia/NicosiaBuffer.h
     100        platform/graphics/nicosia/NicosiaPaintingEngine.h
     101        platform/graphics/nicosia/NicosiaPlatformLayer.h
     102        platform/graphics/nicosia/NicosiaScene.h
     103
     104        platform/graphics/nicosia/texmap/NicosiaBackingStoreTextureMapperImpl.h
     105        platform/graphics/nicosia/texmap/NicosiaCompositionLayerTextureMapperImpl.h
     106        platform/graphics/nicosia/texmap/NicosiaContentLayerTextureMapperImpl.h
     107        platform/graphics/nicosia/texmap/NicosiaImageBackingTextureMapperImpl.h
     108    )
    66109else ()
    67110    list(APPEND WebCore_SOURCES

  • trunk/Source/WebKit/CMakeLists.txt

    r244245 r244443  
    22
    33set_property(DIRECTORY . PROPERTY FOLDER "WebKit")
     4
     5set(WebKit_PRIVATE_INCLUDE_DIRECTORIES
     6    "${CMAKE_BINARY_DIR}"
     7)
    48
    59set(WebKit_INCLUDE_DIRECTORIES

  • trunk/Source/WebKit/ChangeLog

    r244441 r244443  
     12019-04-18  Don Olmstead  <don.olmstead@sony.com>
     2
     3        [CMake] Make WebCore headers copies
     4        https://bugs.webkit.org/show_bug.cgi?id=182512
     5        <rdar://problem/37510435>
     6
     7        Reviewed by Alex Christensen.
     8
     9        WebCore now uses WebCore_PRIVATE_INCLUDE_DIRECTORIES for all ports. This revealed
     10        problems with WebKit's usage of WebCore headers. All include directories directly
     11        referencing the WebCore source tree we're removed from the CMake files. Any includes
     12        of WebCore headers using "*.h" were modified to <WebCore/*.h>
     13
     14        Removed generation of forwarding headers for WebCore using the perl script.
     15
     16        * CMakeLists.txt:
     17        * NetworkProcess/curl/NetworkDataTaskCurl.h:
     18        * PlatformWPE.cmake:
     19        * PlatformWin.cmake:
     20        * Scripts/generate-forwarding-headers.pl:
     21        * UIProcess/API/glib/WebKitUserContentFilterStore.cpp:
     22        * UIProcess/API/wpe/WebKitColorPrivate.h:
     23        * UIProcess/WebsiteData/win/WebsiteDataStoreWin.cpp:
     24        * UIProcess/win/PageClientImpl.cpp:
     25
    1262019-04-18  Chris Dumez  <cdumez@apple.com>
    227

  • trunk/Source/WebKit/NetworkProcess/curl/NetworkDataTaskCurl.h

    r243654 r244443  
    2626#pragma once
    2727
    28 #include "CurlRequestClient.h"
    2928#include "NetworkDataTask.h"
     29#include <WebCore/CurlRequestClient.h>
    3030#include <WebCore/NetworkLoadMetrics.h>
    3131#include <WebCore/ProtectionSpace.h>

  • trunk/Source/WebKit/PlatformWPE.cmake

    r243409 r244443  
    233233    "${DERIVED_SOURCES_DIR}"
    234234    "${DERIVED_SOURCES_WPE_API_DIR}"
    235     "${WEBCORE_DIR}/platform/graphics/cairo"
    236     "${WEBCORE_DIR}/platform/graphics/freetype"
    237     "${WEBCORE_DIR}/platform/graphics/opentype"
    238     "${WEBCORE_DIR}/platform/graphics/texmap/coordinated"
    239     "${WEBCORE_DIR}/platform/network/soup"
    240235    "${WEBKIT_DIR}/NetworkProcess/CustomProtocols/soup"
    241236    "${WEBKIT_DIR}/NetworkProcess/soup"

  • trunk/Source/WebKit/PlatformWin.cmake

    r244245 r244443  
    175175
    176176    list(APPEND WebKit_INCLUDE_DIRECTORIES
    177         "${WEBCORE_DIR}/platform/network/curl"
    178177        "${WEBKIT_DIR}/NetworkProcess/curl"
    179178        "${WEBKIT_DIR}/WebProcess/WebCoreSupport/curl"

  • trunk/Source/WebKit/Scripts/generate-forwarding-headers.pl

    r228451 r244443  
    3838my $srcRoot = realpath(File::Spec->catfile(dirname(abs_path($0)), "../.."));
    3939my @platformPrefixes = ("ca", "cf", "cocoa", "Cocoa", "curl", "gtk", "ios", "mac", "soup", "win", "wpe");
    40 my @frameworks = ("WebCore", "WebKit");
     40my @frameworks = ("WebKit");
    4141my @skippedPrefixes = ("PAL");
    4242my @frameworkHeaders;

  • trunk/Source/WebKit/UIProcess/API/glib/WebKitUserContentFilterStore.cpp

    r241790 r244443  
    2929#include "APIContentRuleList.h"
    3030#include "APIContentRuleListStore.h"
    31 #include "ContentExtensionError.h"
    3231#include "WebKitError.h"
    3332#include "WebKitUserContent.h"
    3433#include "WebKitUserContentPrivate.h"
     34#include <WebCore/ContentExtensionError.h>
    3535#include <glib/gi18n-lib.h>
    3636#include <wtf/CompletionHandler.h>

  • trunk/Source/WebKit/UIProcess/API/wpe/WebKitColorPrivate.h

    r242082 r244443  
    2020#pragma once
    2121
    22 #include "Color.h"
    2322#include "WebKitColor.h"
     23#include <WebCore/Color.h>
    2424
    2525void webkitColorFillFromWebCoreColor(const WebCore::Color&, WebKitColor*);

  • trunk/Source/WebKit/UIProcess/WebsiteData/win/WebsiteDataStoreWin.cpp

    r230982 r244443  
    2727#include "WebsiteDataStore.h"
    2828
    29 #include "NotImplemented.h"
     29#include <WebCore/NotImplemented.h>
    3030
    3131namespace WebKit {

  • trunk/Source/WebKit/UIProcess/win/PageClientImpl.cpp

    r243847 r244443  
    2929
    3030#include "DrawingAreaProxyCoordinatedGraphics.h"
    31 #include "NotImplemented.h"
    3231#include "WebContextMenuProxyWin.h"
    3332#include "WebPageProxy.h"
    … …  
    3534#include "WebView.h"
    3635#include <WebCore/DOMPasteAccess.h>
     36#include <WebCore/NotImplemented.h>
    3737
    3838namespace WebKit {

  • trunk/Source/WebKitLegacy/CMakeLists.txt

    r244065 r244443  
    4646WEBKIT_FRAMEWORK(WebKitLegacy)
    4747
    48 add_dependencies(WebKitLegacy WebCore)
     48add_dependencies(WebKitLegacy WebCore WebCorePrivateFrameworkHeaders)
    4949if (TARGET WebKitLegacyGUID)
    5050    add_dependencies(WebKitLegacy WebKitLegacyGUID)

  • trunk/Source/WebKitLegacy/ChangeLog

    r244432 r244443  
     12019-04-18  Don Olmstead  <don.olmstead@sony.com>
     2
     3        [CMake] Make WebCore headers copies
     4        https://bugs.webkit.org/show_bug.cgi?id=182512
     5        <rdar://problem/37510435>
     6
     7        Reviewed by Alex Christensen.
     8
     9        Added WebCorePrivateFrameworkHeaders as a dependency of WebKitLegacy for all
     10        ports.
     11
     12        WebCore now uses WebCore_PRIVATE_INCLUDE_DIRECTORIES for all ports. This revealed
     13        problems with WebKit's usage of WebCore headers. All include directories directly
     14        referencing the WebCore source tree we're removed from the CMake files.
     15
     16        * CMakeLists.txt:
     17        * PlatformWin.cmake:
     18
    1192019-04-18  Keith Rollin  <krollin@apple.com>
    220

  • trunk/Source/WebKitLegacy/PlatformWin.cmake

    r244065 r244443  
    44        ${CAIRO_INCLUDE_DIRS}
    55        "${WEBKIT_LIBRARIES_DIR}/include"
    6         "${WEBCORE_DIR}/platform/graphics/cairo"
    76    )
    87    list(APPEND WebKitLegacy_SOURCES_Classes

  • trunk/Tools/ChangeLog

    r244439 r244443  
     12019-04-18  Don Olmstead  <don.olmstead@sony.com>
     2
     3        [CMake] Make WebCore headers copies
     4        https://bugs.webkit.org/show_bug.cgi?id=182512
     5        <rdar://problem/37510435>
     6
     7        Reviewed by Alex Christensen.
     8
     9        Added WebCorePrivateFrameworkHeaders as a dependency of TestWebKitAPI for all
     10        ports.
     11
     12        WebCore now uses WebCore_PRIVATE_INCLUDE_DIRECTORIES for all ports. Any includes
     13        of WebCore headers using "*.h" were modified to <WebCore/*.h>
     14
     15        * DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt:
     16        * DumpRenderTree/TestNetscapePlugIn/ForwardingHeaders/WebKit/npapi.h:
     17        * DumpRenderTree/TestNetscapePlugIn/ForwardingHeaders/WebKit/npfunctions.h:
     18        * DumpRenderTree/TestNetscapePlugIn/ForwardingHeaders/WebKit/npruntime.h:
     19        * TestWebKitAPI/CMakeLists.txt:
     20        * TestWebKitAPI/PlatformWin.cmake:
     21        * TestWebKitAPI/Tests/WebCore/AbortableTaskQueue.cpp:
     22        * TestWebKitAPI/Tests/WebCore/gstreamer/GstMappedBuffer.cpp:
     23        * WebKitTestRunner/win/PlatformWebViewWin.cpp:
     24
    1252019-04-18  Jer Noble  <jer.noble@apple.com>
    226

  • trunk/Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt

    r228451 r244443  
    3333    ${WEBKIT_TESTNETSCAPEPLUGIN_DIR}
    3434    ${WEBKIT_TESTNETSCAPEPLUGIN_DIR}/ForwardingHeaders
    35     ${WEBCORE_DIR}
     35    ${WebCore_PRIVATE_FRAMEWORK_HEADERS_DIR}
    3636    ${WTF_DIR}
    3737)
    … …  
    6262add_library(TestNetscapePlugIn SHARED ${WebKitTestNetscapePlugIn_SOURCES})
    6363target_link_libraries(TestNetscapePlugIn ${WebKitTestNetscapePlugIn_LIBRARIES})
     64add_dependencies(TestNetscapePlugIn WebCorePrivateFrameworkHeaders)
    6465set_target_properties(TestNetscapePlugIn PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/plugins)
    6566

  • trunk/Tools/DumpRenderTree/TestNetscapePlugIn/ForwardingHeaders/WebKit/npapi.h

    r228451 r244443  
    1 #include <plugins/npapi.h>
     1#include <WebCore/npapi.h>

  • trunk/Tools/DumpRenderTree/TestNetscapePlugIn/ForwardingHeaders/WebKit/npfunctions.h

    r228451 r244443  
    1 #include <plugins/npfunctions.h>
     1#include <WebCore/npfunctions.h>

  • trunk/Tools/DumpRenderTree/TestNetscapePlugIn/ForwardingHeaders/WebKit/npruntime.h

    r228451 r244443  
    1 #include <plugins/npruntime.h>
     1#include <WebCore/npruntime.h>

  • trunk/Tools/TestWebKitAPI/CMakeLists.txt

    r244065 r244443  
    2222
    2323if (ENABLE_WEBCORE)
    24     list(APPEND TestWebKitAPI_DEPENDENCIES PALFrameworkHeaders)
     24    list(APPEND TestWebKitAPI_DEPENDENCIES
     25        PALFrameworkHeaders
     26        WebCorePrivateFrameworkHeaders
     27    )
    2528endif ()
    2629

  • trunk/Tools/TestWebKitAPI/PlatformWin.cmake

    r244065 r244443  
    108108endif ()
    109109
    110 list(APPEND TestWebKitAPI_DEPENDENCIES WebCorePrivateFrameworkHeaders)
    111110if (ENABLE_WEBKIT)
    112111    list(APPEND TestWebKitAPI_DEPENDENCIES WebKitFrameworkHeaders)

  • trunk/Tools/TestWebKitAPI/Tests/WebCore/AbortableTaskQueue.cpp

    r239427 r244443  
    2727#include "config.h"
    2828
    29 #include <AbortableTaskQueue.h>
    30 #include <Utilities.h>
     29#include "Utilities.h"
     30#include <WebCore/AbortableTaskQueue.h>
    3131#include <wtf/Threading.h>
    3232

  • trunk/Tools/TestWebKitAPI/Tests/WebCore/gstreamer/GstMappedBuffer.cpp

    r239921 r244443  
    3030
    3131#include "GStreamerTest.h"
    32 #include "SharedBuffer.h"
    3332#include "Test.h"
    3433#include <WebCore/GStreamerCommon.h>
     34#include <WebCore/SharedBuffer.h>
    3535
    3636using namespace WebCore;

  • trunk/Tools/WebKitTestRunner/win/PlatformWebViewWin.cpp

    r242842 r244443  
    3030#include "PlatformWebView.h"
    3131
    32 #include <HWndDC.h>
     32#include <WebCore/HWndDC.h>
    3333#include <cairo.h>
    3434#include <cstdio>
Note: See TracChangeset for help on using the changeset viewer.