[WPE] Remove the possibility of installing the old WebKit2 C API
authoraperez@igalia.com <aperez@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 11 Oct 2017 01:01:53 +0000 (01:01 +0000)
committeraperez@igalia.com <aperez@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 11 Oct 2017 01:01:53 +0000 (01:01 +0000)
https://bugs.webkit.org/show_bug.cgi?id=178125

Reviewed by Michael Catanzaro.

.:

* Source/cmake/OptionsWPE.cmake: Remove definition of the EXPORT_DEPRECATED_WEBKIT2_C_API
build option.

Source/WebKit:

* PlatformWPE.cmake: Remove support for installing the deprecated C API.

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

ChangeLog
Source/WebKit/ChangeLog
Source/WebKit/PlatformWPE.cmake
Source/cmake/OptionsWPE.cmake

index 7f0c993..eb9a7b7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2017-10-10  Adrian Perez de Castro  <aperez@igalia.com>
+
+        [WPE] Remove the possibility of installing the old WebKit2 C API
+        https://bugs.webkit.org/show_bug.cgi?id=178125
+
+        Reviewed by Michael Catanzaro.
+
+        * Source/cmake/OptionsWPE.cmake: Remove definition of the EXPORT_DEPRECATED_WEBKIT2_C_API
+        build option.
+
 2017-10-10  Michael Catanzaro  <mcatanzaro@igalia.com>
 
         [WPE] Expose ENABLE_XSLT option
index 9024db9..6c111ba 100644 (file)
@@ -1,3 +1,12 @@
+2017-10-10  Adrian Perez de Castro  <aperez@igalia.com>
+
+        [WPE] Remove the possibility of installing the old WebKit2 C API
+        https://bugs.webkit.org/show_bug.cgi?id=178125
+
+        Reviewed by Michael Catanzaro.
+
+        * PlatformWPE.cmake: Remove support for installing the deprecated C API.
+
 2017-10-10  Chris Dumez  <cdumez@apple.com>
 
         [WK2] Add API to clear service worker registrations
index 531fe51..397a35d 100644 (file)
@@ -516,123 +516,6 @@ add_library(WPEInjectedBundle MODULE "${WEBKIT_DIR}/WebProcess/InjectedBundle/AP
 ADD_WEBKIT_PREFIX_HEADER(WPEInjectedBundle)
 target_link_libraries(WPEInjectedBundle WebKit)
 
-if (EXPORT_DEPRECATED_WEBKIT2_C_API)
-    set(WPE_INSTALLED_WEBKIT_HEADERS
-        ${WEBKIT_DIR}/Shared/API/c/WKArray.h
-        ${WEBKIT_DIR}/Shared/API/c/WKBase.h
-        ${WEBKIT_DIR}/Shared/API/c/WKData.h
-        ${WEBKIT_DIR}/Shared/API/c/WKDeclarationSpecifiers.h
-        ${WEBKIT_DIR}/Shared/API/c/WKDiagnosticLoggingResultType.h
-        ${WEBKIT_DIR}/Shared/API/c/WKDictionary.h
-        ${WEBKIT_DIR}/Shared/API/c/WKErrorRef.h
-        ${WEBKIT_DIR}/Shared/API/c/WKEvent.h
-        ${WEBKIT_DIR}/Shared/API/c/WKFindOptions.h
-        ${WEBKIT_DIR}/Shared/API/c/WKGeometry.h
-        ${WEBKIT_DIR}/Shared/API/c/WKImage.h
-        ${WEBKIT_DIR}/Shared/API/c/WKMutableArray.h
-        ${WEBKIT_DIR}/Shared/API/c/WKMutableDictionary.h
-        ${WEBKIT_DIR}/Shared/API/c/WKNumber.h
-        ${WEBKIT_DIR}/Shared/API/c/WKPageLoadTypes.h
-        ${WEBKIT_DIR}/Shared/API/c/WKPageVisibilityTypes.h
-        ${WEBKIT_DIR}/Shared/API/c/WKSecurityOriginRef.h
-        ${WEBKIT_DIR}/Shared/API/c/WKSerializedScriptValue.h
-        ${WEBKIT_DIR}/Shared/API/c/WKString.h
-        ${WEBKIT_DIR}/Shared/API/c/WKType.h
-        ${WEBKIT_DIR}/Shared/API/c/WKURL.h
-        ${WEBKIT_DIR}/Shared/API/c/WKURLRequest.h
-        ${WEBKIT_DIR}/Shared/API/c/WKURLResponse.h
-        ${WEBKIT_DIR}/Shared/API/c/WKUserContentInjectedFrames.h
-        ${WEBKIT_DIR}/Shared/API/c/WKUserContentURLPattern.h
-        ${WEBKIT_DIR}/Shared/API/c/WKUserScriptInjectionTime.h
-
-        ${WEBKIT_DIR}/Shared/API/c/wpe/WKBaseWPE.h
-
-        ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/c/WKBundle.h
-        ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/c/WKBundleBackForwardList.h
-        ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/c/WKBundleBackForwardListItem.h
-        ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/c/WKBundleDOMWindowExtension.h
-        ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/c/WKBundleFileHandleRef.h
-        ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/c/WKBundleFrame.h
-        ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/c/WKBundleHitTestResult.h
-        ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/c/WKBundleInitialize.h
-        ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/c/WKBundleInspector.h
-        ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/c/WKBundleNavigationAction.h
-        ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/c/WKBundleNodeHandle.h
-        ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/c/WKBundlePage.h
-        ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/c/WKBundlePageBanner.h
-        ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/c/WKBundlePageContextMenuClient.h
-        ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/c/WKBundlePageEditorClient.h
-        ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/c/WKBundlePageFormClient.h
-        ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/c/WKBundlePageFullScreenClient.h
-        ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/c/WKBundlePageGroup.h
-        ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/c/WKBundlePageLoaderClient.h
-        ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/c/WKBundlePageOverlay.h
-        ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/c/WKBundlePagePolicyClient.h
-        ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/c/WKBundlePageResourceLoadClient.h
-        ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/c/WKBundlePageUIClient.h
-        ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/c/WKBundleRangeHandle.h
-        ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/c/WKBundleScriptWorld.h
-
-        ${WEBKIT_DIR}/UIProcess/API/C/WKBackForwardListItemRef.h
-        ${WEBKIT_DIR}/UIProcess/API/C/WKBackForwardListRef.h
-        ${WEBKIT_DIR}/UIProcess/API/C/WKContextConfigurationRef.h
-        ${WEBKIT_DIR}/UIProcess/API/C/WKContextConnectionClient.h
-        ${WEBKIT_DIR}/UIProcess/API/C/WKContextDownloadClient.h
-        ${WEBKIT_DIR}/UIProcess/API/C/WKContextHistoryClient.h
-        ${WEBKIT_DIR}/UIProcess/API/C/WKContextInjectedBundleClient.h
-        ${WEBKIT_DIR}/UIProcess/API/C/WKContext.h
-        ${WEBKIT_DIR}/UIProcess/API/C/WKCookieManager.h
-        ${WEBKIT_DIR}/UIProcess/API/C/WKCredential.h
-        ${WEBKIT_DIR}/UIProcess/API/C/WKCredentialTypes.h
-        ${WEBKIT_DIR}/UIProcess/API/C/WKFrame.h
-        ${WEBKIT_DIR}/UIProcess/API/C/WKFrameInfoRef.h
-        ${WEBKIT_DIR}/UIProcess/API/C/WKFramePolicyListener.h
-        ${WEBKIT_DIR}/UIProcess/API/C/WKHitTestResult.h
-        ${WEBKIT_DIR}/UIProcess/API/C/WKNativeEvent.h
-        ${WEBKIT_DIR}/UIProcess/API/C/WKNavigationActionRef.h
-        ${WEBKIT_DIR}/UIProcess/API/C/WKNavigationDataRef.h
-        ${WEBKIT_DIR}/UIProcess/API/C/WKNavigationRef.h
-        ${WEBKIT_DIR}/UIProcess/API/C/WKNavigationResponseRef.h
-        ${WEBKIT_DIR}/UIProcess/API/C/WKPage.h
-        ${WEBKIT_DIR}/UIProcess/API/C/WKPageConfigurationRef.h
-        ${WEBKIT_DIR}/UIProcess/API/C/WKPageContextMenuClient.h
-        ${WEBKIT_DIR}/UIProcess/API/C/WKPageDiagnosticLoggingClient.h
-        ${WEBKIT_DIR}/UIProcess/API/C/WKPageFindClient.h
-        ${WEBKIT_DIR}/UIProcess/API/C/WKPageFindMatchesClient.h
-        ${WEBKIT_DIR}/UIProcess/API/C/WKPageFormClient.h
-        ${WEBKIT_DIR}/UIProcess/API/C/WKPageGroup.h
-        ${WEBKIT_DIR}/UIProcess/API/C/WKPageInjectedBundleClient.h
-        ${WEBKIT_DIR}/UIProcess/API/C/WKPageLoaderClient.h
-        ${WEBKIT_DIR}/UIProcess/API/C/WKPageNavigationClient.h
-        ${WEBKIT_DIR}/UIProcess/API/C/WKPagePolicyClient.h
-        ${WEBKIT_DIR}/UIProcess/API/C/WKPageRenderingProgressEvents.h
-        ${WEBKIT_DIR}/UIProcess/API/C/WKPageUIClient.h
-        ${WEBKIT_DIR}/UIProcess/API/C/WKPluginLoadPolicy.h
-        ${WEBKIT_DIR}/UIProcess/API/C/WKPreferencesRef.h
-        ${WEBKIT_DIR}/UIProcess/API/C/WKSessionStateRef.h
-        ${WEBKIT_DIR}/UIProcess/API/C/WKUserContentControllerRef.h
-        ${WEBKIT_DIR}/UIProcess/API/C/WKUserScriptRef.h
-        ${WEBKIT_DIR}/UIProcess/API/C/WKViewportAttributes.h
-        ${WEBKIT_DIR}/UIProcess/API/C/WKWindowFeaturesRef.h
-
-        ${WEBKIT_DIR}/UIProcess/API/C/wpe/WKView.h
-    )
-
-    install(FILES ${WPE_INSTALLED_WEBKIT_HEADERS}
-        DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/wpe-${WPE_API_VERSION}/WPE/WebKit"
-        COMPONENT "Development"
-    )
-
-    set(WPE_INSTALLED_HEADERS
-        ${WEBKIT_DIR}/Shared/API/c/wpe/WebKit.h
-    )
-
-    install(FILES ${WPE_INSTALLED_HEADERS}
-        DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/wpe-${WPE_API_VERSION}/WPE"
-        COMPONENT "Development"
-    )
-endif ()
-
 install(FILES "${CMAKE_BINARY_DIR}/wpe-webkit.pc"
     DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig"
     COMPONENT "Development"
index 900378f..a83675b 100644 (file)
@@ -10,9 +10,6 @@ WEBKIT_OPTION_BEGIN()
 
 include(GStreamerDefinitions)
 
-# WebKit2 C API
-WEBKIT_OPTION_DEFINE(EXPORT_DEPRECATED_WEBKIT2_C_API "Whether to export the WebKit2 C API" PRIVATE OFF)
-
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_3D_TRANSFORMS PUBLIC ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ACCELERATED_2D_CANVAS PUBLIC OFF)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_SELECTORS_LEVEL4 PUBLIC ON)