Changeset 244541 in webkit


Ignore:
Timestamp:
Apr 23, 2019 8:55:00 AM (5 years ago)
Author:
don.olmstead@sony.com
Message:

[CMake][Win] Use target oriented design for WebKit
​https://bugs.webkit.org/show_bug.cgi?id=197173

Reviewed by Alex Christensen.

.:

Override WebKit_DERIVED_SOUCES_DIR within WinCairo in support of a target
oriented design.

  • Source/cmake/OptionsWinCairo.cmake:

Source/WebKit:

Enumerate public framework headers for WinCairo's WebKit implementation and copy them.
Migrate to use WebKit_DERIVED_SOURCES_DIR.

  • CMakeLists.txt:
  • PlatformGTK.cmake:
  • PlatformWPE.cmake:
  • PlatformWin.cmake:

Tools:

  • TestWebKitAPI/PlatformWin.cmake: Add WebKitFrameworkHeaders as a dependency.
  • TestWebKitAPI/Tests/WebKit/curl/Certificates.cpp: Remove unused header.
Location:
trunk
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r244488 r244541  
     12019-04-23  Don Olmstead  <don.olmstead@sony.com>
     2
     3        [CMake][Win] Use target oriented design for WebKit
     4        https://bugs.webkit.org/show_bug.cgi?id=197173
     5
     6        Reviewed by Alex Christensen.
     7
     8        Override WebKit_DERIVED_SOUCES_DIR within WinCairo in support of a target
     9        oriented design.
     10
     11        * Source/cmake/OptionsWinCairo.cmake:
     12
    1132019-04-20  Don Olmstead  <don.olmstead@sony.com>
    214

  • trunk/Source/WebKit/CMakeLists.txt

    r244443 r244541  
    1010    "${WebCore_PRIVATE_FRAMEWORK_HEADERS_DIR}"
    1111    "${WebKit_FRAMEWORK_HEADERS_DIR}"
     12    "${WebKit_DERIVED_SOURCES_DIR}"
     13    "${WebKit_DERIVED_SOURCES_DIR}/include"
    1214    "${WEBKIT_DIR}"
    1315    "${WEBKIT_DIR}/NetworkProcess"
    … …  
    9193    "${WEBKIT_DIR}/WebProcess/WebPage/RemoteLayerTree"
    9294    "${WEBKIT_DIR}/WebProcess/WebStorage"
    93     "${DERIVED_SOURCES_WEBKIT_DIR}"
    94     "${DERIVED_SOURCES_WEBKIT_DIR}/include"
    9595    "${CMAKE_SOURCE_DIR}/Source"
    9696    "${CMAKE_SOURCE_DIR}/WebKitLibraries"
    … …  
    319319        get_filename_component(_name ${_file} NAME_WE)
    320320        add_custom_command(
    321             OUTPUT ${DERIVED_SOURCES_WEBKIT_DIR}/${_name}MessageReceiver.cpp ${DERIVED_SOURCES_WEBKIT_DIR}/${_name}Messages.h
     321            OUTPUT ${WebKit_DERIVED_SOURCES_DIR}/${_name}MessageReceiver.cpp ${WebKit_DERIVED_SOURCES_DIR}/${_name}Messages.h
    322322            MAIN_DEPENDENCY ${_file}
    323323            DEPENDS ${WEBKIT_DIR}/Scripts/webkit/__init__.py
    … …  
    325325                    ${WEBKIT_DIR}/Scripts/webkit/model.py
    326326                    ${WEBKIT_DIR}/Scripts/webkit/parser.py
    327             COMMAND ${PYTHON_EXECUTABLE} ${WEBKIT_DIR}/Scripts/generate-message-receiver.py ${_file} > ${DERIVED_SOURCES_WEBKIT_DIR}/${_name}MessageReceiver.cpp
    328             COMMAND ${PYTHON_EXECUTABLE} ${WEBKIT_DIR}/Scripts/generate-messages-header.py ${_file} > ${DERIVED_SOURCES_WEBKIT_DIR}/${_name}Messages.h
     327            COMMAND ${PYTHON_EXECUTABLE} ${WEBKIT_DIR}/Scripts/generate-message-receiver.py ${_file} > ${WebKit_DERIVED_SOURCES_DIR}/${_name}MessageReceiver.cpp
     328            COMMAND ${PYTHON_EXECUTABLE} ${WEBKIT_DIR}/Scripts/generate-messages-header.py ${_file} > ${WebKit_DERIVED_SOURCES_DIR}/${_name}Messages.h
    329329            WORKING_DIRECTORY ${WEBKIT_DIR}
    330330            VERBATIM)
    331331
    332         list(APPEND ${_output_source} ${DERIVED_SOURCES_WEBKIT_DIR}/${_name}MessageReceiver.cpp)
     332        list(APPEND ${_output_source} ${WebKit_DERIVED_SOURCES_DIR}/${_name}MessageReceiver.cpp)
    333333    endforeach ()
    334334endmacro()
    … …  
    355355
    356356add_custom_command(
    357     OUTPUT ${DERIVED_SOURCES_WEBKIT_DIR}/AutomationBackendDispatchers.h ${DERIVED_SOURCES_WEBKIT_DIR}/AutomationBackendDispatchers.cpp ${DERIVED_SOURCES_WEBKIT_DIR}/AutomationProtocolObjects.h ${DERIVED_SOURCES_WEBKIT_DIR}/AutomationProtocolObjects.cpp ${DERIVED_SOURCES_WEBKIT_DIR}/AutomationFrontendDispatchers.h ${DERIVED_SOURCES_WEBKIT_DIR}/AutomationFrontendDispatchers.cpp
     357    OUTPUT ${WebKit_DERIVED_SOURCES_DIR}/AutomationBackendDispatchers.h ${WebKit_DERIVED_SOURCES_DIR}/AutomationBackendDispatchers.cpp ${WebKit_DERIVED_SOURCES_DIR}/AutomationProtocolObjects.h ${WebKit_DERIVED_SOURCES_DIR}/AutomationProtocolObjects.cpp ${WebKit_DERIVED_SOURCES_DIR}/AutomationFrontendDispatchers.h ${WebKit_DERIVED_SOURCES_DIR}/AutomationFrontendDispatchers.cpp
    358358    MAIN_DEPENDENCY ${WebKit_AUTOMATION_PROTOCOL_GENERATOR_INPUTS}
    359359    DEPENDS ${WebKit_AUTOMATION_PROTOCOL_GENERATOR_SCRIPTS}
    360     COMMAND ${PYTHON_EXECUTABLE} ${PROTOCOL_GENERATOR_SCRIPTS_DIR}/generate-inspector-protocol-bindings.py --outputDir "${DERIVED_SOURCES_WEBKIT_DIR}" --framework WebKit ${WebKit_AUTOMATION_PROTOCOL_GENERATOR_EXTRA_FLAGS} --backend ${WebKit_AUTOMATION_PROTOCOL_GENERATOR_INPUTS}
     360    COMMAND ${PYTHON_EXECUTABLE} ${PROTOCOL_GENERATOR_SCRIPTS_DIR}/generate-inspector-protocol-bindings.py --outputDir "${WebKit_DERIVED_SOURCES_DIR}" --framework WebKit ${WebKit_AUTOMATION_PROTOCOL_GENERATOR_EXTRA_FLAGS} --backend ${WebKit_AUTOMATION_PROTOCOL_GENERATOR_INPUTS}
    361361    VERBATIM)
    362362
    363363list(APPEND WebKit_HEADERS
    364     ${DERIVED_SOURCES_WEBKIT_DIR}/AutomationBackendDispatchers.h
    365     ${DERIVED_SOURCES_WEBKIT_DIR}/AutomationFrontendDispatchers.h
    366     ${DERIVED_SOURCES_WEBKIT_DIR}/AutomationProtocolObjects.h
     364    ${WebKit_DERIVED_SOURCES_DIR}/AutomationBackendDispatchers.h
     365    ${WebKit_DERIVED_SOURCES_DIR}/AutomationFrontendDispatchers.h
     366    ${WebKit_DERIVED_SOURCES_DIR}/AutomationProtocolObjects.h
    367367)
    368368
    369369list(APPEND WebKit_SOURCES
    370     ${DERIVED_SOURCES_WEBKIT_DIR}/AutomationBackendDispatchers.cpp
    371     ${DERIVED_SOURCES_WEBKIT_DIR}/AutomationFrontendDispatchers.cpp
    372     ${DERIVED_SOURCES_WEBKIT_DIR}/AutomationProtocolObjects.cpp
     370    ${WebKit_DERIVED_SOURCES_DIR}/AutomationBackendDispatchers.cpp
     371    ${WebKit_DERIVED_SOURCES_DIR}/AutomationFrontendDispatchers.cpp
     372    ${WebKit_DERIVED_SOURCES_DIR}/AutomationProtocolObjects.cpp
    373373)
    374374
    375375add_custom_command(
    376     OUTPUT ${DERIVED_SOURCES_WEBKIT_DIR}/WebAutomationSessionProxyScriptSource.h ${DERIVED_SOURCES_WEBKIT_DIR}/WebAutomationSessionProxy.min.js
     376    OUTPUT ${WebKit_DERIVED_SOURCES_DIR}/WebAutomationSessionProxyScriptSource.h ${WebKit_DERIVED_SOURCES_DIR}/WebAutomationSessionProxy.min.js
    377377    MAIN_DEPENDENCY ${WEBKIT_DIR}/WebProcess/Automation/WebAutomationSessionProxy.js
    378378    DEPENDS ${JavaScriptCore_SCRIPTS_DIR}/xxd.pl ${JavaScriptCore_SCRIPTS_DIR}/jsmin.py
    379     COMMAND ${CMAKE_COMMAND} -E echo "//# sourceURL=__InjectedScript_WebAutomationSessionProxy.js" > ${DERIVED_SOURCES_WEBKIT_DIR}/WebAutomationSessionProxy.min.js
    380     COMMAND ${PYTHON_EXECUTABLE} ${JavaScriptCore_SCRIPTS_DIR}/jsmin.py < ${WEBKIT_DIR}/WebProcess/Automation/WebAutomationSessionProxy.js >> ${DERIVED_SOURCES_WEBKIT_DIR}/WebAutomationSessionProxy.min.js
    381     COMMAND ${PERL_EXECUTABLE} ${JavaScriptCore_SCRIPTS_DIR}/xxd.pl WebAutomationSessionProxyScriptSource ${DERIVED_SOURCES_WEBKIT_DIR}/WebAutomationSessionProxy.min.js ${DERIVED_SOURCES_WEBKIT_DIR}/WebAutomationSessionProxyScriptSource.h
     379    COMMAND ${CMAKE_COMMAND} -E echo "//# sourceURL=__InjectedScript_WebAutomationSessionProxy.js" > ${WebKit_DERIVED_SOURCES_DIR}/WebAutomationSessionProxy.min.js
     380    COMMAND ${PYTHON_EXECUTABLE} ${JavaScriptCore_SCRIPTS_DIR}/jsmin.py < ${WEBKIT_DIR}/WebProcess/Automation/WebAutomationSessionProxy.js >> ${WebKit_DERIVED_SOURCES_DIR}/WebAutomationSessionProxy.min.js
     381    COMMAND ${PERL_EXECUTABLE} ${JavaScriptCore_SCRIPTS_DIR}/xxd.pl WebAutomationSessionProxyScriptSource ${WebKit_DERIVED_SOURCES_DIR}/WebAutomationSessionProxy.min.js ${WebKit_DERIVED_SOURCES_DIR}/WebAutomationSessionProxyScriptSource.h
    382382    VERBATIM)
    383383
    384384list(APPEND WebKit_HEADERS
    385     ${DERIVED_SOURCES_WEBKIT_DIR}/WebAutomationSessionProxyScriptSource.h
     385    ${WebKit_DERIVED_SOURCES_DIR}/WebAutomationSessionProxyScriptSource.h
    386386)
    387387
    … …  
    397397
    398398add_custom_command(
    399     OUTPUT ${DERIVED_SOURCES_WEBKIT_DIR}/WebPageUpdatePreferences.cpp ${DERIVED_SOURCES_WEBKIT_DIR}/WebPreferencesDefinitions.h ${DERIVED_SOURCES_WEBKIT_DIR}/WebPreferencesExperimentalFeatures.cpp ${DERIVED_SOURCES_WEBKIT_DIR}/WebPreferencesInternalDebugFeatures.cpp ${DERIVED_SOURCES_WEBKIT_DIR}/WebPreferencesKeys.cpp ${DERIVED_SOURCES_WEBKIT_DIR}/WebPreferencesKeys.h ${DERIVED_SOURCES_WEBKIT_DIR}/WebPreferencesStoreDefaultsMap.cpp
     399    OUTPUT ${WebKit_DERIVED_SOURCES_DIR}/WebPageUpdatePreferences.cpp ${WebKit_DERIVED_SOURCES_DIR}/WebPreferencesDefinitions.h ${WebKit_DERIVED_SOURCES_DIR}/WebPreferencesExperimentalFeatures.cpp ${WebKit_DERIVED_SOURCES_DIR}/WebPreferencesInternalDebugFeatures.cpp ${WebKit_DERIVED_SOURCES_DIR}/WebPreferencesKeys.cpp ${WebKit_DERIVED_SOURCES_DIR}/WebPreferencesKeys.h ${WebKit_DERIVED_SOURCES_DIR}/WebPreferencesStoreDefaultsMap.cpp
    400400    MAIN_DEPENDENCY ${WEBKIT_DIR}/Shared/WebPreferences.yaml
    401401    DEPENDS ${WebKit_WEB_PREFERENCES_TEMPLATES}
    402     COMMAND ${RUBY_EXECUTABLE} ${WEBKIT_DIR}/Scripts/GeneratePreferences.rb --input ${WEBKIT_DIR}/Shared/WebPreferences.yaml --outputDir "${DERIVED_SOURCES_WEBKIT_DIR}"
     402    COMMAND ${RUBY_EXECUTABLE} ${WEBKIT_DIR}/Scripts/GeneratePreferences.rb --input ${WEBKIT_DIR}/Shared/WebPreferences.yaml --outputDir "${WebKit_DERIVED_SOURCES_DIR}"
    403403    VERBATIM)
    404404
    405405list(APPEND WebKit_HEADERS
    406     ${DERIVED_SOURCES_WEBKIT_DIR}/WebPreferencesDefinitions.h
    407     ${DERIVED_SOURCES_WEBKIT_DIR}/WebPreferencesKeys.h
     406    ${WebKit_DERIVED_SOURCES_DIR}/WebPreferencesDefinitions.h
     407    ${WebKit_DERIVED_SOURCES_DIR}/WebPreferencesKeys.h
    408408)
    409409
    410410list(APPEND WebKit_SOURCES
    411     ${DERIVED_SOURCES_WEBKIT_DIR}/WebPageUpdatePreferences.cpp
    412     ${DERIVED_SOURCES_WEBKIT_DIR}/WebPreferencesExperimentalFeatures.cpp
    413     ${DERIVED_SOURCES_WEBKIT_DIR}/WebPreferencesInternalDebugFeatures.cpp
    414     ${DERIVED_SOURCES_WEBKIT_DIR}/WebPreferencesKeys.cpp
    415     ${DERIVED_SOURCES_WEBKIT_DIR}/WebPreferencesStoreDefaultsMap.cpp
     411    ${WebKit_DERIVED_SOURCES_DIR}/WebPageUpdatePreferences.cpp
     412    ${WebKit_DERIVED_SOURCES_DIR}/WebPreferencesExperimentalFeatures.cpp
     413    ${WebKit_DERIVED_SOURCES_DIR}/WebPreferencesInternalDebugFeatures.cpp
     414    ${WebKit_DERIVED_SOURCES_DIR}/WebPreferencesKeys.cpp
     415    ${WebKit_DERIVED_SOURCES_DIR}/WebPreferencesStoreDefaultsMap.cpp
    416416)
    417417

  • trunk/Source/WebKit/ChangeLog

    r244540 r244541  
     12019-04-23  Don Olmstead  <don.olmstead@sony.com>
     2
     3        [CMake][Win] Use target oriented design for WebKit
     4        https://bugs.webkit.org/show_bug.cgi?id=197173
     5
     6        Reviewed by Alex Christensen.
     7
     8        Enumerate public framework headers for WinCairo's WebKit implementation and copy them.
     9        Migrate to use WebKit_DERIVED_SOURCES_DIR.
     10
     11        * CMakeLists.txt:
     12        * PlatformGTK.cmake:
     13        * PlatformWPE.cmake:
     14        * PlatformWin.cmake:
     15
    1162019-04-23  Chris Dumez  <cdumez@apple.com>
    217

  • trunk/Source/WebKit/PlatformGTK.cmake

    r243409 r244541  
    650650        WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp
    651651
    652         ${DERIVED_SOURCES_WEBKIT_DIR}/AuxiliaryProcessMessageReceiver.cpp
    653         ${DERIVED_SOURCES_WEBKIT_DIR}/PluginControllerProxyMessageReceiver.cpp
    654         ${DERIVED_SOURCES_WEBKIT_DIR}/PluginProcessMessageReceiver.cpp
    655         ${DERIVED_SOURCES_WEBKIT_DIR}/NPObjectMessageReceiverMessageReceiver.cpp
    656         ${DERIVED_SOURCES_WEBKIT_DIR}/WebProcessConnectionMessageReceiver.cpp
     652        ${WebKit_DERIVED_SOURCES_DIR}/AuxiliaryProcessMessageReceiver.cpp
     653        ${WebKit_DERIVED_SOURCES_DIR}/PluginControllerProxyMessageReceiver.cpp
     654        ${WebKit_DERIVED_SOURCES_DIR}/PluginProcessMessageReceiver.cpp
     655        ${WebKit_DERIVED_SOURCES_DIR}/NPObjectMessageReceiverMessageReceiver.cpp
     656        ${WebKit_DERIVED_SOURCES_DIR}/WebProcessConnectionMessageReceiver.cpp
    657657    )
    658658

  • trunk/Source/WebKit/PlatformWPE.cmake

    r244443 r244541  
    8383
    8484list(APPEND WebKit_DERIVED_SOURCES
    85     ${DERIVED_SOURCES_WEBKIT_DIR}/WebKitResourcesGResourceBundle.c
     85    ${WebKit_DERIVED_SOURCES_DIR}/WebKitResourcesGResourceBundle.c
    8686
    8787    ${DERIVED_SOURCES_WPE_API_DIR}/WebKitEnumTypes.cpp
    … …  
    207207endif ()
    208208
    209 file(WRITE ${DERIVED_SOURCES_WEBKIT_DIR}/WebKitResourcesGResourceBundle.xml
     209file(WRITE ${WebKit_DERIVED_SOURCES_DIR}/WebKitResourcesGResourceBundle.xml
    210210    "<?xml version=1.0 encoding=UTF-8?>\n"
    211211    "<gresources>\n"
    … …  
    217217
    218218add_custom_command(
    219     OUTPUT ${DERIVED_SOURCES_WEBKIT_DIR}/WebKitResourcesGResourceBundle.c
    220     DEPENDS ${DERIVED_SOURCES_WEBKIT_DIR}/WebKitResourcesGResourceBundle.xml
    221     COMMAND glib-compile-resources --generate --sourcedir=${CMAKE_SOURCE_DIR}/Source/WebCore/Resources --sourcedir=${CMAKE_SOURCE_DIR}/Source/WebCore/platform/audio/resources --target=${DERIVED_SOURCES_WEBKIT_DIR}/WebKitResourcesGResourceBundle.c ${DERIVED_SOURCES_WEBKIT_DIR}/WebKitResourcesGResourceBundle.xml
     219    OUTPUT ${WebKit_DERIVED_SOURCES_DIR}/WebKitResourcesGResourceBundle.c
     220    DEPENDS ${WebKit_DERIVED_SOURCES_DIR}/WebKitResourcesGResourceBundle.xml
     221    COMMAND glib-compile-resources --generate --sourcedir=${CMAKE_SOURCE_DIR}/Source/WebCore/Resources --sourcedir=${CMAKE_SOURCE_DIR}/Source/WebCore/platform/audio/resources --target=${WebKit_DERIVED_SOURCES_DIR}/WebKitResourcesGResourceBundle.c ${WebKit_DERIVED_SOURCES_DIR}/WebKitResourcesGResourceBundle.xml
    222222    VERBATIM
    223223)

  • trunk/Source/WebKit/PlatformWin.cmake

    r244443 r244541  
    33set(WebKit_NetworkProcess_OUTPUT_NAME WebKitNetworkProcess)
    44set(WebKit_PluginProcess_OUTPUT_NAME WebKitPluginProcess)
    5 
    6 file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKIT_DIR})
    75
    86add_definitions(-DBUILDING_WEBKIT)
    … …  
    193191WEBKIT_WRAP_SOURCELIST(${WebKit_SOURCES})
    194192
     193# Temporarily list out shared headers here
     194set(WebKit_PUBLIC_FRAMEWORK_HEADERS
     195    Shared/API/c/WKArray.h
     196    Shared/API/c/WKBase.h
     197    Shared/API/c/WKCertificateInfo.h
     198    Shared/API/c/WKConnectionRef.h
     199    Shared/API/c/WKContextMenuItem.h
     200    Shared/API/c/WKContextMenuItemTypes.h
     201    Shared/API/c/WKData.h
     202    Shared/API/c/WKDeclarationSpecifiers.h
     203    Shared/API/c/WKDeprecated.h
     204    Shared/API/c/WKDiagnosticLoggingResultType.h
     205    Shared/API/c/WKDictionary.h
     206    Shared/API/c/WKErrorRef.h
     207    Shared/API/c/WKEvent.h
     208    Shared/API/c/WKFindOptions.h
     209    Shared/API/c/WKGeometry.h
     210    Shared/API/c/WKImage.h
     211    Shared/API/c/WKMutableArray.h
     212    Shared/API/c/WKMutableDictionary.h
     213    Shared/API/c/WKNumber.h
     214    Shared/API/c/WKPageLoadTypes.h
     215    Shared/API/c/WKPageLoadTypesPrivate.h
     216    Shared/API/c/WKPageVisibilityTypes.h
     217    Shared/API/c/WKPluginInformation.h
     218    Shared/API/c/WKSecurityOriginRef.h
     219    Shared/API/c/WKSerializedScriptValue.h
     220    Shared/API/c/WKString.h
     221    Shared/API/c/WKStringPrivate.h
     222    Shared/API/c/WKType.h
     223    Shared/API/c/WKURL.h
     224    Shared/API/c/WKURLRequest.h
     225    Shared/API/c/WKURLResponse.h
     226    Shared/API/c/WKUserContentInjectedFrames.h
     227    Shared/API/c/WKUserScriptInjectionTime.h
     228
     229    UIProcess/API/C/WKAuthenticationChallenge.h
     230    UIProcess/API/C/WKAuthenticationDecisionListener.h
     231    UIProcess/API/C/WKBackForwardListItemRef.h
     232    UIProcess/API/C/WKBackForwardListRef.h
     233    UIProcess/API/C/WKContext.h
     234    UIProcess/API/C/WKContextConfigurationRef.h
     235    UIProcess/API/C/WKContextConnectionClient.h
     236    UIProcess/API/C/WKContextDownloadClient.h
     237    UIProcess/API/C/WKContextHistoryClient.h
     238    UIProcess/API/C/WKContextInjectedBundleClient.h
     239    UIProcess/API/C/WKContextPrivate.h
     240    UIProcess/API/C/WKCookieManager.h
     241    UIProcess/API/C/WKCredential.h
     242    UIProcess/API/C/WKCredentialTypes.h
     243    UIProcess/API/C/WKDownload.h
     244    UIProcess/API/C/WKFormSubmissionListener.h
     245    UIProcess/API/C/WKFrame.h
     246    UIProcess/API/C/WKFrameHandleRef.h
     247    UIProcess/API/C/WKFrameInfoRef.h
     248    UIProcess/API/C/WKFramePolicyListener.h
     249    UIProcess/API/C/WKGeolocationManager.h
     250    UIProcess/API/C/WKGeolocationPermissionRequest.h
     251    UIProcess/API/C/WKGeolocationPosition.h
     252    UIProcess/API/C/WKHitTestResult.h
     253    UIProcess/API/C/WKIconDatabase.h
     254    UIProcess/API/C/WKInspector.h
     255    UIProcess/API/C/WKLayoutMode.h
     256    UIProcess/API/C/WKMockDisplay.h
     257    UIProcess/API/C/WKMockMediaDevice.h
     258    UIProcess/API/C/WKNativeEvent.h
     259    UIProcess/API/C/WKNavigationActionRef.h
     260    UIProcess/API/C/WKNavigationDataRef.h
     261    UIProcess/API/C/WKNavigationRef.h
     262    UIProcess/API/C/WKNavigationResponseRef.h
     263    UIProcess/API/C/WKNotification.h
     264    UIProcess/API/C/WKNotificationManager.h
     265    UIProcess/API/C/WKNotificationPermissionRequest.h
     266    UIProcess/API/C/WKNotificationProvider.h
     267    UIProcess/API/C/WKOpenPanelParametersRef.h
     268    UIProcess/API/C/WKOpenPanelResultListener.h
     269    UIProcess/API/C/WKPage.h
     270    UIProcess/API/C/WKPageConfigurationRef.h
     271    UIProcess/API/C/WKPageContextMenuClient.h
     272    UIProcess/API/C/WKPageDiagnosticLoggingClient.h
     273    UIProcess/API/C/WKPageFindClient.h
     274    UIProcess/API/C/WKPageFindMatchesClient.h
     275    UIProcess/API/C/WKPageFormClient.h
     276    UIProcess/API/C/WKPageGroup.h
     277    UIProcess/API/C/WKPageInjectedBundleClient.h
     278    UIProcess/API/C/WKPageLoaderClient.h
     279    UIProcess/API/C/WKPageNavigationClient.h
     280    UIProcess/API/C/WKPagePolicyClient.h
     281    UIProcess/API/C/WKPagePrivate.h
     282    UIProcess/API/C/WKPageRenderingProgressEvents.h
     283    UIProcess/API/C/WKPageUIClient.h
     284    UIProcess/API/C/WKPluginLoadPolicy.h
     285    UIProcess/API/C/WKPreferencesRef.h
     286    UIProcess/API/C/WKPreferencesRefPrivate.h
     287    UIProcess/API/C/WKProcessTerminationReason.h
     288    UIProcess/API/C/WKProtectionSpace.h
     289    UIProcess/API/C/WKProtectionSpaceTypes.h
     290    UIProcess/API/C/WKResourceCacheManager.h
     291    UIProcess/API/C/WKSessionStateRef.h
     292    UIProcess/API/C/WKTestingSupport.h
     293    UIProcess/API/C/WKTextChecker.h
     294    UIProcess/API/C/WKUserContentControllerRef.h
     295    UIProcess/API/C/WKUserContentExtensionStoreRef.h
     296    UIProcess/API/C/WKUserMediaPermissionCheck.h
     297    UIProcess/API/C/WKUserMediaPermissionRequest.h
     298    UIProcess/API/C/WKUserScriptRef.h
     299    UIProcess/API/C/WKViewportAttributes.h
     300    UIProcess/API/C/WKWebsiteDataStoreRef.h
     301    UIProcess/API/C/WKWebsitePolicies.h
     302    UIProcess/API/C/WKWindowFeaturesRef.h
     303    UIProcess/API/C/WebKit2_C.h
     304
     305    UIProcess/API/cpp/WKRetainPtr.h
     306
     307    WebProcess/InjectedBundle/API/c/WKBundle.h
     308    WebProcess/InjectedBundle/API/c/WKBundleAPICast.h
     309    WebProcess/InjectedBundle/API/c/WKBundleBackForwardList.h
     310    WebProcess/InjectedBundle/API/c/WKBundleBackForwardListItem.h
     311    WebProcess/InjectedBundle/API/c/WKBundleDOMWindowExtension.h
     312    WebProcess/InjectedBundle/API/c/WKBundleFileHandleRef.h
     313    WebProcess/InjectedBundle/API/c/WKBundleFrame.h
     314    WebProcess/InjectedBundle/API/c/WKBundleFramePrivate.h
     315    WebProcess/InjectedBundle/API/c/WKBundleHitTestResult.h
     316    WebProcess/InjectedBundle/API/c/WKBundleInitialize.h
     317    WebProcess/InjectedBundle/API/c/WKBundleInspector.h
     318    WebProcess/InjectedBundle/API/c/WKBundleNavigationAction.h
     319    WebProcess/InjectedBundle/API/c/WKBundleNavigationActionPrivate.h
     320    WebProcess/InjectedBundle/API/c/WKBundleNodeHandle.h
     321    WebProcess/InjectedBundle/API/c/WKBundleNodeHandlePrivate.h
     322    WebProcess/InjectedBundle/API/c/WKBundlePage.h
     323    WebProcess/InjectedBundle/API/c/WKBundlePageBanner.h
     324    WebProcess/InjectedBundle/API/c/WKBundlePageContextMenuClient.h
     325    WebProcess/InjectedBundle/API/c/WKBundlePageEditorClient.h
     326    WebProcess/InjectedBundle/API/c/WKBundlePageFormClient.h
     327    WebProcess/InjectedBundle/API/c/WKBundlePageFullScreenClient.h
     328    WebProcess/InjectedBundle/API/c/WKBundlePageGroup.h
     329    WebProcess/InjectedBundle/API/c/WKBundlePageLoaderClient.h
     330    WebProcess/InjectedBundle/API/c/WKBundlePageOverlay.h
     331    WebProcess/InjectedBundle/API/c/WKBundlePagePolicyClient.h
     332    WebProcess/InjectedBundle/API/c/WKBundlePagePrivate.h
     333    WebProcess/InjectedBundle/API/c/WKBundlePageResourceLoadClient.h
     334    WebProcess/InjectedBundle/API/c/WKBundlePageUIClient.h
     335    WebProcess/InjectedBundle/API/c/WKBundlePrivate.h
     336    WebProcess/InjectedBundle/API/c/WKBundleRangeHandle.h
     337    WebProcess/InjectedBundle/API/c/WKBundleScriptWorld.h
     338)
     339
     340# Windows specific
     341list(APPEND WebKit_PUBLIC_FRAMEWORK_HEADERS
     342    Shared/API/c/win/WKBaseWin.h
     343
     344    UIProcess/API/C/win/WKView.h
     345)
     346
    195347set(WebKit_FORWARDING_HEADERS_DIRECTORIES
    196348    Shared/API/c
    … …  
    209361
    210362if (${WTF_PLATFORM_WIN_CAIRO})
    211     list(APPEND WebKit_FORWARDING_HEADERS_DIRECTORIES
    212         Shared/API/c/curl
    213 
    214         UIProcess/API/C/curl
     363    list(APPEND WebKit_PUBLIC_FRAMEWORK_HEADERS
     364        Shared/API/c/cairo/WKImageCairo.h
     365
     366        Shared/API/c/curl/WKCertificateInfoCurl.h
     367
     368        UIProcess/API/C/curl/WKProtectionSpaceCurl.h
     369        UIProcess/API/C/curl/WKWebsiteDataStoreRefCurl.h
    215370    )
    216371endif ()
    … …  
    219374    TARGET_NAME WebKitFrameworkHeaders
    220375    DESTINATION ${WebKit_FRAMEWORK_HEADERS_DIR}/WebKit
    221     DIRECTORIES ${WebKit_FORWARDING_HEADERS_DIRECTORIES}
     376    FILES ${WebKit_PUBLIC_FRAMEWORK_HEADERS}
    222377    FLATTENED
    223378)

  • trunk/Source/cmake/OptionsWinCairo.cmake

    r244488 r244541  
    5454set(WebCore_DERIVED_SOURCES_DIR ${CMAKE_BINARY_DIR}/WebCore/DerivedSources)
    5555set(WebKitLegacy_DERIVED_SOURCES_DIR ${CMAKE_BINARY_DIR}/WebKitLegacy/DerivedSources)
     56set(WebKit_DERIVED_SOURCES_DIR ${CMAKE_BINARY_DIR}/WebKit/DerivedSources)
    5657
    5758# Override scripts directories

  • trunk/Tools/ChangeLog

    r244540 r244541  
     12019-04-23  Don Olmstead  <don.olmstead@sony.com>
     2
     3        [CMake][Win] Use target oriented design for WebKit
     4        https://bugs.webkit.org/show_bug.cgi?id=197173
     5
     6        Reviewed by Alex Christensen.
     7
     8        * TestWebKitAPI/PlatformWin.cmake: Add WebKitFrameworkHeaders as a dependency.
     9        * TestWebKitAPI/Tests/WebKit/curl/Certificates.cpp: Remove unused header.
     10
    1112019-04-23  Chris Dumez  <cdumez@apple.com>
    212

  • trunk/Tools/TestWebKitAPI/PlatformWin.cmake

    r244443 r244541  
    218218    set_target_properties(TestWebKit PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY}/WebKit)
    219219
    220     add_dependencies(TestWebKit TestWebKitAPIBase)
     220    add_dependencies(TestWebKit TestWebKitAPIBase WebKitFrameworkHeaders)
    221221endif ()
    222222

  • trunk/Tools/TestWebKitAPI/Tests/WebKit/curl/Certificates.cpp

    r238387 r244541  
    3232#include <WebKit/WKCertificateInfoCurl.h>
    3333#include <WebKit/WKRetainPtr.h>
    34 #include <WebKit/WKSharedAPICast.h>
    35 
    36 using namespace WebCore;
    3734
    3835namespace TestWebKitAPI {
Note: See TracChangeset for help on using the changeset viewer.