[CMake] Rename WebKit target to WebKitLegacy and rename WebKit2 target to WebKit
authormcatanzaro@igalia.com <mcatanzaro@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 19 Sep 2017 00:29:31 +0000 (00:29 +0000)
committermcatanzaro@igalia.com <mcatanzaro@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 19 Sep 2017 00:29:31 +0000 (00:29 +0000)
https://bugs.webkit.org/show_bug.cgi?id=174558

Reviewed by Alex Christensen.

.:

* CMakeLists.txt:
* Source/PlatformGTK.cmake:
* Source/cmake/OptionsGTK.cmake:
* Source/cmake/OptionsWPE.cmake:
* Source/cmake/WebKitCommon.cmake:
* Source/cmake/WebKitFS.cmake:

Source/WebDriver:

* CMakeLists.txt:

Source/WebKit:

* CMakeLists.txt:
* PlatformGTK.cmake:
* PlatformMac.cmake:
* PlatformWPE.cmake:
* PlatformWin.cmake:
* Shared/gtk/WebKitWaylandProtocol.xml: Renamed from Source/WebKit/Shared/gtk/WebKit2WaylandProtocol.xml.
* UIProcess/gtk/WaylandCompositor.cpp:
* WebProcess/gtk/WaylandCompositorDisplay.cpp:

Source/WebKitLegacy:

With help from Stephan Szabo, thanks!

* CMakeLists.txt:
* PlatformMac.cmake:
* PlatformWin.cmake:

Tools:

With help from Stephan Szabo, thanks!

* DumpRenderTree/PlatformMac.cmake:
* DumpRenderTree/PlatformWin.cmake:
* DumpRenderTree/win/AccessibilityControllerWin.cpp:
* DumpRenderTree/win/DRTDesktopNotificationPresenter.h:
* DumpRenderTree/win/DumpRenderTree.cpp:
* DumpRenderTree/win/EditingDelegate.h:
* DumpRenderTree/win/EventSender.cpp:
* DumpRenderTree/win/FrameLoadDelegate.cpp:
* DumpRenderTree/win/FrameLoadDelegate.h:
* DumpRenderTree/win/GCControllerWin.cpp:
* DumpRenderTree/win/HistoryDelegate.cpp:
* DumpRenderTree/win/HistoryDelegate.h:
* DumpRenderTree/win/PolicyDelegate.h:
* DumpRenderTree/win/ResourceLoadDelegate.cpp:
* DumpRenderTree/win/ResourceLoadDelegate.h:
* DumpRenderTree/win/TestRunnerWin.cpp:
* DumpRenderTree/win/TextInputControllerWin.cpp:
* DumpRenderTree/win/UIDelegate.cpp:
* DumpRenderTree/win/UIDelegate.h:
* DumpRenderTree/win/WorkQueueItemWin.cpp:
* MiniBrowser/gtk/CMakeLists.txt:
* MiniBrowser/mac/CMakeLists.txt:
* MiniBrowser/win/AccessibilityDelegate.cpp:
* MiniBrowser/win/AccessibilityDelegate.h:
* MiniBrowser/win/CMakeLists.txt:
* MiniBrowser/win/Common.cpp:
* MiniBrowser/win/DOMDefaultImpl.h:
* MiniBrowser/win/MiniBrowser.cpp:
* MiniBrowser/win/MiniBrowser.h:
* MiniBrowser/win/MiniBrowserWebHost.cpp:
* MiniBrowser/win/MiniBrowserWebHost.h:
* MiniBrowser/win/PageLoadTestClient.h:
* MiniBrowser/win/PrintWebUIDelegate.cpp:
* MiniBrowser/win/PrintWebUIDelegate.h:
* MiniBrowser/win/ResourceLoadDelegate.cpp:
* MiniBrowser/win/ResourceLoadDelegate.h:
* MiniBrowser/win/WebDownloadDelegate.h:
* TestWebKitAPI/CMakeLists.txt:
* TestWebKitAPI/PlatformGTK.cmake:
* TestWebKitAPI/PlatformWPE.cmake:
* TestWebKitAPI/PlatformWin.cmake:
* TestWebKitAPI/Tests/WebKitLegacy/win/ScaleWebView.cpp:
* TestWebKitAPI/Tests/WebKitLegacy/win/WebViewDestruction.cpp:
* TestWebKitAPI/glib/CMakeLists.txt:
* WebKitTestRunner/CMakeLists.txt:
* WebKitTestRunner/PlatformGTK.cmake:
* WebKitTestRunner/PlatformWPE.cmake:

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

70 files changed:
CMakeLists.txt
ChangeLog
Source/PlatformGTK.cmake
Source/WebDriver/CMakeLists.txt
Source/WebDriver/ChangeLog
Source/WebKit/CMakeLists.txt
Source/WebKit/ChangeLog
Source/WebKit/PlatformGTK.cmake
Source/WebKit/PlatformMac.cmake
Source/WebKit/PlatformWPE.cmake
Source/WebKit/PlatformWin.cmake
Source/WebKit/Shared/gtk/WebKitWaylandProtocol.xml [moved from Source/WebKit/Shared/gtk/WebKit2WaylandProtocol.xml with 100% similarity]
Source/WebKit/UIProcess/gtk/WaylandCompositor.cpp
Source/WebKit/WebProcess/gtk/WaylandCompositorDisplay.cpp
Source/WebKitLegacy/CMakeLists.txt
Source/WebKitLegacy/ChangeLog
Source/WebKitLegacy/PlatformMac.cmake
Source/WebKitLegacy/PlatformWin.cmake
Source/cmake/OptionsGTK.cmake
Source/cmake/OptionsWPE.cmake
Source/cmake/WebKitCommon.cmake
Source/cmake/WebKitFS.cmake
Tools/ChangeLog
Tools/DumpRenderTree/PlatformMac.cmake
Tools/DumpRenderTree/PlatformWin.cmake
Tools/DumpRenderTree/win/AccessibilityControllerWin.cpp
Tools/DumpRenderTree/win/DRTDesktopNotificationPresenter.h
Tools/DumpRenderTree/win/DumpRenderTree.cpp
Tools/DumpRenderTree/win/EditingDelegate.h
Tools/DumpRenderTree/win/EventSender.cpp
Tools/DumpRenderTree/win/FrameLoadDelegate.cpp
Tools/DumpRenderTree/win/FrameLoadDelegate.h
Tools/DumpRenderTree/win/GCControllerWin.cpp
Tools/DumpRenderTree/win/HistoryDelegate.cpp
Tools/DumpRenderTree/win/HistoryDelegate.h
Tools/DumpRenderTree/win/PolicyDelegate.h
Tools/DumpRenderTree/win/ResourceLoadDelegate.cpp
Tools/DumpRenderTree/win/ResourceLoadDelegate.h
Tools/DumpRenderTree/win/TestRunnerWin.cpp
Tools/DumpRenderTree/win/TextInputControllerWin.cpp
Tools/DumpRenderTree/win/UIDelegate.cpp
Tools/DumpRenderTree/win/UIDelegate.h
Tools/DumpRenderTree/win/WorkQueueItemWin.cpp
Tools/MiniBrowser/gtk/CMakeLists.txt
Tools/MiniBrowser/mac/CMakeLists.txt
Tools/MiniBrowser/win/AccessibilityDelegate.cpp
Tools/MiniBrowser/win/AccessibilityDelegate.h
Tools/MiniBrowser/win/CMakeLists.txt
Tools/MiniBrowser/win/Common.cpp
Tools/MiniBrowser/win/DOMDefaultImpl.h
Tools/MiniBrowser/win/MiniBrowser.cpp
Tools/MiniBrowser/win/MiniBrowser.h
Tools/MiniBrowser/win/MiniBrowserWebHost.cpp
Tools/MiniBrowser/win/MiniBrowserWebHost.h
Tools/MiniBrowser/win/PageLoadTestClient.h
Tools/MiniBrowser/win/PrintWebUIDelegate.cpp
Tools/MiniBrowser/win/PrintWebUIDelegate.h
Tools/MiniBrowser/win/ResourceLoadDelegate.cpp
Tools/MiniBrowser/win/ResourceLoadDelegate.h
Tools/MiniBrowser/win/WebDownloadDelegate.h
Tools/TestWebKitAPI/CMakeLists.txt
Tools/TestWebKitAPI/PlatformGTK.cmake
Tools/TestWebKitAPI/PlatformWPE.cmake
Tools/TestWebKitAPI/PlatformWin.cmake
Tools/TestWebKitAPI/Tests/WebKitLegacy/win/ScaleWebView.cpp
Tools/TestWebKitAPI/Tests/WebKitLegacy/win/WebViewDestruction.cpp
Tools/TestWebKitAPI/glib/CMakeLists.txt
Tools/WebKitTestRunner/CMakeLists.txt
Tools/WebKitTestRunner/PlatformGTK.cmake
Tools/WebKitTestRunner/PlatformWPE.cmake

index 1dbd16e..3f03310 100644 (file)
@@ -122,8 +122,8 @@ endif ()
 set(WTF_LIBRARY_TYPE STATIC)
 set(JavaScriptCore_LIBRARY_TYPE SHARED)
 set(PAL_LIBRARY_TYPE STATIC)
+set(WebKitLegacy_LIBRARY_TYPE SHARED)
 set(WebKit_LIBRARY_TYPE SHARED)
-set(WebKit2_LIBRARY_TYPE SHARED)
 set(WebCoreTestSupport_LIBRARY_TYPE STATIC)
 
 set(CMAKE_POSITION_INDEPENDENT_CODE True)
index 6ed92f3..b83a5c8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2017-09-18  Michael Catanzaro  <mcatanzaro@igalia.com>
+
+        [CMake] Rename WebKit target to WebKitLegacy and rename WebKit2 target to WebKit
+        https://bugs.webkit.org/show_bug.cgi?id=174558
+
+        Reviewed by Alex Christensen.
+
+        * CMakeLists.txt:
+        * Source/PlatformGTK.cmake:
+        * Source/cmake/OptionsGTK.cmake:
+        * Source/cmake/OptionsWPE.cmake:
+        * Source/cmake/WebKitCommon.cmake:
+        * Source/cmake/WebKitFS.cmake:
+
 2017-09-18  Yoshiaki Jitsukawa  <Yoshiaki.Jitsukawa@sony.com>
 
         [Win][PAL] Move WebCoreHeaderDetection.h to PAL
index 50b5393..041c67a 100644 (file)
@@ -6,7 +6,7 @@ if (ENABLE_INTROSPECTION)
 endif ()
 
 list(APPEND DocumentationDependencies
-    WebKit2
+    WebKit
     "${CMAKE_SOURCE_DIR}/Source/WebKit/UIProcess/API/gtk/docs/webkit2gtk-docs.sgml"
     "${CMAKE_SOURCE_DIR}/Source/WebKit/UIProcess/API/gtk/docs/webkit2gtk-${WEBKITGTK_API_VERSION}-sections.txt"
 )
@@ -31,7 +31,7 @@ macro(ADD_GTKDOC_GENERATOR _stamp_name _extra_args)
     )
 endmacro()
 
-add_gtkdoc_generator("docs-build.stamp" "")
+ADD_GTKDOC_GENERATOR("docs-build.stamp" "")
 if (ENABLE_GTKDOC)
     add_custom_target(gtkdoc ALL DEPENDS "${CMAKE_BINARY_DIR}/docs-build.stamp")
 elseif (NOT ENABLED_COMPILER_SANITIZERS AND NOT CMAKE_CROSSCOMPILING AND NOT APPLE)
@@ -41,7 +41,7 @@ elseif (NOT ENABLED_COMPILER_SANITIZERS AND NOT CMAKE_CROSSCOMPILING AND NOT APP
     # or errors. This is useful to prevent breaking documentation inadvertently during
     # the course of development.
     if (DEVELOPER_MODE)
-        add_gtkdoc_generator("docs-build-no-html.stamp" "--skip-html")
+        ADD_GTKDOC_GENERATOR("docs-build-no-html.stamp" "--skip-html")
         add_custom_target(gtkdoc-no-html ALL DEPENDS "${CMAKE_BINARY_DIR}/docs-build-no-html.stamp")
     endif ()
 endif ()
@@ -61,7 +61,7 @@ if (DEVELOPER_MODE)
         OUTPUT ${CMAKE_BINARY_DIR}/webkitgtk-${PROJECT_VERSION}.tar
         DEPENDS ${TOOLS_DIR}/gtk/make-dist.py
         DEPENDS ${CMAKE_BINARY_DIR}/manifest.txt
-        DEPENDS WebKit2
+        DEPENDS WebKit
         DEPENDS gtkdoc
         COMMAND ${TOOLS_DIR}/gtk/make-dist.py
                 --source-dir=${CMAKE_SOURCE_DIR}
@@ -83,7 +83,7 @@ if (DEVELOPER_MODE)
     add_custom_target(distcheck
         DEPENDS ${TOOLS_DIR}/gtk/make-dist.py
         DEPENDS ${CMAKE_BINARY_DIR}/manifest.txt
-        DEPENDS WebKit2
+        DEPENDS WebKit
         DEPENDS gtkdoc
         COMMAND ${TOOLS_DIR}/gtk/make-dist.py
                 --check
index 7c69f6a..4ecd8ff 100644 (file)
@@ -21,11 +21,11 @@ set(WebDriver_LIBRARIES
 )
 
 set(WebDriver_SCRIPTS
-    ${WEBKIT2_DIR}/UIProcess/Automation/atoms/ElementAttribute.js
-    ${WEBKIT2_DIR}/UIProcess/Automation/atoms/ElementDisplayed.js
-    ${WEBKIT2_DIR}/UIProcess/Automation/atoms/FindNodes.js
-    ${WEBKIT2_DIR}/UIProcess/Automation/atoms/FormElementClear.js
-    ${WEBKIT2_DIR}/UIProcess/Automation/atoms/FormSubmit.js
+    ${WEBKIT_DIR}/UIProcess/Automation/atoms/ElementAttribute.js
+    ${WEBKIT_DIR}/UIProcess/Automation/atoms/ElementDisplayed.js
+    ${WEBKIT_DIR}/UIProcess/Automation/atoms/FindNodes.js
+    ${WEBKIT_DIR}/UIProcess/Automation/atoms/FormElementClear.js
+    ${WEBKIT_DIR}/UIProcess/Automation/atoms/FormSubmit.js
 )
 
 set(JavaScriptCore_SCRIPTS_DIR "${FORWARDING_HEADERS_DIR}/JavaScriptCore/Scripts")
index 156e82a..7824ae3 100644 (file)
@@ -1,3 +1,12 @@
+2017-09-18  Michael Catanzaro  <mcatanzaro@igalia.com>
+
+        [CMake] Rename WebKit target to WebKitLegacy and rename WebKit2 target to WebKit
+        https://bugs.webkit.org/show_bug.cgi?id=174558
+
+        Reviewed by Alex Christensen.
+
+        * CMakeLists.txt:
+
 2017-09-15  JF Bastien  <jfbastien@apple.com>
 
         WTF: use Forward.h when appropriate instead of Vector.h
index 032f643..0e36b13 100644 (file)
 include(WebKitCommon)
 
-set_property(DIRECTORY . PROPERTY FOLDER "WebKit2")
-
-set(WebKit2_INCLUDE_DIRECTORIES
-    "${WEBKIT2_DIR}"
-    "${WEBKIT2_DIR}/NetworkProcess"
-    "${WEBKIT2_DIR}/NetworkProcess/CustomProtocols"
-    "${WEBKIT2_DIR}/NetworkProcess/Downloads"
-    "${WEBKIT2_DIR}/NetworkProcess/FileAPI"
-    "${WEBKIT2_DIR}/NetworkProcess/cache"
-    "${WEBKIT2_DIR}/NetworkProcess/capture"
-    "${WEBKIT2_DIR}/NetworkProcess/webrtc"
-    "${WEBKIT2_DIR}/Platform"
-    "${WEBKIT2_DIR}/Platform/IPC"
-    "${WEBKIT2_DIR}/PluginProcess"
-    "${WEBKIT2_DIR}/Shared"
-    "${WEBKIT2_DIR}/Shared/API"
-    "${WEBKIT2_DIR}/Shared/API/c"
-    "${WEBKIT2_DIR}/Shared/Authentication"
-    "${WEBKIT2_DIR}/Shared/CoreIPCSupport"
-    "${WEBKIT2_DIR}/Shared/Databases"
-    "${WEBKIT2_DIR}/Shared/Databases/IndexedDB"
-    "${WEBKIT2_DIR}/Shared/FileAPI"
-    "${WEBKIT2_DIR}/Shared/Gamepad"
-    "${WEBKIT2_DIR}/Shared/Plugins"
-    "${WEBKIT2_DIR}/Shared/Plugins/Netscape"
-    "${WEBKIT2_DIR}/Shared/Plugins/Netscape/x11"
-    "${WEBKIT2_DIR}/Shared/RemoteLayerTree"
-    "${WEBKIT2_DIR}/Shared/Storage"
-    "${WEBKIT2_DIR}/Shared/WebsiteData"
-    "${WEBKIT2_DIR}/StorageProcess"
-    "${WEBKIT2_DIR}/StorageProcess/IndexedDB"
-    "${WEBKIT2_DIR}/StorageProcess/ServiceWorker"
-    "${WEBKIT2_DIR}/UIProcess"
-    "${WEBKIT2_DIR}/UIProcess/API"
-    "${WEBKIT2_DIR}/UIProcess/API/C"
-    "${WEBKIT2_DIR}/UIProcess/API/cpp"
-    "${WEBKIT2_DIR}/UIProcess/ApplePay"
-    "${WEBKIT2_DIR}/UIProcess/Authentication"
-    "${WEBKIT2_DIR}/UIProcess/Automation"
-    "${WEBKIT2_DIR}/UIProcess/Downloads"
-    "${WEBKIT2_DIR}/UIProcess/Gamepad"
-    "${WEBKIT2_DIR}/UIProcess/Launcher"
-    "${WEBKIT2_DIR}/UIProcess/Network"
-    "${WEBKIT2_DIR}/UIProcess/Network/CustomProtocols"
-    "${WEBKIT2_DIR}/UIProcess/Notifications"
-    "${WEBKIT2_DIR}/UIProcess/Plugins"
-    "${WEBKIT2_DIR}/UIProcess/RemoteLayerTree"
-    "${WEBKIT2_DIR}/UIProcess/Storage"
-    "${WEBKIT2_DIR}/UIProcess/UserContent"
-    "${WEBKIT2_DIR}/UIProcess/WebStorage"
-    "${WEBKIT2_DIR}/UIProcess/WebsiteData"
-    "${WEBKIT2_DIR}/WebProcess"
-    "${WEBKIT2_DIR}/WebProcess/ApplePay"
-    "${WEBKIT2_DIR}/WebProcess/ApplicationCache"
-    "${WEBKIT2_DIR}/WebProcess/Automation"
-    "${WEBKIT2_DIR}/WebProcess/Cache"
-    "${WEBKIT2_DIR}/WebProcess/Cookies"
-    "${WEBKIT2_DIR}/WebProcess/Databases"
-    "${WEBKIT2_DIR}/WebProcess/Databases/IndexedDB"
-    "${WEBKIT2_DIR}/WebProcess/FileAPI"
-    "${WEBKIT2_DIR}/WebProcess/FullScreen"
-    "${WEBKIT2_DIR}/WebProcess/Gamepad"
-    "${WEBKIT2_DIR}/WebProcess/Geolocation"
-    "${WEBKIT2_DIR}/WebProcess/IconDatabase"
-    "${WEBKIT2_DIR}/WebProcess/InjectedBundle"
-    "${WEBKIT2_DIR}/WebProcess/InjectedBundle/API"
-    "${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/c"
-    "${WEBKIT2_DIR}/WebProcess/InjectedBundle/DOM"
-    "${WEBKIT2_DIR}/WebProcess/Launching"
-    "${WEBKIT2_DIR}/WebProcess/MediaCache"
-    "${WEBKIT2_DIR}/WebProcess/MediaStream"
-    "${WEBKIT2_DIR}/WebProcess/Network"
-    "${WEBKIT2_DIR}/WebProcess/Network/webrtc"
-    "${WEBKIT2_DIR}/WebProcess/Notifications"
-    "${WEBKIT2_DIR}/WebProcess/OriginData"
-    "${WEBKIT2_DIR}/WebProcess/Plugins"
-    "${WEBKIT2_DIR}/WebProcess/Plugins/Netscape"
-    "${WEBKIT2_DIR}/WebProcess/ResourceCache"
-    "${WEBKIT2_DIR}/WebProcess/Storage"
-    "${WEBKIT2_DIR}/WebProcess/UserContent"
-    "${WEBKIT2_DIR}/WebProcess/WebCoreSupport"
-    "${WEBKIT2_DIR}/WebProcess/WebPage"
-    "${WEBKIT2_DIR}/WebProcess/WebPage/RemoteLayerTree"
-    "${WEBKIT2_DIR}/WebProcess/WebStorage"
-    "${DERIVED_SOURCES_WEBKIT2_DIR}"
-    "${DERIVED_SOURCES_WEBKIT2_DIR}/include"
+set_property(DIRECTORY . PROPERTY FOLDER "WebKit")
+
+set(WebKit_INCLUDE_DIRECTORIES
+    "${WEBKIT_DIR}"
+    "${WEBKIT_DIR}/NetworkProcess"
+    "${WEBKIT_DIR}/NetworkProcess/CustomProtocols"
+    "${WEBKIT_DIR}/NetworkProcess/Downloads"
+    "${WEBKIT_DIR}/NetworkProcess/FileAPI"
+    "${WEBKIT_DIR}/NetworkProcess/cache"
+    "${WEBKIT_DIR}/NetworkProcess/capture"
+    "${WEBKIT_DIR}/NetworkProcess/webrtc"
+    "${WEBKIT_DIR}/Platform"
+    "${WEBKIT_DIR}/Platform/IPC"
+    "${WEBKIT_DIR}/PluginProcess"
+    "${WEBKIT_DIR}/Shared"
+    "${WEBKIT_DIR}/Shared/API"
+    "${WEBKIT_DIR}/Shared/API/c"
+    "${WEBKIT_DIR}/Shared/Authentication"
+    "${WEBKIT_DIR}/Shared/CoreIPCSupport"
+    "${WEBKIT_DIR}/Shared/Databases"
+    "${WEBKIT_DIR}/Shared/Databases/IndexedDB"
+    "${WEBKIT_DIR}/Shared/FileAPI"
+    "${WEBKIT_DIR}/Shared/Gamepad"
+    "${WEBKIT_DIR}/Shared/Plugins"
+    "${WEBKIT_DIR}/Shared/Plugins/Netscape"
+    "${WEBKIT_DIR}/Shared/Plugins/Netscape/x11"
+    "${WEBKIT_DIR}/Shared/RemoteLayerTree"
+    "${WEBKIT_DIR}/Shared/Storage"
+    "${WEBKIT_DIR}/Shared/WebsiteData"
+    "${WEBKIT_DIR}/StorageProcess"
+    "${WEBKIT_DIR}/StorageProcess/IndexedDB"
+    "${WEBKIT_DIR}/StorageProcess/ServiceWorker"
+    "${WEBKIT_DIR}/UIProcess"
+    "${WEBKIT_DIR}/UIProcess/API"
+    "${WEBKIT_DIR}/UIProcess/API/C"
+    "${WEBKIT_DIR}/UIProcess/API/cpp"
+    "${WEBKIT_DIR}/UIProcess/ApplePay"
+    "${WEBKIT_DIR}/UIProcess/Authentication"
+    "${WEBKIT_DIR}/UIProcess/Automation"
+    "${WEBKIT_DIR}/UIProcess/Downloads"
+    "${WEBKIT_DIR}/UIProcess/Gamepad"
+    "${WEBKIT_DIR}/UIProcess/Launcher"
+    "${WEBKIT_DIR}/UIProcess/Network"
+    "${WEBKIT_DIR}/UIProcess/Network/CustomProtocols"
+    "${WEBKIT_DIR}/UIProcess/Notifications"
+    "${WEBKIT_DIR}/UIProcess/Plugins"
+    "${WEBKIT_DIR}/UIProcess/RemoteLayerTree"
+    "${WEBKIT_DIR}/UIProcess/Storage"
+    "${WEBKIT_DIR}/UIProcess/UserContent"
+    "${WEBKIT_DIR}/UIProcess/WebStorage"
+    "${WEBKIT_DIR}/UIProcess/WebsiteData"
+    "${WEBKIT_DIR}/WebProcess"
+    "${WEBKIT_DIR}/WebProcess/ApplePay"
+    "${WEBKIT_DIR}/WebProcess/ApplicationCache"
+    "${WEBKIT_DIR}/WebProcess/Automation"
+    "${WEBKIT_DIR}/WebProcess/Cache"
+    "${WEBKIT_DIR}/WebProcess/Cookies"
+    "${WEBKIT_DIR}/WebProcess/Databases"
+    "${WEBKIT_DIR}/WebProcess/Databases/IndexedDB"
+    "${WEBKIT_DIR}/WebProcess/FileAPI"
+    "${WEBKIT_DIR}/WebProcess/FullScreen"
+    "${WEBKIT_DIR}/WebProcess/Gamepad"
+    "${WEBKIT_DIR}/WebProcess/Geolocation"
+    "${WEBKIT_DIR}/WebProcess/IconDatabase"
+    "${WEBKIT_DIR}/WebProcess/InjectedBundle"
+    "${WEBKIT_DIR}/WebProcess/InjectedBundle/API"
+    "${WEBKIT_DIR}/WebProcess/InjectedBundle/API/c"
+    "${WEBKIT_DIR}/WebProcess/InjectedBundle/DOM"
+    "${WEBKIT_DIR}/WebProcess/Launching"
+    "${WEBKIT_DIR}/WebProcess/MediaCache"
+    "${WEBKIT_DIR}/WebProcess/MediaStream"
+    "${WEBKIT_DIR}/WebProcess/Network"
+    "${WEBKIT_DIR}/WebProcess/Network/webrtc"
+    "${WEBKIT_DIR}/WebProcess/Notifications"
+    "${WEBKIT_DIR}/WebProcess/OriginData"
+    "${WEBKIT_DIR}/WebProcess/Plugins"
+    "${WEBKIT_DIR}/WebProcess/Plugins/Netscape"
+    "${WEBKIT_DIR}/WebProcess/ResourceCache"
+    "${WEBKIT_DIR}/WebProcess/Storage"
+    "${WEBKIT_DIR}/WebProcess/UserContent"
+    "${WEBKIT_DIR}/WebProcess/WebCoreSupport"
+    "${WEBKIT_DIR}/WebProcess/WebPage"
+    "${WEBKIT_DIR}/WebProcess/WebPage/RemoteLayerTree"
+    "${WEBKIT_DIR}/WebProcess/WebStorage"
+    "${DERIVED_SOURCES_WEBKIT_DIR}"
+    "${DERIVED_SOURCES_WEBKIT_DIR}/include"
     "${CMAKE_SOURCE_DIR}/WebKitLibraries"
 )
 
 set(PROTOCOL_GENERATOR_SCRIPTS_DIR "${JAVASCRIPTCORE_DIR}/inspector/scripts")
 
-set(WebKit2_SYSTEM_INCLUDE_DIRECTORIES
+set(WebKit_SYSTEM_INCLUDE_DIRECTORIES
     ${ICU_INCLUDE_DIRS}
 )
 
-set(WebKit2_SOURCES
+set(WebKit_SOURCES
     NetworkProcess/CustomProtocols/LegacyCustomProtocolManager.cpp
 
     NetworkProcess/Downloads/BlobDownloadClient.cpp
@@ -590,7 +590,7 @@ set(WebKit2_SOURCES
     WebProcess/WebStorage/WebStorageNamespaceProvider.cpp
 )
 
-set(WebKit2_MESSAGES_IN_FILES
+set(WebKit_MESSAGES_IN_FILES
     NetworkProcess/cache/CacheStorageEngineConnection.messages.in
 
     NetworkProcess/CustomProtocols/LegacyCustomProtocolManager.messages.in
@@ -696,31 +696,31 @@ set(WebKit2_MESSAGES_IN_FILES
 )
 
 set(WebProcess_LIBRARIES
-    WebKit2
+    WebKit
 )
 
 set(NetworkProcess_LIBRARIES
-    WebKit2
+    WebKit
 )
 
 set(StorageProcess_LIBRARIES
-    WebKit2
+    WebKit
 )
 
 if (APPLE)
-    set(WebKit2_LIBRARIES
+    set(WebKit_LIBRARIES
         PRIVATE WebCore
         PUBLIC JavaScriptCore
     )
 else ()
-    set(WebKit2_LIBRARIES
+    set(WebKit_LIBRARIES
         WebCore
         JavaScriptCore
     )
 endif ()
 
 set(PluginProcess_LIBRARIES
-    WebKit2
+    WebKit
 )
 
 if (ENABLE_GRAPHICS_CONTEXT_3D)
@@ -728,43 +728,43 @@ if (ENABLE_GRAPHICS_CONTEXT_3D)
     # these include directories, libraries or definitions need to be
     # added before the ANGLE directories.
     if (USE_LIBEPOXY)
-        list(APPEND WebKit2_SYSTEM_INCLUDE_DIRECTORIES
+        list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES
             ${LIBEPOXY_INCLUDE_DIRS}
         )
-        list(APPEND WebKit2_LIBRARIES
+        list(APPEND WebKit_LIBRARIES
             ${LIBEPOXY_LIBRARIES}
         )
     else ()
         if (USE_OPENGL)
-            list(APPEND WebKit2_SYSTEM_INCLUDE_DIRECTORIES
+            list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES
                 ${OPENGL_INCLUDE_DIRS}
             )
-            list(APPEND WebKit2_LIBRARIES
+            list(APPEND WebKit_LIBRARIES
                 ${OPENGL_LIBRARIES}
             )
             add_definitions(${OPENGL_DEFINITIONS})
         elseif (USE_OPENGL_ES_2)
-            list(APPEND WebKit2_SYSTEM_INCLUDE_DIRECTORIES
+            list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES
                 ${OPENGLES2_INCLUDE_DIRS}
             )
-            list(APPEND WebKit2_LIBRARIES
+            list(APPEND WebKit_LIBRARIES
                 ${OPENGLES2_LIBRARIES}
             )
             add_definitions(${OPENGLES2_DEFINITIONS})
         endif ()
 
         if (USE_EGL)
-            list(APPEND WebKit2_SYSTEM_INCLUDE_DIRECTORIES
+            list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES
                 ${EGL_INCLUDE_DIRS}
             )
-            list(APPEND WebKit2_LIBRARIES
+            list(APPEND WebKit_LIBRARIES
                 ${EGL_LIBRARIES}
             )
             add_definitions(${EGL_DEFINITIONS})
         endif ()
     endif ()
 
-    list(APPEND WebKit2_INCLUDE_DIRECTORIES
+    list(APPEND WebKit_INCLUDE_DIRECTORIES
         "${THIRDPARTY_DIR}/ANGLE"
         "${THIRDPARTY_DIR}/ANGLE/include/KHR"
     )
@@ -788,7 +788,7 @@ if (COMPILER_IS_GCC_OR_CLANG)
         set(CMAKE_REQUIRED_LIBRARIES atomic)
         check_cxx_source_compiles("${ATOMIC_TEST_SOURCE}" ATOMIC_INT64_REQUIRES_LIBATOMIC)
         if (ATOMIC_INT64_REQUIRES_LIBATOMIC)
-            list(APPEND WebKit2_LIBRARIES atomic)
+            list(APPEND WebKit_LIBRARIES atomic)
         endif ()
         unset(CMAKE_REQUIRED_LIBRARIES)
     endif ()
@@ -800,51 +800,51 @@ if (UNIX)
         set(CMAKE_REQUIRED_LIBRARIES rt)
         check_function_exists(shm_open SHM_OPEN_REQUIRES_LIBRT)
         if (SHM_OPEN_REQUIRES_LIBRT)
-            list(APPEND WebKit2_LIBRARIES rt)
+            list(APPEND WebKit_LIBRARIES rt)
         endif ()
     endif ()
 endif ()
 
-macro(ADD_WEBKIT2_PREFIX_HEADER _target)
-    if (WebKit2_USE_PREFIX_HEADER)
+macro(ADD_WEBKIT_PREFIX_HEADER _target)
+    if (WebKit_USE_PREFIX_HEADER)
         get_target_property(OLD_COMPILE_FLAGS ${_target} COMPILE_FLAGS)
         if (${OLD_COMPILE_FLAGS} STREQUAL "OLD_COMPILE_FLAGS-NOTFOUND")
             set(OLD_COMPILE_FLAGS "")
         endif ()
-        set_target_properties(${_target} PROPERTIES COMPILE_FLAGS "${OLD_COMPILE_FLAGS} -include ${WEBKIT2_DIR}/WebKit2Prefix.h")
+        set_target_properties(${_target} PROPERTIES COMPILE_FLAGS "${OLD_COMPILE_FLAGS} -include ${WEBKIT_DIR}/WebKit2Prefix.h")
     endif ()
 endmacro()
 
-set(WebKit2_AUTOMATION_PROTOCOL_GENERATOR_EXTRA_FLAGS
+set(WebKit_AUTOMATION_PROTOCOL_GENERATOR_EXTRA_FLAGS
 )
 
-WEBKIT_FRAMEWORK_DECLARE(WebKit2)
+WEBKIT_FRAMEWORK_DECLARE(WebKit)
 WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
 
 # Helper macro which wraps generate-message-receiver.py and generate-message-header.py scripts
-#   _output_source is a list name which will contain generated sources.(eg. WebKit2_SOURCES)
+#   _output_source is a list name which will contain generated sources.(eg. WebKit_SOURCES)
 #   _input_files are messages.in files to generate.
 macro(GENERATE_MESSAGE_SOURCES _output_source _input_files)
     foreach (_file ${_input_files})
         get_filename_component(_name ${_file} NAME_WE)
         add_custom_command(
-            OUTPUT ${DERIVED_SOURCES_WEBKIT2_DIR}/${_name}MessageReceiver.cpp ${DERIVED_SOURCES_WEBKIT2_DIR}/${_name}Messages.h
+            OUTPUT ${DERIVED_SOURCES_WEBKIT_DIR}/${_name}MessageReceiver.cpp ${DERIVED_SOURCES_WEBKIT_DIR}/${_name}Messages.h
             MAIN_DEPENDENCY ${_file}
-            DEPENDS ${WEBKIT2_DIR}/Scripts/webkit/__init__.py
-                    ${WEBKIT2_DIR}/Scripts/webkit/messages.py
-                    ${WEBKIT2_DIR}/Scripts/webkit/model.py
-                    ${WEBKIT2_DIR}/Scripts/webkit/parser.py
-            COMMAND ${PYTHON_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-message-receiver.py ${_file} > ${DERIVED_SOURCES_WEBKIT2_DIR}/${_name}MessageReceiver.cpp
-            COMMAND ${PYTHON_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-messages-header.py ${_file} > ${DERIVED_SOURCES_WEBKIT2_DIR}/${_name}Messages.h
-            WORKING_DIRECTORY ${WEBKIT2_DIR}
+            DEPENDS ${WEBKIT_DIR}/Scripts/webkit/__init__.py
+                    ${WEBKIT_DIR}/Scripts/webkit/messages.py
+                    ${WEBKIT_DIR}/Scripts/webkit/model.py
+                    ${WEBKIT_DIR}/Scripts/webkit/parser.py
+            COMMAND ${PYTHON_EXECUTABLE} ${WEBKIT_DIR}/Scripts/generate-message-receiver.py ${_file} > ${DERIVED_SOURCES_WEBKIT_DIR}/${_name}MessageReceiver.cpp
+            COMMAND ${PYTHON_EXECUTABLE} ${WEBKIT_DIR}/Scripts/generate-messages-header.py ${_file} > ${DERIVED_SOURCES_WEBKIT_DIR}/${_name}Messages.h
+            WORKING_DIRECTORY ${WEBKIT_DIR}
             VERBATIM)
 
-        list(APPEND ${_output_source} ${DERIVED_SOURCES_WEBKIT2_DIR}/${_name}MessageReceiver.cpp)
+        list(APPEND ${_output_source} ${DERIVED_SOURCES_WEBKIT_DIR}/${_name}MessageReceiver.cpp)
     endforeach ()
 endmacro()
-GENERATE_MESSAGE_SOURCES(WebKit2_DERIVED_SOURCES "${WebKit2_MESSAGES_IN_FILES}")
+GENERATE_MESSAGE_SOURCES(WebKit_DERIVED_SOURCES "${WebKit_MESSAGES_IN_FILES}")
 
-set(WebKit2_AUTOMATION_PROTOCOL_GENERATOR_SCRIPTS
+set(WebKit_AUTOMATION_PROTOCOL_GENERATOR_SCRIPTS
     ${PROTOCOL_GENERATOR_SCRIPTS_DIR}/generate-inspector-protocol-bindings.py
     ${PROTOCOL_GENERATOR_SCRIPTS_DIR}/codegen/cpp_generator.py
     ${PROTOCOL_GENERATOR_SCRIPTS_DIR}/codegen/cpp_generator_templates.py
@@ -859,75 +859,75 @@ set(WebKit2_AUTOMATION_PROTOCOL_GENERATOR_SCRIPTS
     ${PROTOCOL_GENERATOR_SCRIPTS_DIR}/codegen/models.py
 )
 
-set(WebKit2_AUTOMATION_PROTOCOL_GENERATOR_INPUTS
-    ${WEBKIT2_DIR}/UIProcess/Automation/Automation.json
+set(WebKit_AUTOMATION_PROTOCOL_GENERATOR_INPUTS
+    ${WEBKIT_DIR}/UIProcess/Automation/Automation.json
 )
 
 add_custom_command(
-    OUTPUT ${DERIVED_SOURCES_WEBKIT2_DIR}/AutomationBackendDispatchers.h ${DERIVED_SOURCES_WEBKIT2_DIR}/AutomationBackendDispatchers.cpp ${DERIVED_SOURCES_WEBKIT2_DIR}/AutomationProtocolObjects.h ${DERIVED_SOURCES_WEBKIT2_DIR}/AutomationProtocolObjects.cpp ${DERIVED_SOURCES_WEBKIT2_DIR}/AutomationFrontendDispatchers.h ${DERIVED_SOURCES_WEBKIT2_DIR}/AutomationFrontendDispatchers.cpp
-    MAIN_DEPENDENCY ${WebKit2_AUTOMATION_PROTOCOL_GENERATOR_INPUTS}
-    DEPENDS ${WebKit2_AUTOMATION_PROTOCOL_GENERATOR_SCRIPTS}
-    COMMAND ${PYTHON_EXECUTABLE} ${PROTOCOL_GENERATOR_SCRIPTS_DIR}/generate-inspector-protocol-bindings.py --outputDir "${DERIVED_SOURCES_WEBKIT2_DIR}" --framework WebKit ${WebKit2_AUTOMATION_PROTOCOL_GENERATOR_EXTRA_FLAGS} --backend ${WebKit2_AUTOMATION_PROTOCOL_GENERATOR_INPUTS}
+    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
+    MAIN_DEPENDENCY ${WebKit_AUTOMATION_PROTOCOL_GENERATOR_INPUTS}
+    DEPENDS ${WebKit_AUTOMATION_PROTOCOL_GENERATOR_SCRIPTS}
+    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}
     VERBATIM)
 
-list(APPEND WebKit2_HEADERS
-    ${DERIVED_SOURCES_WEBKIT2_DIR}/AutomationBackendDispatchers.h
-    ${DERIVED_SOURCES_WEBKIT2_DIR}/AutomationFrontendDispatchers.h
-    ${DERIVED_SOURCES_WEBKIT2_DIR}/AutomationProtocolObjects.h
+list(APPEND WebKit_HEADERS
+    ${DERIVED_SOURCES_WEBKIT_DIR}/AutomationBackendDispatchers.h
+    ${DERIVED_SOURCES_WEBKIT_DIR}/AutomationFrontendDispatchers.h
+    ${DERIVED_SOURCES_WEBKIT_DIR}/AutomationProtocolObjects.h
 )
 
-list(APPEND WebKit2_SOURCES
-    ${DERIVED_SOURCES_WEBKIT2_DIR}/AutomationBackendDispatchers.cpp
-    ${DERIVED_SOURCES_WEBKIT2_DIR}/AutomationFrontendDispatchers.cpp
-    ${DERIVED_SOURCES_WEBKIT2_DIR}/AutomationProtocolObjects.cpp
+list(APPEND WebKit_SOURCES
+    ${DERIVED_SOURCES_WEBKIT_DIR}/AutomationBackendDispatchers.cpp
+    ${DERIVED_SOURCES_WEBKIT_DIR}/AutomationFrontendDispatchers.cpp
+    ${DERIVED_SOURCES_WEBKIT_DIR}/AutomationProtocolObjects.cpp
 )
 
 add_custom_command(
-    OUTPUT ${DERIVED_SOURCES_WEBKIT2_DIR}/WebAutomationSessionProxyScriptSource.h ${DERIVED_SOURCES_WEBKIT2_DIR}/WebAutomationSessionProxy.min.js
-    MAIN_DEPENDENCY ${WEBKIT2_DIR}/WebProcess/Automation/WebAutomationSessionProxy.js
+    OUTPUT ${DERIVED_SOURCES_WEBKIT_DIR}/WebAutomationSessionProxyScriptSource.h ${DERIVED_SOURCES_WEBKIT_DIR}/WebAutomationSessionProxy.min.js
+    MAIN_DEPENDENCY ${WEBKIT_DIR}/WebProcess/Automation/WebAutomationSessionProxy.js
     DEPENDS ${JavaScriptCore_SCRIPTS_DIR}/xxd.pl ${JavaScriptCore_SCRIPTS_DIR}/jsmin.py
-    COMMAND ${CMAKE_COMMAND} -E echo "//# sourceURL=__InjectedScript_WebAutomationSessionProxy.js" > ${DERIVED_SOURCES_WEBKIT2_DIR}/WebAutomationSessionProxy.min.js
-    COMMAND ${PYTHON_EXECUTABLE} ${JavaScriptCore_SCRIPTS_DIR}/jsmin.py < ${WEBKIT2_DIR}/WebProcess/Automation/WebAutomationSessionProxy.js >> ${DERIVED_SOURCES_WEBKIT2_DIR}/WebAutomationSessionProxy.min.js
-    COMMAND ${PERL_EXECUTABLE} ${JavaScriptCore_SCRIPTS_DIR}/xxd.pl WebAutomationSessionProxyScriptSource ${DERIVED_SOURCES_WEBKIT2_DIR}/WebAutomationSessionProxy.min.js ${DERIVED_SOURCES_WEBKIT2_DIR}/WebAutomationSessionProxyScriptSource.h
+    COMMAND ${CMAKE_COMMAND} -E echo "//# sourceURL=__InjectedScript_WebAutomationSessionProxy.js" > ${DERIVED_SOURCES_WEBKIT_DIR}/WebAutomationSessionProxy.min.js
+    COMMAND ${PYTHON_EXECUTABLE} ${JavaScriptCore_SCRIPTS_DIR}/jsmin.py < ${WEBKIT_DIR}/WebProcess/Automation/WebAutomationSessionProxy.js >> ${DERIVED_SOURCES_WEBKIT_DIR}/WebAutomationSessionProxy.min.js
+    COMMAND ${PERL_EXECUTABLE} ${JavaScriptCore_SCRIPTS_DIR}/xxd.pl WebAutomationSessionProxyScriptSource ${DERIVED_SOURCES_WEBKIT_DIR}/WebAutomationSessionProxy.min.js ${DERIVED_SOURCES_WEBKIT_DIR}/WebAutomationSessionProxyScriptSource.h
     VERBATIM)
 
-list(APPEND WebKit2_HEADERS
-    ${DERIVED_SOURCES_WEBKIT2_DIR}/WebAutomationSessionProxyScriptSource.h
+list(APPEND WebKit_HEADERS
+    ${DERIVED_SOURCES_WEBKIT_DIR}/WebAutomationSessionProxyScriptSource.h
 )
 
-list(APPEND WebKit2_SOURCES ${WebKit2_DERIVED_SOURCES})
+list(APPEND WebKit_SOURCES ${WebKit_DERIVED_SOURCES})
 
-WEBKIT_FRAMEWORK(WebKit2)
-add_dependencies(WebKit2 WebCore ${WEBKIT2_EXTRA_DEPENDENCIES})
-add_webkit2_prefix_header(WebKit2)
+WEBKIT_FRAMEWORK(WebKit)
+add_dependencies(WebKit WebCore ${WEBKIT_EXTRA_DEPENDENCIES})
+ADD_WEBKIT_PREFIX_HEADER(WebKit)
 
 if (COMPILER_IS_GCC_OR_CLANG AND NOT APPLE)
-    target_link_libraries(WebKit2 -Wl,--start-group WebCore WebCoreDerivedSources -Wl,--end-group)
+    target_link_libraries(WebKit -Wl,--start-group WebCore WebCoreDerivedSources -Wl,--end-group)
 endif ()
 
-if (WebKit2_VERSION_SCRIPT)
-    WEBKIT_ADD_TARGET_PROPERTIES(WebKit2 LINK_FLAGS "${WebKit2_VERSION_SCRIPT}")
+if (WebKit_VERSION_SCRIPT)
+    WEBKIT_ADD_TARGET_PROPERTIES(WebKit LINK_FLAGS "${WebKit_VERSION_SCRIPT}")
 endif ()
 
 add_executable(WebProcess ${WebProcess_SOURCES})
-add_webkit2_prefix_header(WebProcess)
+ADD_WEBKIT_PREFIX_HEADER(WebProcess)
 target_link_libraries(WebProcess ${WebProcess_LIBRARIES})
 
-if (WebKit2_WebProcess_OUTPUT_NAME)
-    set_target_properties(WebProcess PROPERTIES OUTPUT_NAME ${WebKit2_WebProcess_OUTPUT_NAME})
+if (WebKit_WebProcess_OUTPUT_NAME)
+    set_target_properties(WebProcess PROPERTIES OUTPUT_NAME ${WebKit_WebProcess_OUTPUT_NAME})
 endif ()
 
 add_executable(NetworkProcess ${NetworkProcess_SOURCES})
-add_webkit2_prefix_header(NetworkProcess)
+ADD_WEBKIT_PREFIX_HEADER(NetworkProcess)
 target_link_libraries(NetworkProcess ${NetworkProcess_LIBRARIES})
 
-if (WebKit2_NetworkProcess_OUTPUT_NAME)
-    set_target_properties(NetworkProcess PROPERTIES OUTPUT_NAME ${WebKit2_NetworkProcess_OUTPUT_NAME})
+if (WebKit_NetworkProcess_OUTPUT_NAME)
+    set_target_properties(NetworkProcess PROPERTIES OUTPUT_NAME ${WebKit_NetworkProcess_OUTPUT_NAME})
 endif ()
 
 if (NOT "${PORT}" STREQUAL "Mac")
     add_executable(StorageProcess ${StorageProcess_SOURCES})
-    add_webkit2_prefix_header(StorageProcess)
+    ADD_WEBKIT_PREFIX_HEADER(StorageProcess)
     target_link_libraries(StorageProcess ${StorageProcess_LIBRARIES})
     install(TARGETS StorageProcess DESTINATION "${LIBEXEC_INSTALL_DIR}")
 
@@ -935,14 +935,13 @@ if (NOT "${PORT}" STREQUAL "Mac")
         WEBKIT_ADD_TARGET_CXX_FLAGS(StorageProcess -Wno-unused-parameter)
     endif ()
 
-    if (WebKit2_StorageProcess_OUTPUT_NAME)
-        set_target_properties(StorageProcess PROPERTIES OUTPUT_NAME ${WebKit2_StorageProcess_OUTPUT_NAME})
+    if (WebKit_StorageProcess_OUTPUT_NAME)
+        set_target_properties(StorageProcess PROPERTIES OUTPUT_NAME ${WebKit_StorageProcess_OUTPUT_NAME})
     endif ()
 endif ()
 
-# Suppress unused parameter warnings for sources in WebKit2.
 if (COMPILER_IS_GCC_OR_CLANG)
-    WEBKIT_ADD_TARGET_CXX_FLAGS(WebKit2 -Wno-unused-parameter)
+    WEBKIT_ADD_TARGET_CXX_FLAGS(WebKit -Wno-unused-parameter)
     WEBKIT_ADD_TARGET_CXX_FLAGS(WebProcess -Wno-unused-parameter)
     WEBKIT_ADD_TARGET_CXX_FLAGS(NetworkProcess -Wno-unused-parameter)
 endif ()
@@ -950,7 +949,7 @@ endif ()
 if (ENABLE_PLUGIN_PROCESS AND NOT "${PORT}" STREQUAL "Mac")
     add_definitions(-DENABLE_PLUGIN_PROCESS=1)
     add_executable(PluginProcess ${PluginProcess_SOURCES})
-    add_webkit2_prefix_header(PluginProcess)
+    ADD_WEBKIT_PREFIX_HEADER(PluginProcess)
     target_link_libraries(PluginProcess ${PluginProcess_LIBRARIES})
     install(TARGETS PluginProcess DESTINATION "${LIBEXEC_INSTALL_DIR}")
 
@@ -958,8 +957,8 @@ if (ENABLE_PLUGIN_PROCESS AND NOT "${PORT}" STREQUAL "Mac")
         WEBKIT_ADD_TARGET_CXX_FLAGS(PluginProcess -Wno-unused-parameter)
     endif ()
 
-    if (WebKit2_PluginProcess_OUTPUT_NAME)
-      set_target_properties(PluginProcess PROPERTIES OUTPUT_NAME ${WebKit2_PluginProcess_OUTPUT_NAME})
+    if (WebKit_PluginProcess_OUTPUT_NAME)
+      set_target_properties(PluginProcess PROPERTIES OUTPUT_NAME ${WebKit_PluginProcess_OUTPUT_NAME})
     endif ()
 endif ()
 
@@ -970,12 +969,12 @@ if ("${PORT}" STREQUAL "Mac")
     make_directory(${_web_xpc_dir}/_CodeSignature)
 
     add_custom_target(WebContentProcessNib COMMAND
-        ibtool --compile ${_web_xpc_dir}/Resources/WebContentProcess.nib ${WEBKIT2_DIR}/Resources/WebContentProcess.xib
+        ibtool --compile ${_web_xpc_dir}/Resources/WebContentProcess.nib ${WEBKIT_DIR}/Resources/WebContentProcess.xib
         VERBATIM)
-    add_dependencies(WebKit2 WebContentProcessNib)
+    add_dependencies(WebKit WebContentProcessNib)
 
     # FIXME: This shouldn't be two operations.
-    file(COPY ${WEBKIT2_DIR}/WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX.plist DESTINATION ${_web_xpc_dir})
+    file(COPY ${WEBKIT_DIR}/WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX.plist DESTINATION ${_web_xpc_dir})
     file(RENAME ${_web_xpc_dir}/Info-OSX.plist ${_web_xpc_dir}/Info.plist)
 
     set_target_properties(WebProcess PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${_web_xpc_dir}/MacOS")
@@ -986,15 +985,15 @@ if ("${PORT}" STREQUAL "Mac")
     make_directory(${_net_xpc_dir}/_CodeSignature)
 
     # FIXME: This shouldn't be two operations.
-    file(COPY ${WEBKIT2_DIR}/NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX.plist DESTINATION ${_net_xpc_dir})
+    file(COPY ${WEBKIT_DIR}/NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX.plist DESTINATION ${_net_xpc_dir})
     file(RENAME ${_net_xpc_dir}/Info-OSX.plist ${_net_xpc_dir}/Info.plist)
 
     set_target_properties(NetworkProcess PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${_net_xpc_dir}/MacOS")
 else ()
-    WEBKIT_POPULATE_LIBRARY_VERSION(WEBKIT2)
-    set_target_properties(WebKit2 PROPERTIES VERSION ${WEBKIT2_VERSION} SOVERSION ${WEBKIT2_VERSION_MAJOR})
+    WEBKIT_POPULATE_LIBRARY_VERSION(WEBKIT)
+    set_target_properties(WebKit PROPERTIES VERSION ${WEBKIT_VERSION} SOVERSION ${WEBKIT_VERSION_MAJOR})
 
-    install(TARGETS WebKit2 WebProcess NetworkProcess
+    install(TARGETS WebKit WebProcess NetworkProcess
         LIBRARY DESTINATION "${LIB_INSTALL_DIR}"
         RUNTIME DESTINATION "${LIBEXEC_INSTALL_DIR}"
     )
index 4ae1779..4a2e280 100644 (file)
@@ -1,3 +1,19 @@
+2017-09-18  Michael Catanzaro  <mcatanzaro@igalia.com>
+
+        [CMake] Rename WebKit target to WebKitLegacy and rename WebKit2 target to WebKit
+        https://bugs.webkit.org/show_bug.cgi?id=174558
+
+        Reviewed by Alex Christensen.
+
+        * CMakeLists.txt:
+        * PlatformGTK.cmake:
+        * PlatformMac.cmake:
+        * PlatformWPE.cmake:
+        * PlatformWin.cmake:
+        * Shared/gtk/WebKitWaylandProtocol.xml: Renamed from Source/WebKit/Shared/gtk/WebKit2WaylandProtocol.xml.
+        * UIProcess/gtk/WaylandCompositor.cpp:
+        * WebProcess/gtk/WaylandCompositorDisplay.cpp:
+
 2017-09-18  Andy Estes  <aestes@apple.com>
 
         [Cocoa] Upstream sandbox-related WebKitSystemInterface functions
index c18f1cf..669544d 100644 (file)
@@ -1,8 +1,8 @@
-set(WebKit2_OUTPUT_NAME webkit2gtk-${WEBKITGTK_API_VERSION})
-set(WebKit2_WebProcess_OUTPUT_NAME WebKitWebProcess)
-set(WebKit2_NetworkProcess_OUTPUT_NAME WebKitNetworkProcess)
-set(WebKit2_PluginProcess_OUTPUT_NAME WebKitPluginProcess)
-set(WebKit2_StorageProcess_OUTPUT_NAME WebKitStorageProcess)
+set(WebKit_OUTPUT_NAME webkit2gtk-${WEBKITGTK_API_VERSION})
+set(WebKit_WebProcess_OUTPUT_NAME WebKitWebProcess)
+set(WebKit_NetworkProcess_OUTPUT_NAME WebKitNetworkProcess)
+set(WebKit_PluginProcess_OUTPUT_NAME WebKitPluginProcess)
+set(WebKit_StorageProcess_OUTPUT_NAME WebKitStorageProcess)
 
 file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKIT2GTK_API_DIR})
 file(MAKE_DIRECTORY ${FORWARDING_HEADERS_WEBKIT2GTK_DIR})
@@ -22,9 +22,9 @@ add_definitions(-DLOCALEDIR="${CMAKE_INSTALL_FULL_LOCALEDIR}")
 add_definitions(-DLIBDIR="${LIB_INSTALL_DIR}")
 add_definitions(-DDATADIR="${CMAKE_INSTALL_FULL_DATADIR}")
 
-set(WebKit2_USE_PREFIX_HEADER ON)
+set(WebKit_USE_PREFIX_HEADER ON)
 
-list(APPEND WebKit2_SOURCES
+list(APPEND WebKit_SOURCES
     NetworkProcess/CustomProtocols/soup/LegacyCustomProtocolManagerSoup.cpp
 
     NetworkProcess/cache/NetworkCacheCodersSoup.cpp
@@ -405,316 +405,316 @@ list(APPEND WebKit2_SOURCES
     WebProcess/soup/WebProcessSoup.cpp
 )
 
-list(APPEND WebKit2_DERIVED_SOURCES
+list(APPEND WebKit_DERIVED_SOURCES
     ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/InspectorGResourceBundle.c
-    ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/WebKit2ResourcesGResourceBundle.c
+    ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/WebKitResourcesGResourceBundle.c
 
     ${DERIVED_SOURCES_WEBKIT2GTK_API_DIR}/WebKitEnumTypes.cpp
 )
 
 if (ENABLE_WAYLAND_TARGET)
-    list(APPEND WebKit2_DERIVED_SOURCES
-        ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/WebKit2WaylandClientProtocol.c
+    list(APPEND WebKit_DERIVED_SOURCES
+        ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/WebKitWaylandClientProtocol.c
     )
 endif ()
 
 set(WebKit2GTK_INSTALLED_HEADERS
     ${DERIVED_SOURCES_WEBKIT2GTK_API_DIR}/WebKitEnumTypes.h
     ${DERIVED_SOURCES_WEBKIT2GTK_API_DIR}/WebKitVersion.h
-    ${WEBKIT2_DIR}/UIProcess/API/gtk/WebKitApplicationInfo.h
-    ${WEBKIT2_DIR}/UIProcess/API/gtk/WebKitAuthenticationRequest.h
-    ${WEBKIT2_DIR}/UIProcess/API/gtk/WebKitAutocleanups.h
-    ${WEBKIT2_DIR}/UIProcess/API/gtk/WebKitAutomationSession.h
-    ${WEBKIT2_DIR}/UIProcess/API/gtk/WebKitBackForwardList.h
-    ${WEBKIT2_DIR}/UIProcess/API/gtk/WebKitBackForwardListItem.h
-    ${WEBKIT2_DIR}/UIProcess/API/gtk/WebKitColorChooserRequest.h
-    ${WEBKIT2_DIR}/UIProcess/API/gtk/WebKitCredential.h
-    ${WEBKIT2_DIR}/UIProcess/API/gtk/WebKitContextMenu.h
-    ${WEBKIT2_DIR}/UIProcess/API/gtk/WebKitContextMenuActions.h
-    ${WEBKIT2_DIR}/UIProcess/API/gtk/WebKitContextMenuItem.h
-    ${WEBKIT2_DIR}/UIProcess/API/gtk/WebKitCookieManager.h
-    ${WEBKIT2_DIR}/UIProcess/API/gtk/WebKitDefines.h
-    ${WEBKIT2_DIR}/UIProcess/API/gtk/WebKitDownload.h
-    ${WEBKIT2_DIR}/UIProcess/API/gtk/WebKitEditingCommands.h
-    ${WEBKIT2_DIR}/UIProcess/API/gtk/WebKitEditorState.h
-    ${WEBKIT2_DIR}/UIProcess/API/gtk/WebKitError.h
-    ${WEBKIT2_DIR}/UIProcess/API/gtk/WebKitFaviconDatabase.h
-    ${WEBKIT2_DIR}/UIProcess/API/gtk/WebKitFileChooserRequest.h
-    ${WEBKIT2_DIR}/UIProcess/API/gtk/WebKitFindController.h
-    ${WEBKIT2_DIR}/UIProcess/API/gtk/WebKitFormSubmissionRequest.h
-    ${WEBKIT2_DIR}/UIProcess/API/gtk/WebKitForwardDeclarations.h
-    ${WEBKIT2_DIR}/UIProcess/API/gtk/WebKitGeolocationPermissionRequest.h
-    ${WEBKIT2_DIR}/UIProcess/API/gtk/WebKitHitTestResult.h
-    ${WEBKIT2_DIR}/UIProcess/API/gtk/WebKitInstallMissingMediaPluginsPermissionRequest.h
-    ${WEBKIT2_DIR}/UIProcess/API/gtk/WebKitJavascriptResult.h
-    ${WEBKIT2_DIR}/UIProcess/API/gtk/WebKitMimeInfo.h
-    ${WEBKIT2_DIR}/UIProcess/API/gtk/WebKitNavigationAction.h
-    ${WEBKIT2_DIR}/UIProcess/API/gtk/WebKitNavigationPolicyDecision.h
-    ${WEBKIT2_DIR}/UIProcess/API/gtk/WebKitNetworkProxySettings.h
-    ${WEBKIT2_DIR}/UIProcess/API/gtk/WebKitNotificationPermissionRequest.h
-    ${WEBKIT2_DIR}/UIProcess/API/gtk/WebKitNotification.h
-    ${WEBKIT2_DIR}/UIProcess/API/gtk/WebKitOptionMenu.h
-    ${WEBKIT2_DIR}/UIProcess/API/gtk/WebKitOptionMenuItem.h
-    ${WEBKIT2_DIR}/UIProcess/API/gtk/WebKitPermissionRequest.h
-    ${WEBKIT2_DIR}/UIProcess/API/gtk/WebKitPlugin.h
-    ${WEBKIT2_DIR}/UIProcess/API/gtk/WebKitPolicyDecision.h
-    ${WEBKIT2_DIR}/UIProcess/API/gtk/WebKitPrintCustomWidget.h
-    ${WEBKIT2_DIR}/UIProcess/API/gtk/WebKitPrintOperation.h
-    ${WEBKIT2_DIR}/UIProcess/API/gtk/WebKitResponsePolicyDecision.h
-    ${WEBKIT2_DIR}/UIProcess/API/gtk/WebKitScriptDialog.h
-    ${WEBKIT2_DIR}/UIProcess/API/gtk/WebKitSecurityManager.h
-    ${WEBKIT2_DIR}/UIProcess/API/gtk/WebKitSecurityOrigin.h
-    ${WEBKIT2_DIR}/UIProcess/API/gtk/WebKitSettings.h
-    ${WEBKIT2_DIR}/UIProcess/API/gtk/WebKitURIRequest.h
-    ${WEBKIT2_DIR}/UIProcess/API/gtk/WebKitURIResponse.h
-    ${WEBKIT2_DIR}/UIProcess/API/gtk/WebKitURISchemeRequest.h
-    ${WEBKIT2_DIR}/UIProcess/API/gtk/WebKitUserContent.h
-    ${WEBKIT2_DIR}/UIProcess/API/gtk/WebKitUserContentManager.h
-    ${WEBKIT2_DIR}/UIProcess/API/gtk/WebKitUserMediaPermissionRequest.h
-    ${WEBKIT2_DIR}/UIProcess/API/gtk/WebKitWebContext.h
-    ${WEBKIT2_DIR}/UIProcess/API/gtk/WebKitWebInspector.h
-    ${WEBKIT2_DIR}/UIProcess/API/gtk/WebKitWebResource.h
-    ${WEBKIT2_DIR}/UIProcess/API/gtk/WebKitWebView.h
-    ${WEBKIT2_DIR}/UIProcess/API/gtk/WebKitWebViewBase.h
-    ${WEBKIT2_DIR}/UIProcess/API/gtk/WebKitWebViewSessionState.h
-    ${WEBKIT2_DIR}/UIProcess/API/gtk/WebKitWebsiteData.h
-    ${WEBKIT2_DIR}/UIProcess/API/gtk/WebKitWebsiteDataManager.h
-    ${WEBKIT2_DIR}/UIProcess/API/gtk/WebKitWindowProperties.h
-    ${WEBKIT2_DIR}/UIProcess/API/gtk/webkit2.h
+    ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitApplicationInfo.h
+    ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitAuthenticationRequest.h
+    ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitAutocleanups.h
+    ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitAutomationSession.h
+    ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitBackForwardList.h
+    ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitBackForwardListItem.h
+    ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitColorChooserRequest.h
+    ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitCredential.h
+    ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitContextMenu.h
+    ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitContextMenuActions.h
+    ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitContextMenuItem.h
+    ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitCookieManager.h
+    ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitDefines.h
+    ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitDownload.h
+    ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitEditingCommands.h
+    ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitEditorState.h
+    ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitError.h
+    ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitFaviconDatabase.h
+    ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitFileChooserRequest.h
+    ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitFindController.h
+    ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitFormSubmissionRequest.h
+    ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitForwardDeclarations.h
+    ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitGeolocationPermissionRequest.h
+    ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitHitTestResult.h
+    ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitInstallMissingMediaPluginsPermissionRequest.h
+    ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitJavascriptResult.h
+    ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitMimeInfo.h
+    ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitNavigationAction.h
+    ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitNavigationPolicyDecision.h
+    ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitNetworkProxySettings.h
+    ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitNotificationPermissionRequest.h
+    ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitNotification.h
+    ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitOptionMenu.h
+    ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitOptionMenuItem.h
+    ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitPermissionRequest.h
+    ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitPlugin.h
+    ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitPolicyDecision.h
+    ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitPrintCustomWidget.h
+    ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitPrintOperation.h
+    ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitResponsePolicyDecision.h
+    ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitScriptDialog.h
+    ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitSecurityManager.h
+    ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitSecurityOrigin.h
+    ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitSettings.h
+    ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitURIRequest.h
+    ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitURIResponse.h
+    ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitURISchemeRequest.h
+    ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitUserContent.h
+    ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitUserContentManager.h
+    ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitUserMediaPermissionRequest.h
+    ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitWebContext.h
+    ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitWebInspector.h
+    ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitWebResource.h
+    ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitWebView.h
+    ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitWebViewBase.h
+    ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitWebViewSessionState.h
+    ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitWebsiteData.h
+    ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitWebsiteDataManager.h
+    ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitWindowProperties.h
+    ${WEBKIT_DIR}/UIProcess/API/gtk/webkit2.h
 )
 
 set(WebKit2WebExtension_INSTALLED_HEADERS
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/WebKitConsoleMessage.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/WebKitFrame.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/WebKitScriptWorld.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/WebKitWebEditor.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/WebKitWebExtension.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/WebKitWebExtensionAutocleanups.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/WebKitWebHitTestResult.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/WebKitWebPage.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/webkit-web-extension.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/WebKitConsoleMessage.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/WebKitFrame.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/WebKitScriptWorld.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/WebKitWebEditor.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/WebKitWebExtension.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/WebKitWebExtensionAutocleanups.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/WebKitWebHitTestResult.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/WebKitWebPage.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/webkit-web-extension.h
 )
 
 set(WebKitDOM_INSTALLED_HEADERS
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/webkitdomautocleanups.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/webkitdomdefines.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/webkitdom.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMAttr.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMBlob.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCDATASection.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCharacterData.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMClientRect.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMClientRectList.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMComment.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCSSRule.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCSSRuleList.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCSSStyleDeclaration.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCSSStyleSheet.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCSSValue.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCustom.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCustomUnstable.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDeprecated.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDocumentFragment.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDocumentFragmentUnstable.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDocument.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDocumentType.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDocumentUnstable.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDOMImplementation.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDOMSelection.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDOMTokenList.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDOMWindow.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDOMWindowUnstable.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMElement.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMElementUnstable.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMEvent.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMEventTarget.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMFile.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMFileList.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLAnchorElement.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLAppletElement.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLAreaElement.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLBaseElement.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLBodyElement.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLBRElement.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLButtonElement.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLCanvasElement.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLCollection.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLDirectoryElement.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLDivElement.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLDListElement.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLDocument.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLElement.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLElementUnstable.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLEmbedElement.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLFieldSetElement.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLFontElement.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLFormElement.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLFrameElement.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLFrameSetElement.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLHeadElement.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLHeadingElement.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLHRElement.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLHtmlElement.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLIFrameElement.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLImageElement.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLInputElement.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLLabelElement.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLLegendElement.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLLIElement.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLLinkElement.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLMapElement.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLMarqueeElement.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLMenuElement.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLMetaElement.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLModElement.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLObjectElement.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLOListElement.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLOptGroupElement.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLOptionElement.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLOptionsCollection.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLParagraphElement.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLParamElement.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLPreElement.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLQuoteElement.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLScriptElement.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLSelectElement.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLStyleElement.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTableCaptionElement.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTableCellElement.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTableColElement.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTableElement.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTableRowElement.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTableSectionElement.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTextAreaElement.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTitleElement.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLUListElement.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMKeyboardEvent.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMMediaList.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMMouseEvent.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMNamedNodeMap.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMNodeFilter.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMNode.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMNodeIterator.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMNodeList.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMObject.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMProcessingInstruction.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMRange.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMRangeUnstable.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMStyleSheet.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMStyleSheetList.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMText.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMTreeWalker.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMUIEvent.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMWheelEvent.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMXPathExpression.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMXPathNSResolver.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMXPathResult.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/webkitdomautocleanups.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/webkitdomdefines.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/webkitdom.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMAttr.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMBlob.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCDATASection.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCharacterData.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMClientRect.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMClientRectList.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMComment.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCSSRule.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCSSRuleList.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCSSStyleDeclaration.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCSSStyleSheet.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCSSValue.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCustom.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCustomUnstable.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDeprecated.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDocumentFragment.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDocumentFragmentUnstable.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDocument.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDocumentType.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDocumentUnstable.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDOMImplementation.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDOMSelection.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDOMTokenList.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDOMWindow.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDOMWindowUnstable.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMElement.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMElementUnstable.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMEvent.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMEventTarget.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMFile.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMFileList.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLAnchorElement.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLAppletElement.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLAreaElement.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLBaseElement.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLBodyElement.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLBRElement.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLButtonElement.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLCanvasElement.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLCollection.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLDirectoryElement.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLDivElement.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLDListElement.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLDocument.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLElement.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLElementUnstable.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLEmbedElement.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLFieldSetElement.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLFontElement.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLFormElement.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLFrameElement.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLFrameSetElement.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLHeadElement.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLHeadingElement.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLHRElement.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLHtmlElement.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLIFrameElement.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLImageElement.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLInputElement.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLLabelElement.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLLegendElement.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLLIElement.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLLinkElement.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLMapElement.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLMarqueeElement.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLMenuElement.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLMetaElement.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLModElement.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLObjectElement.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLOListElement.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLOptGroupElement.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLOptionElement.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLOptionsCollection.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLParagraphElement.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLParamElement.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLPreElement.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLQuoteElement.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLScriptElement.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLSelectElement.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLStyleElement.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTableCaptionElement.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTableCellElement.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTableColElement.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTableElement.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTableRowElement.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTableSectionElement.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTextAreaElement.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTitleElement.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLUListElement.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMKeyboardEvent.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMMediaList.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMMouseEvent.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMNamedNodeMap.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMNodeFilter.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMNode.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMNodeIterator.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMNodeList.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMObject.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMProcessingInstruction.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMRange.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMRangeUnstable.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMStyleSheet.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMStyleSheetList.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMText.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMTreeWalker.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMUIEvent.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMWheelEvent.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMXPathExpression.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMXPathNSResolver.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMXPathResult.h
 )
 
 set(WebKitDOM_GTKDOC_HEADERS
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMAttr.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMBlob.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCDATASection.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCharacterData.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMClientRect.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMClientRectList.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMComment.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCSSRule.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCSSRuleList.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCSSStyleDeclaration.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCSSStyleSheet.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCSSValue.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCustom.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDeprecated.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDocumentFragment.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDocument.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDocumentType.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDOMImplementation.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDOMSelection.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDOMTokenList.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDOMWindow.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMElement.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMEvent.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMEventTarget.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMFile.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMFileList.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLAnchorElement.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLAppletElement.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLAreaElement.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLBaseElement.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLBodyElement.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLBRElement.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLButtonElement.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLCanvasElement.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLCollection.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLDirectoryElement.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLDivElement.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLDListElement.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLDocument.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLElement.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLEmbedElement.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLFieldSetElement.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLFontElement.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLFormElement.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLFrameElement.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLFrameSetElement.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLHeadElement.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLHeadingElement.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLHRElement.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLHtmlElement.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLIFrameElement.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLImageElement.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLInputElement.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLLabelElement.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLLegendElement.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLLIElement.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLLinkElement.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLMapElement.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLMarqueeElement.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLMenuElement.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLMetaElement.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLModElement.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLObjectElement.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLOListElement.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLOptGroupElement.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLOptionElement.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLOptionsCollection.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLParagraphElement.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLParamElement.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLPreElement.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLQuoteElement.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLScriptElement.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLSelectElement.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLStyleElement.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTableCaptionElement.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTableCellElement.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTableColElement.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTableElement.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTableRowElement.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTableSectionElement.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTextAreaElement.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTitleElement.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLUListElement.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMKeyboardEvent.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMMediaList.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMMouseEvent.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMNamedNodeMap.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMNodeFilter.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMNode.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMNodeIterator.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMNodeList.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMObject.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMProcessingInstruction.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMRange.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMStyleSheet.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMStyleSheetList.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMText.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMTreeWalker.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMUIEvent.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMWheelEvent.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMXPathExpression.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMXPathNSResolver.h
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMXPathResult.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMAttr.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMBlob.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCDATASection.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCharacterData.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMClientRect.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMClientRectList.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMComment.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCSSRule.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCSSRuleList.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCSSStyleDeclaration.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCSSStyleSheet.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCSSValue.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCustom.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDeprecated.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDocumentFragment.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDocument.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDocumentType.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDOMImplementation.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDOMSelection.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDOMTokenList.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDOMWindow.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMElement.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMEvent.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMEventTarget.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMFile.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMFileList.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLAnchorElement.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLAppletElement.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLAreaElement.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLBaseElement.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLBodyElement.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLBRElement.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLButtonElement.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLCanvasElement.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLCollection.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLDirectoryElement.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLDivElement.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLDListElement.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLDocument.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLElement.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLEmbedElement.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLFieldSetElement.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLFontElement.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLFormElement.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLFrameElement.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLFrameSetElement.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLHeadElement.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLHeadingElement.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLHRElement.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLHtmlElement.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLIFrameElement.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLImageElement.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLInputElement.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLLabelElement.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLLegendElement.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLLIElement.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLLinkElement.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLMapElement.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLMarqueeElement.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLMenuElement.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLMetaElement.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLModElement.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLObjectElement.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLOListElement.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLOptGroupElement.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLOptionElement.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLOptionsCollection.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLParagraphElement.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLParamElement.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLPreElement.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLQuoteElement.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLScriptElement.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLSelectElement.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLStyleElement.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTableCaptionElement.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTableCellElement.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTableColElement.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTableElement.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTableRowElement.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTableSectionElement.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTextAreaElement.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTitleElement.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLUListElement.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMKeyboardEvent.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMMediaList.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMMouseEvent.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMNamedNodeMap.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMNodeFilter.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMNode.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMNodeIterator.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMNodeList.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMObject.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMProcessingInstruction.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMRange.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMStyleSheet.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMStyleSheetList.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMText.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMTreeWalker.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMUIEvent.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMWheelEvent.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMXPathExpression.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMXPathNSResolver.h
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMXPathResult.h
 )
 
 set(InspectorFiles
@@ -754,61 +754,61 @@ add_custom_command(
 )
 
 # This is necessary because of a conflict between the GTK+ API WebKitVersion.h and one generated by WebCore.
-list(INSERT WebKit2_INCLUDE_DIRECTORIES 0
+list(INSERT WebKit_INCLUDE_DIRECTORIES 0
     "${FORWARDING_HEADERS_WEBKIT2GTK_DIR}"
     "${FORWARDING_HEADERS_WEBKIT2GTK_EXTENSION_DIR}"
     "${DERIVED_SOURCES_WEBKIT2GTK_API_DIR}"
     "${DERIVED_SOURCES_WEBKIT2GTK_DIR}"
 )
 
-list(APPEND WebKit2_INCLUDE_DIRECTORIES
-    "${WEBKIT2_DIR}/PluginProcess/unix"
-    "${WEBKIT2_DIR}/NetworkProcess/CustomProtocols/soup"
-    "${WEBKIT2_DIR}/NetworkProcess/Downloads/soup"
-    "${WEBKIT2_DIR}/NetworkProcess/gtk"
-    "${WEBKIT2_DIR}/NetworkProcess/soup"
-    "${WEBKIT2_DIR}/NetworkProcess/unix"
-    "${WEBKIT2_DIR}/Platform/IPC/glib"
-    "${WEBKIT2_DIR}/Platform/IPC/unix"
-    "${WEBKIT2_DIR}/Platform/classifier"
-    "${WEBKIT2_DIR}/Shared/API/c/gtk"
-    "${WEBKIT2_DIR}/Shared/API/glib"
-    "${WEBKIT2_DIR}/Shared/CoordinatedGraphics"
-    "${WEBKIT2_DIR}/Shared/CoordinatedGraphics/threadedcompositor"
-    "${WEBKIT2_DIR}/Shared/Plugins/unix"
-    "${WEBKIT2_DIR}/Shared/glib"
-    "${WEBKIT2_DIR}/Shared/gtk"
-    "${WEBKIT2_DIR}/Shared/linux"
-    "${WEBKIT2_DIR}/Shared/soup"
-    "${WEBKIT2_DIR}/Shared/unix"
-    "${WEBKIT2_DIR}/StorageProcess/unix"
-    "${WEBKIT2_DIR}/UIProcess/API/C/cairo"
-    "${WEBKIT2_DIR}/UIProcess/API/C/gtk"
-    "${WEBKIT2_DIR}/UIProcess/API/glib"
-    "${WEBKIT2_DIR}/UIProcess/API/gtk"
-    "${WEBKIT2_DIR}/UIProcess/Network/CustomProtocols/soup"
-    "${WEBKIT2_DIR}/UIProcess/Plugins/gtk"
-    "${WEBKIT2_DIR}/UIProcess/glib"
-    "${WEBKIT2_DIR}/UIProcess/gstreamer"
-    "${WEBKIT2_DIR}/UIProcess/gtk"
-    "${WEBKIT2_DIR}/UIProcess/linux"
-    "${WEBKIT2_DIR}/UIProcess/soup"
-    "${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/glib"
-    "${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk"
-    "${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM"
-    "${WEBKIT2_DIR}/WebProcess/Plugins/Netscape/unix"
-    "${WEBKIT2_DIR}/WebProcess/Plugins/Netscape/x11"
-    "${WEBKIT2_DIR}/WebProcess/gtk"
-    "${WEBKIT2_DIR}/WebProcess/soup"
-    "${WEBKIT2_DIR}/WebProcess/unix"
-    "${WEBKIT2_DIR}/WebProcess/WebCoreSupport/gtk"
-    "${WEBKIT2_DIR}/WebProcess/WebCoreSupport/soup"
-    "${WEBKIT2_DIR}/WebProcess/WebPage/CoordinatedGraphics"
-    "${WEBKIT2_DIR}/WebProcess/WebPage/atk"
-    "${WEBKIT2_DIR}/WebProcess/WebPage/gtk"
+list(APPEND WebKit_INCLUDE_DIRECTORIES
+    "${WEBKIT_DIR}/PluginProcess/unix"
+    "${WEBKIT_DIR}/NetworkProcess/CustomProtocols/soup"
+    "${WEBKIT_DIR}/NetworkProcess/Downloads/soup"
+    "${WEBKIT_DIR}/NetworkProcess/gtk"
+    "${WEBKIT_DIR}/NetworkProcess/soup"
+    "${WEBKIT_DIR}/NetworkProcess/unix"
+    "${WEBKIT_DIR}/Platform/IPC/glib"
+    "${WEBKIT_DIR}/Platform/IPC/unix"
+    "${WEBKIT_DIR}/Platform/classifier"
+    "${WEBKIT_DIR}/Shared/API/c/gtk"
+    "${WEBKIT_DIR}/Shared/API/glib"
+    "${WEBKIT_DIR}/Shared/CoordinatedGraphics"
+    "${WEBKIT_DIR}/Shared/CoordinatedGraphics/threadedcompositor"
+    "${WEBKIT_DIR}/Shared/Plugins/unix"
+    "${WEBKIT_DIR}/Shared/glib"
+    "${WEBKIT_DIR}/Shared/gtk"
+    "${WEBKIT_DIR}/Shared/linux"
+    "${WEBKIT_DIR}/Shared/soup"
+    "${WEBKIT_DIR}/Shared/unix"
+    "${WEBKIT_DIR}/StorageProcess/unix"
+    "${WEBKIT_DIR}/UIProcess/API/C/cairo"
+    "${WEBKIT_DIR}/UIProcess/API/C/gtk"
+    "${WEBKIT_DIR}/UIProcess/API/glib"
+    "${WEBKIT_DIR}/UIProcess/API/gtk"
+    "${WEBKIT_DIR}/UIProcess/Network/CustomProtocols/soup"
+    "${WEBKIT_DIR}/UIProcess/Plugins/gtk"
+    "${WEBKIT_DIR}/UIProcess/glib"
+    "${WEBKIT_DIR}/UIProcess/gstreamer"
+    "${WEBKIT_DIR}/UIProcess/gtk"
+    "${WEBKIT_DIR}/UIProcess/linux"
+    "${WEBKIT_DIR}/UIProcess/soup"
+    "${WEBKIT_DIR}/WebProcess/InjectedBundle/API/glib"
+    "${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk"
+    "${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM"
+    "${WEBKIT_DIR}/WebProcess/Plugins/Netscape/unix"
+    "${WEBKIT_DIR}/WebProcess/Plugins/Netscape/x11"
+    "${WEBKIT_DIR}/WebProcess/gtk"
+    "${WEBKIT_DIR}/WebProcess/soup"
+    "${WEBKIT_DIR}/WebProcess/unix"
+    "${WEBKIT_DIR}/WebProcess/WebCoreSupport/gtk"
+    "${WEBKIT_DIR}/WebProcess/WebCoreSupport/soup"
+    "${WEBKIT_DIR}/WebProcess/WebPage/CoordinatedGraphics"
+    "${WEBKIT_DIR}/WebProcess/WebPage/atk"
+    "${WEBKIT_DIR}/WebProcess/WebPage/gtk"
 )
 
-list(APPEND WebKit2_SYSTEM_INCLUDE_DIRECTORIES
+list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES
     ${CAIRO_INCLUDE_DIRS}
     ${ENCHANT_INCLUDE_DIRS}
     ${GSTREAMER_INCLUDE_DIRS}
@@ -818,15 +818,15 @@ list(APPEND WebKit2_SYSTEM_INCLUDE_DIRECTORIES
 )
 
 if (USE_LIBNOTIFY)
-list(APPEND WebKit2_SYSTEM_INCLUDE_DIRECTORIES
+list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES
     ${LIBNOTIFY_INCLUDE_DIRS}
 )
 endif ()
 
-set(WebKit2CommonIncludeDirectories ${WebKit2_INCLUDE_DIRECTORIES})
-set(WebKit2CommonSystemIncludeDirectories ${WebKit2_SYSTEM_INCLUDE_DIRECTORIES})
+set(WebKitCommonIncludeDirectories ${WebKit_INCLUDE_DIRECTORIES})
+set(WebKitCommonSystemIncludeDirectories ${WebKit_SYSTEM_INCLUDE_DIRECTORIES})
 
-list(APPEND WebKit2_SYSTEM_INCLUDE_DIRECTORIES
+list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES
     ${GLIB_INCLUDE_DIRS}
     ${GTK_INCLUDE_DIRS}
     ${GTK_UNIX_PRINT_INCLUDE_DIRS}
@@ -844,17 +844,17 @@ list(APPEND StorageProcess_SOURCES
     StorageProcess/EntryPoint/unix/StorageProcessMain.cpp
 )
 
-set(SharedWebKit2Libraries
-    ${WebKit2_LIBRARIES}
+set(SharedWebKitLibraries
+    ${WebKit_LIBRARIES}
 )
 
-list(APPEND WebKit2_LIBRARIES
+list(APPEND WebKit_LIBRARIES
     WebCorePlatformGTK
     ${GTK_UNIX_PRINT_LIBRARIES}
 )
 
 if (LIBNOTIFY_FOUND)
-list(APPEND WebKit2_LIBRARIES
+list(APPEND WebKit_LIBRARIES
     ${LIBNOTIFY_LIBRARIES}
 )
 endif ()
@@ -867,9 +867,9 @@ add_custom_command(
            ${DERIVED_SOURCES_WEBKIT2GTK_API_DIR}/WebKitEnumTypes.cpp
     DEPENDS ${WebKit2GTK_ENUM_GENERATION_HEADERS}
 
-    COMMAND glib-mkenums --template ${WEBKIT2_DIR}/UIProcess/API/gtk/WebKitEnumTypes.h.template ${WebKit2GTK_ENUM_GENERATION_HEADERS} | sed s/web_kit/webkit/ | sed s/WEBKIT_TYPE_KIT/WEBKIT_TYPE/ > ${DERIVED_SOURCES_WEBKIT2GTK_API_DIR}/WebKitEnumTypes.h
+    COMMAND glib-mkenums --template ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitEnumTypes.h.template ${WebKit2GTK_ENUM_GENERATION_HEADERS} | sed s/web_kit/webkit/ | sed s/WEBKIT_TYPE_KIT/WEBKIT_TYPE/ > ${DERIVED_SOURCES_WEBKIT2GTK_API_DIR}/WebKitEnumTypes.h
 
-    COMMAND glib-mkenums --template ${WEBKIT2_DIR}/UIProcess/API/gtk/WebKitEnumTypes.cpp.template ${WebKit2GTK_ENUM_GENERATION_HEADERS} | sed s/web_kit/webkit/ > ${DERIVED_SOURCES_WEBKIT2GTK_API_DIR}/WebKitEnumTypes.cpp
+    COMMAND glib-mkenums --template ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitEnumTypes.cpp.template ${WebKit2GTK_ENUM_GENERATION_HEADERS} | sed s/web_kit/webkit/ > ${DERIVED_SOURCES_WEBKIT2GTK_API_DIR}/WebKitEnumTypes.cpp
     VERBATIM)
 
 add_custom_command(
@@ -888,7 +888,7 @@ add_custom_command(
     VERBATIM
 )
 
-set(WebKit2Resources
+set(WebKitResources
     "        <file alias=\"images/missingImage\">missingImage.png</file>\n"
     "        <file alias=\"images/missingImage@2x\">missingImage@2x.png</file>\n"
     "        <file alias=\"images/panIcon\">panIcon.png</file>\n"
@@ -897,41 +897,41 @@ set(WebKit2Resources
 )
 
 if (ENABLE_ICONDATABASE)
-    list(APPEND WebKit2Resources
+    list(APPEND WebKitResources
         "        <file alias=\"images/urlIcon\">urlIcon.png</file>\n"
     )
 endif ()
 
 if (ENABLE_WEB_AUDIO)
-    list(APPEND WebKit2Resources
+    list(APPEND WebKitResources
         "        <file alias=\"audio/Composite\">Composite.wav</file>\n"
     )
 endif ()
 
-file(WRITE ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/WebKit2ResourcesGResourceBundle.xml
+file(WRITE ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/WebKitResourcesGResourceBundle.xml
     "<?xml version=1.0 encoding=UTF-8?>\n"
     "<gresources>\n"
     "    <gresource prefix=\"/org/webkitgtk/resources\">\n"
-    ${WebKit2Resources}
+    ${WebKitResources}
     "    </gresource>\n"
     "</gresources>\n"
 )
 
 add_custom_command(
-    OUTPUT ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/WebKit2ResourcesGResourceBundle.c
-    DEPENDS ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/WebKit2ResourcesGResourceBundle.xml
-    COMMAND glib-compile-resources --generate --sourcedir=${CMAKE_SOURCE_DIR}/Source/WebCore/Resources --sourcedir=${CMAKE_SOURCE_DIR}/Source/WebCore/platform/audio/resources --target=${DERIVED_SOURCES_WEBKIT2GTK_DIR}/WebKit2ResourcesGResourceBundle.c ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/WebKit2ResourcesGResourceBundle.xml
+    OUTPUT ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/WebKitResourcesGResourceBundle.c
+    DEPENDS ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/WebKitResourcesGResourceBundle.xml
+    COMMAND glib-compile-resources --generate --sourcedir=${CMAKE_SOURCE_DIR}/Source/WebCore/Resources --sourcedir=${CMAKE_SOURCE_DIR}/Source/WebCore/platform/audio/resources --target=${DERIVED_SOURCES_WEBKIT2GTK_DIR}/WebKitResourcesGResourceBundle.c ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/WebKitResourcesGResourceBundle.xml
     VERBATIM
 )
 
 if (ENABLE_WAYLAND_TARGET)
     # Wayland protocol extension.
     add_custom_command(
-        OUTPUT ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/WebKit2WaylandClientProtocol.c
-        DEPENDS ${WEBKIT2_DIR}/Shared/gtk/WebKit2WaylandProtocol.xml
-        COMMAND wayland-scanner server-header < ${WEBKIT2_DIR}/Shared/gtk/WebKit2WaylandProtocol.xml > ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/WebKit2WaylandServerProtocol.h
-        COMMAND wayland-scanner client-header < ${WEBKIT2_DIR}/Shared/gtk/WebKit2WaylandProtocol.xml > ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/WebKit2WaylandClientProtocol.h
-        COMMAND wayland-scanner code < ${WEBKIT2_DIR}/Shared/gtk/WebKit2WaylandProtocol.xml > ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/WebKit2WaylandClientProtocol.c
+        OUTPUT ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/WebKitWaylandClientProtocol.c
+        DEPENDS ${WEBKIT_DIR}/Shared/gtk/WebKitWaylandProtocol.xml
+        COMMAND wayland-scanner server-header < ${WEBKIT_DIR}/Shared/gtk/WebKitWaylandProtocol.xml > ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/WebKitWaylandServerProtocol.h
+        COMMAND wayland-scanner client-header < ${WEBKIT_DIR}/Shared/gtk/WebKitWaylandProtocol.xml > ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/WebKitWaylandClientProtocol.h
+        COMMAND wayland-scanner code < ${WEBKIT_DIR}/Shared/gtk/WebKitWaylandProtocol.xml > ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/WebKitWaylandClientProtocol.c
     )
 endif ()
 
@@ -939,7 +939,7 @@ if (ENABLE_PLUGIN_PROCESS_GTK2)
     set(PluginProcessGTK2_EXECUTABLE_NAME WebKitPluginProcess2)
 
     # FIXME: We should figure out a way to avoid compiling files that are common between the plugin
-    # process and WebKit2 only once instead of recompiling them for the plugin process.
+    # process and WebKit only once instead of recompiling them for the plugin process.
     list(APPEND PluginProcessGTK2_SOURCES
         Platform/Logging.cpp
         Platform/Module.cpp
@@ -1029,15 +1029,15 @@ if (ENABLE_PLUGIN_PROCESS_GTK2)
         WebProcess/Plugins/Netscape/unix/NetscapePluginUnix.cpp
         WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp
 
-        ${DERIVED_SOURCES_WEBKIT2_DIR}/PluginControllerProxyMessageReceiver.cpp
-        ${DERIVED_SOURCES_WEBKIT2_DIR}/PluginProcessMessageReceiver.cpp
-        ${DERIVED_SOURCES_WEBKIT2_DIR}/WebProcessConnectionMessageReceiver.cpp
-        ${DERIVED_SOURCES_WEBKIT2_DIR}/NPObjectMessageReceiverMessageReceiver.cpp
-        ${DERIVED_SOURCES_WEBKIT2_DIR}/ChildProcessMessageReceiver.cpp
+        ${DERIVED_SOURCES_WEBKIT_DIR}/PluginControllerProxyMessageReceiver.cpp
+        ${DERIVED_SOURCES_WEBKIT_DIR}/PluginProcessMessageReceiver.cpp
+        ${DERIVED_SOURCES_WEBKIT_DIR}/WebProcessConnectionMessageReceiver.cpp
+        ${DERIVED_SOURCES_WEBKIT_DIR}/NPObjectMessageReceiverMessageReceiver.cpp
+        ${DERIVED_SOURCES_WEBKIT_DIR}/ChildProcessMessageReceiver.cpp
     )
 
     add_executable(WebKitPluginProcess2 ${PluginProcessGTK2_SOURCES})
-    add_webkit2_prefix_header(WebKitPluginProcess2)
+    ADD_WEBKIT_PREFIX_HEADER(WebKitPluginProcess2)
 
     # We need ENABLE_PLUGIN_PROCESS for all targets in this directory, but
     # we only want GTK_API_VERSION_2 for the plugin process target.
@@ -1047,22 +1047,22 @@ if (ENABLE_PLUGIN_PROCESS_GTK2)
         PROPERTY COMPILE_DEFINITIONS GTK_API_VERSION_2=1
     )
     target_include_directories(WebKitPluginProcess2 PRIVATE
-        ${WebKit2CommonIncludeDirectories}
+        ${WebKitCommonIncludeDirectories}
     )
     target_include_directories(WebKitPluginProcess2 SYSTEM PRIVATE
-         ${WebKit2CommonSystemIncludeDirectories}
+         ${WebKitCommonSystemIncludeDirectories}
          ${GTK2_INCLUDE_DIRS}
          ${GDK2_INCLUDE_DIRS}
     )
 
     set(WebKitPluginProcess2_LIBRARIES
-        ${SharedWebKit2Libraries}
+        ${SharedWebKitLibraries}
         WebCorePlatformGTK2
     )
     ADD_WHOLE_ARCHIVE_TO_LIBRARIES(WebKitPluginProcess2_LIBRARIES)
     target_link_libraries(WebKitPluginProcess2 ${WebKitPluginProcess2_LIBRARIES})
 
-    add_dependencies(WebKitPluginProcess2 WebKit2)
+    add_dependencies(WebKitPluginProcess2 WebKit)
 
     install(TARGETS WebKitPluginProcess2 DESTINATION "${LIBEXEC_INSTALL_DIR}")
 
@@ -1078,20 +1078,20 @@ list(APPEND PluginProcess_SOURCES
 
 # Commands for building the built-in injected bundle.
 include_directories(
-    "${WEBKIT2_DIR}/Platform"
-    "${WEBKIT2_DIR}/Shared"
-    "${WEBKIT2_DIR}/Shared/API/c"
-    "${WEBKIT2_DIR}/UIProcess/API/C"
-    "${WEBKIT2_DIR}/WebProcess/InjectedBundle"
-    "${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/c"
+    "${WEBKIT_DIR}/Platform"
+    "${WEBKIT_DIR}/Shared"
+    "${WEBKIT_DIR}/Shared/API/c"
+    "${WEBKIT_DIR}/UIProcess/API/C"
+    "${WEBKIT_DIR}/WebProcess/InjectedBundle"
+    "${WEBKIT_DIR}/WebProcess/InjectedBundle/API/c"
     "${DERIVED_SOURCES_DIR}/InjectedBundle"
     "${FORWARDING_HEADERS_DIR}"
     "${FORWARDING_HEADERS_WEBKIT2GTK_DIR}"
 )
 
-add_library(webkit2gtkinjectedbundle MODULE "${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/glib/WebKitInjectedBundleMain.cpp")
-add_webkit2_prefix_header(webkit2gtkinjectedbundle)
-target_link_libraries(webkit2gtkinjectedbundle WebKit2)
+add_library(webkit2gtkinjectedbundle MODULE "${WEBKIT_DIR}/WebProcess/InjectedBundle/API/glib/WebKitInjectedBundleMain.cpp")
+ADD_WEBKIT_PREFIX_HEADER(webkit2gtkinjectedbundle)
+target_link_libraries(webkit2gtkinjectedbundle WebKit)
 
 if (COMPILER_IS_GCC_OR_CLANG)
     WEBKIT_ADD_TARGET_CXX_FLAGS(webkit2gtkinjectedbundle -Wno-unused-parameter)
@@ -1123,7 +1123,7 @@ string(REGEX MATCHALL "-L[^ ]*"
 
 add_custom_command(
     OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir
-    DEPENDS WebKit2
+    DEPENDS WebKit
     DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir
     COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations LDFLAGS=
         ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}"
@@ -1152,16 +1152,16 @@ add_custom_command(
         -DBUILDING_WEBKIT
         -DWEBKIT2_COMPILATION
         -I${CMAKE_SOURCE_DIR}/Source
-        -I${WEBKIT2_DIR}
+        -I${WEBKIT_DIR}
         -I${JAVASCRIPTCORE_DIR}
         -I${JAVASCRIPTCORE_DIR}/ForwardingHeaders
         -I${DERIVED_SOURCES_DIR}
         -I${DERIVED_SOURCES_WEBKIT2GTK_DIR}
         -I${FORWARDING_HEADERS_WEBKIT2GTK_DIR}
         ${WebKit2GTK_INSTALLED_HEADERS}
-        ${WEBKIT2_DIR}/Shared/API/glib/*.cpp
-        ${WEBKIT2_DIR}/UIProcess/API/glib/*.cpp
-        ${WEBKIT2_DIR}/UIProcess/API/gtk/*.cpp
+        ${WEBKIT_DIR}/Shared/API/glib/*.cpp
+        ${WEBKIT_DIR}/UIProcess/API/glib/*.cpp
+        ${WEBKIT_DIR}/UIProcess/API/gtk/*.cpp
 )
 
 add_custom_command(
@@ -1197,7 +1197,7 @@ add_custom_command(
         -DBUILDING_WEBKIT
         -DWEBKIT2_COMPILATION
         -I${CMAKE_SOURCE_DIR}/Source
-        -I${WEBKIT2_DIR}
+        -I${WEBKIT_DIR}
         -I${JAVASCRIPTCORE_DIR}
         -I${JAVASCRIPTCORE_DIR}/ForwardingHeaders
         -I${DERIVED_SOURCES_DIR}
@@ -1205,21 +1205,21 @@ add_custom_command(
         -I${FORWARDING_HEADERS_DIR}
         -I${FORWARDING_HEADERS_WEBKIT2GTK_DIR}
         -I${FORWARDING_HEADERS_WEBKIT2GTK_EXTENSION_DIR}
-        -I${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk
+        -I${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk
         ${WebKitDOM_INSTALLED_HEADERS}
         ${WebKit2WebExtension_INSTALLED_HEADERS}
-        ${WEBKIT2_DIR}/Shared/API/glib/WebKitContextMenu.cpp
-        ${WEBKIT2_DIR}/Shared/API/glib/WebKitContextMenuItem.cpp
-        ${WEBKIT2_DIR}/Shared/API/glib/WebKitHitTestResult.cpp
-        ${WEBKIT2_DIR}/Shared/API/glib/WebKitURIRequest.cpp
-        ${WEBKIT2_DIR}/Shared/API/glib/WebKitURIResponse.cpp
-        ${WEBKIT2_DIR}/UIProcess/API/gtk/WebKitContextMenu.h
-        ${WEBKIT2_DIR}/UIProcess/API/gtk/WebKitContextMenuActions.h
-        ${WEBKIT2_DIR}/UIProcess/API/gtk/WebKitContextMenuItem.h
-        ${WEBKIT2_DIR}/UIProcess/API/gtk/WebKitHitTestResult.h
-        ${WEBKIT2_DIR}/UIProcess/API/gtk/WebKitURIRequest.h
-        ${WEBKIT2_DIR}/UIProcess/API/gtk/WebKitURIResponse.h
-        ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/glib/*.cpp
+        ${WEBKIT_DIR}/Shared/API/glib/WebKitContextMenu.cpp
+        ${WEBKIT_DIR}/Shared/API/glib/WebKitContextMenuItem.cpp
+        ${WEBKIT_DIR}/Shared/API/glib/WebKitHitTestResult.cpp
+        ${WEBKIT_DIR}/Shared/API/glib/WebKitURIRequest.cpp
+        ${WEBKIT_DIR}/Shared/API/glib/WebKitURIResponse.cpp
+        ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitContextMenu.h
+        ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitContextMenuActions.h
+        ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitContextMenuItem.h
+        ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitHitTestResult.h
+        ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitURIRequest.h
+        ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitURIResponse.h
+        ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/glib/*.cpp
 )
 
 add_custom_command(
@@ -1268,17 +1268,17 @@ file(WRITE ${CMAKE_BINARY_DIR}/gtkdoc-webkit2gtk.cfg
     "pkgconfig_file=${WebKit2_PKGCONFIG_FILE}\n"
     "namespace=webkit\n"
     "cflags=-I${CMAKE_SOURCE_DIR}/Source\n"
-    "       -I${WEBKIT2_DIR}/Shared/API/glib\n"
-    "       -I${WEBKIT2_DIR}/UIProcess/API/glib\n"
-    "       -I${WEBKIT2_DIR}/UIProcess/API/gtk\n"
+    "       -I${WEBKIT_DIR}/Shared/API/glib\n"
+    "       -I${WEBKIT_DIR}/UIProcess/API/glib\n"
+    "       -I${WEBKIT_DIR}/UIProcess/API/gtk\n"
     "       -I${DERIVED_SOURCES_WEBKIT2GTK_DIR}\n"
     "       -I${FORWARDING_HEADERS_WEBKIT2GTK_DIR}\n"
-    "doc_dir=${WEBKIT2_DIR}/UIProcess/API/gtk/docs\n"
-    "source_dirs=${WEBKIT2_DIR}/Shared/API/glib"
-    "            ${WEBKIT2_DIR}/UIProcess/API/glib\n"
-    "            ${WEBKIT2_DIR}/UIProcess/API/gtk\n"
-    "            ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/glib\n"
-    "            ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk\n"
+    "doc_dir=${WEBKIT_DIR}/UIProcess/API/gtk/docs\n"
+    "source_dirs=${WEBKIT_DIR}/Shared/API/glib"
+    "            ${WEBKIT_DIR}/UIProcess/API/glib\n"
+    "            ${WEBKIT_DIR}/UIProcess/API/gtk\n"
+    "            ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/glib\n"
+    "            ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk\n"
     "            ${DERIVED_SOURCES_WEBKIT2GTK_API_DIR}\n"
     "headers=${WebKit2GTK_ENUM_GENERATION_HEADERS} ${WebKit2WebExtension_INSTALLED_HEADERS}\n"
     "main_sgml_file=webkit2gtk-docs.sgml\n"
@@ -1289,42 +1289,42 @@ file(WRITE ${CMAKE_BINARY_DIR}/gtkdoc-webkitdom.cfg
     "pkgconfig_file=${WebKit2_PKGCONFIG_FILE}\n"
     "namespace=webkit_dom\n"
     "cflags=-I${CMAKE_SOURCE_DIR}/Source\n"
-    "       -I${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM\n"
+    "       -I${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM\n"
     "       -I${DERIVED_SOURCES_WEBKIT2GTK_DIR}\n"
     "       -I${FORWARDING_HEADERS_WEBKIT2GTK_DIR}\n"
-    "doc_dir=${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/docs\n"
-    "source_dirs=${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM\n"
+    "doc_dir=${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/docs\n"
+    "source_dirs=${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM\n"
     "headers=${WebKitDOM_GTKDOC_HEADERS}\n"
     "main_sgml_file=webkitdomgtk-docs.sgml\n"
 )
 
-add_custom_target(WebKit2-forwarding-headers
-    COMMAND ${PERL_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl --include-path ${WEBKIT2_DIR} --output ${FORWARDING_HEADERS_DIR} --platform gtk --platform soup
+add_custom_target(WebKit-forwarding-headers
+    COMMAND ${PERL_EXECUTABLE} ${WEBKIT_DIR}/Scripts/generate-forwarding-headers.pl --include-path ${WEBKIT_DIR} --output ${FORWARDING_HEADERS_DIR} --platform gtk --platform soup
 )
 
 # These symbolic link allows includes like #include <webkit2/WebkitWebView.h> which simulates installed headers.
 add_custom_command(
     OUTPUT ${FORWARDING_HEADERS_WEBKIT2GTK_DIR}/webkit2
-    DEPENDS ${WEBKIT2_DIR}/UIProcess/API/gtk
-    COMMAND ln -n -s -f ${WEBKIT2_DIR}/UIProcess/API/gtk ${FORWARDING_HEADERS_WEBKIT2GTK_DIR}/webkit2
+    DEPENDS ${WEBKIT_DIR}/UIProcess/API/gtk
+    COMMAND ln -n -s -f ${WEBKIT_DIR}/UIProcess/API/gtk ${FORWARDING_HEADERS_WEBKIT2GTK_DIR}/webkit2
 )
 add_custom_command(
     OUTPUT ${FORWARDING_HEADERS_WEBKIT2GTK_EXTENSION_DIR}/webkit2
-    DEPENDS ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk
-    COMMAND ln -n -s -f ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk ${FORWARDING_HEADERS_WEBKIT2GTK_EXTENSION_DIR}/webkit2
+    DEPENDS ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk
+    COMMAND ln -n -s -f ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk ${FORWARDING_HEADERS_WEBKIT2GTK_EXTENSION_DIR}/webkit2
 )
 add_custom_command(
     OUTPUT ${FORWARDING_HEADERS_WEBKIT2GTK_EXTENSION_DIR}/webkitdom
-    DEPENDS ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM
-    COMMAND ln -n -s -f ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM ${FORWARDING_HEADERS_WEBKIT2GTK_EXTENSION_DIR}/webkitdom
+    DEPENDS ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM
+    COMMAND ln -n -s -f ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM ${FORWARDING_HEADERS_WEBKIT2GTK_EXTENSION_DIR}/webkitdom
 )
-add_custom_target(WebKit2-fake-api-headers
+add_custom_target(WebKit-fake-api-headers
     DEPENDS ${FORWARDING_HEADERS_WEBKIT2GTK_DIR}/webkit2
             ${FORWARDING_HEADERS_WEBKIT2GTK_EXTENSION_DIR}/webkit2
             ${FORWARDING_HEADERS_WEBKIT2GTK_EXTENSION_DIR}/webkitdom
 )
 
-set(WEBKIT2_EXTRA_DEPENDENCIES
-     WebKit2-fake-api-headers
-     WebKit2-forwarding-headers
+set(WEBKIT_EXTRA_DEPENDENCIES
+     WebKit-fake-api-headers
+     WebKit-forwarding-headers
 )
index 866fc07..cb56784 100644 (file)
@@ -9,16 +9,16 @@ add_definitions(-iframework ${CARBON_LIBRARY}/Frameworks)
 add_definitions(-iframework ${APPLICATIONSERVICES_LIBRARY}/Versions/Current/Frameworks)
 add_definitions(-DWK_XPC_SERVICE_SUFFIX=".Development")
 
-list(APPEND WebKit2_LIBRARIES
-    PRIVATE WebKit
+list(APPEND WebKit_LIBRARIES
+    PRIVATE WebKitLegacy
     ${APPLICATIONSERVICES_LIBRARY}
 )
 
 if (NOT AVFAUDIO_LIBRARY-NOTFOUND)
-    list(APPEND WebKit2_LIBRARIES ${AVFAUDIO_LIBRARY})
+    list(APPEND WebKit_LIBRARIES ${AVFAUDIO_LIBRARY})
 endif ()
 
-list(APPEND WebKit2_SOURCES
+list(APPEND WebKit_SOURCES
     NetworkProcess/CustomProtocols/Cocoa/LegacyCustomProtocolManagerCocoa.mm
 
     NetworkProcess/Downloads/PendingDownload.cpp
@@ -388,49 +388,49 @@ list(APPEND WebKit2_SOURCES
     WebProcess/mac/SecItemShimLibrary.mm
 )
 
-list(APPEND WebKit2_INCLUDE_DIRECTORIES
+list(APPEND WebKit_INCLUDE_DIRECTORIES
     "${PAL_DIR}"
-    "${WEBKIT2_DIR}/NetworkProcess/cocoa"
-    "${WEBKIT2_DIR}/NetworkProcess/mac"
-    "${WEBKIT2_DIR}/PluginProcess/mac"
-    "${WEBKIT2_DIR}/UIProcess/mac"
-    "${WEBKIT2_DIR}/UIProcess/API/C/mac"
-    "${WEBKIT2_DIR}/UIProcess/API/Cocoa"
-    "${WEBKIT2_DIR}/UIProcess/API/mac"
-    "${WEBKIT2_DIR}/UIProcess/Cocoa"
-    "${WEBKIT2_DIR}/UIProcess/Launcher/mac"
-    "${WEBKIT2_DIR}/UIProcess/RemoteLayerTree"
-    "${WEBKIT2_DIR}/UIProcess/RemoteLayerTree/ios"
-    "${WEBKIT2_DIR}/UIProcess/ios"
-    "${WEBKIT2_DIR}/Platform/cg"
-    "${WEBKIT2_DIR}/Platform/classifier"
-    "${WEBKIT2_DIR}/Platform/classifier/cocoa"
-    "${WEBKIT2_DIR}/Platform/mac"
-    "${WEBKIT2_DIR}/Platform/unix"
-    "${WEBKIT2_DIR}/Platform/spi/Cocoa"
-    "${WEBKIT2_DIR}/Platform/spi/mac"
-    "${WEBKIT2_DIR}/Platform/IPC/mac"
-    "${WEBKIT2_DIR}/Platform/spi/Cocoa"
-    "${WEBKIT2_DIR}/Shared/API/Cocoa"
-    "${WEBKIT2_DIR}/Shared/API/c/cf"
-    "${WEBKIT2_DIR}/Shared/API/c/cg"
-    "${WEBKIT2_DIR}/Shared/API/c/mac"
-    "${WEBKIT2_DIR}/Shared/cf"
-    "${WEBKIT2_DIR}/Shared/Cocoa"
-    "${WEBKIT2_DIR}/Shared/EntryPointUtilities/mac/XPCService"
-    "${WEBKIT2_DIR}/Shared/mac"
-    "${WEBKIT2_DIR}/Shared/Plugins/mac"
-    "${WEBKIT2_DIR}/Shared/Scrolling"
-    "${WEBKIT2_DIR}/WebProcess/cocoa"
-    "${WEBKIT2_DIR}/WebProcess/mac"
-    "${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/Cocoa"
-    "${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/mac"
-    "${WEBKIT2_DIR}/WebProcess/Plugins/PDF"
-    "${WEBKIT2_DIR}/WebProcess/Plugins/Netscape/mac"
-    "${WEBKIT2_DIR}/WebProcess/WebPage/Cocoa"
-    "${WEBKIT2_DIR}/WebProcess/WebPage/RemoteLayerTree"
-    "${WEBKIT2_DIR}/WebProcess/WebPage/mac"
-    "${WEBKIT2_DIR}/WebProcess/WebCoreSupport/mac"
+    "${WEBKIT_DIR}/NetworkProcess/cocoa"
+    "${WEBKIT_DIR}/NetworkProcess/mac"
+    "${WEBKIT_DIR}/PluginProcess/mac"
+    "${WEBKIT_DIR}/UIProcess/mac"
+    "${WEBKIT_DIR}/UIProcess/API/C/mac"
+    "${WEBKIT_DIR}/UIProcess/API/Cocoa"
+    "${WEBKIT_DIR}/UIProcess/API/mac"
+    "${WEBKIT_DIR}/UIProcess/Cocoa"
+    "${WEBKIT_DIR}/UIProcess/Launcher/mac"
+    "${WEBKIT_DIR}/UIProcess/RemoteLayerTree"
+    "${WEBKIT_DIR}/UIProcess/RemoteLayerTree/ios"
+    "${WEBKIT_DIR}/UIProcess/ios"
+    "${WEBKIT_DIR}/Platform/cg"
+    "${WEBKIT_DIR}/Platform/classifier"
+    "${WEBKIT_DIR}/Platform/classifier/cocoa"
+    "${WEBKIT_DIR}/Platform/mac"
+    "${WEBKIT_DIR}/Platform/unix"
+    "${WEBKIT_DIR}/Platform/spi/Cocoa"
+    "${WEBKIT_DIR}/Platform/spi/mac"
+    "${WEBKIT_DIR}/Platform/IPC/mac"
+    "${WEBKIT_DIR}/Platform/spi/Cocoa"
+    "${WEBKIT_DIR}/Shared/API/Cocoa"
+    "${WEBKIT_DIR}/Shared/API/c/cf"
+    "${WEBKIT_DIR}/Shared/API/c/cg"
+    "${WEBKIT_DIR}/Shared/API/c/mac"
+    "${WEBKIT_DIR}/Shared/cf"
+    "${WEBKIT_DIR}/Shared/Cocoa"
+    "${WEBKIT_DIR}/Shared/EntryPointUtilities/mac/XPCService"
+    "${WEBKIT_DIR}/Shared/mac"
+    "${WEBKIT_DIR}/Shared/Plugins/mac"
+    "${WEBKIT_DIR}/Shared/Scrolling"
+    "${WEBKIT_DIR}/WebProcess/cocoa"
+    "${WEBKIT_DIR}/WebProcess/mac"
+    "${WEBKIT_DIR}/WebProcess/InjectedBundle/API/Cocoa"
+    "${WEBKIT_DIR}/WebProcess/InjectedBundle/API/mac"
+    "${WEBKIT_DIR}/WebProcess/Plugins/PDF"
+    "${WEBKIT_DIR}/WebProcess/Plugins/Netscape/mac"
+    "${WEBKIT_DIR}/WebProcess/WebPage/Cocoa"
+    "${WEBKIT_DIR}/WebProcess/WebPage/RemoteLayerTree"
+    "${WEBKIT_DIR}/WebProcess/WebPage/mac"
+    "${WEBKIT_DIR}/WebProcess/WebCoreSupport/mac"
     "${FORWARDING_HEADERS_DIR}/WebCore"
     "${DERIVED_SOURCES_WEBCORE_DIR}"
 )
@@ -461,12 +461,12 @@ list(APPEND StorageProcess_SOURCES
 )
 
 # FIXME: These should not have Development in production builds.
-set(WebKit2_WebProcess_OUTPUT_NAME com.apple.WebKit.WebContent.Development)
-set(WebKit2_NetworkProcess_OUTPUT_NAME com.apple.WebKit.Networking.Development)
+set(WebKit_WebProcess_OUTPUT_NAME com.apple.WebKit.WebContent.Development)
+set(WebKit_NetworkProcess_OUTPUT_NAME com.apple.WebKit.Networking.Development)
 
 add_definitions("-include WebKit2Prefix.h")
 
-set(WebKit2_FORWARDING_HEADERS_FILES
+set(WebKit_FORWARDING_HEADERS_FILES
     Shared/API/c/WKDiagnosticLoggingResultType.h
 
     UIProcess/API/C/WKPageDiagnosticLoggingClient.h
@@ -474,7 +474,7 @@ set(WebKit2_FORWARDING_HEADERS_FILES
     UIProcess/API/C/WKPageRenderingProgressEvents.h
 )
 
-list(APPEND WebKit2_MESSAGES_IN_FILES
+list(APPEND WebKit_MESSAGES_IN_FILES
     Shared/API/Cocoa/RemoteObjectRegistry.messages.in
 
     UIProcess/Cocoa/VideoFullscreenManagerProxy.messages.in
@@ -488,7 +488,7 @@ list(APPEND WebKit2_MESSAGES_IN_FILES
     WebProcess/WebPage/ViewGestureGeometryCollector.messages.in
 )
 
-set(WebKit2_FORWARDING_HEADERS_DIRECTORIES
+set(WebKit_FORWARDING_HEADERS_DIRECTORIES
     Platform
     Shared
 
@@ -520,7 +520,7 @@ set(WebKit2_FORWARDING_HEADERS_DIRECTORIES
     WebProcess/InjectedBundle/API/mac
 )
 
-WEBKIT_CREATE_FORWARDING_HEADERS(WebKit FILES ${WebKit2_FORWARDING_HEADERS_FILES} DIRECTORIES ${WebKit2_FORWARDING_HEADERS_DIRECTORIES})
+WEBKIT_CREATE_FORWARDING_HEADERS(WebKit FILES ${WebKit_FORWARDING_HEADERS_FILES} DIRECTORIES ${WebKit_FORWARDING_HEADERS_DIRECTORIES})
 
 # This is needed right now to import ObjC headers instead of including them.
 # FIXME: Forwarding headers should be copies of actual headers.
@@ -737,7 +737,7 @@ foreach (_file ${ObjCForwardingHeaders})
     file(WRITE ${FORWARDING_HEADERS_DIR}/WebKit/${_file} "#import <WebKitLegacy/${_file}>")
 endforeach ()
 
-list(APPEND WebKit2_AUTOMATION_PROTOCOL_GENERATOR_EXTRA_FLAGS
+list(APPEND WebKit_AUTOMATION_PROTOCOL_GENERATOR_EXTRA_FLAGS
     --platform=macOS
 )
 
@@ -746,4 +746,4 @@ file(WRITE ${FORWARDING_HEADERS_DIR}/WebKit/WKImageCG.h "#import <WebKit/Shared/
 
 set(CMAKE_SHARED_LINKER_FLAGS ${CMAKE_SHARED_LINKER_FLAGS} "-compatibility_version 1 -current_version ${WEBKIT_MAC_VERSION}")
 
-set(WebKit2_OUTPUT_NAME WebKit)
+set(WebKit_OUTPUT_NAME WebKit)
index 58f357e..62f89dc 100644 (file)
@@ -9,33 +9,33 @@ add_definitions(-DWEBKIT2_COMPILATION)
 add_definitions(-DLIBEXECDIR="${LIBEXEC_INSTALL_DIR}")
 add_definitions(-DLOCALEDIR="${CMAKE_INSTALL_FULL_LOCALEDIR}")
 
-set(WebKit2_USE_PREFIX_HEADER ON)
+set(WebKit_USE_PREFIX_HEADER ON)
 
-add_custom_target(webkit2wpe-forwarding-headers
-    COMMAND ${PERL_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl --include-path ${WEBKIT2_DIR} --output ${FORWARDING_HEADERS_DIR} --platform wpe --platform soup
+add_custom_target(webkitwpe-forwarding-headers
+    COMMAND ${PERL_EXECUTABLE} ${WEBKIT_DIR}/Scripts/generate-forwarding-headers.pl --include-path ${WEBKIT_DIR} --output ${FORWARDING_HEADERS_DIR} --platform wpe --platform soup
 )
 
  # These symbolic link allows includes like #include <wpe/WebkitWebView.h> which simulates installed headers.
 add_custom_command(
     OUTPUT ${FORWARDING_HEADERS_WPE_DIR}/wpe
-    DEPENDS ${WEBKIT2_DIR}/UIProcess/API/wpe
-    COMMAND ln -n -s -f ${WEBKIT2_DIR}/UIProcess/API/wpe ${FORWARDING_HEADERS_WPE_DIR}/wpe
+    DEPENDS ${WEBKIT_DIR}/UIProcess/API/wpe
+    COMMAND ln -n -s -f ${WEBKIT_DIR}/UIProcess/API/wpe ${FORWARDING_HEADERS_WPE_DIR}/wpe
 )
 
 add_custom_command(
     OUTPUT ${FORWARDING_HEADERS_WPE_EXTENSION_DIR}/wpe
-    DEPENDS ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/wpe
-    COMMAND ln -n -s -f ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/wpe ${FORWARDING_HEADERS_WPE_EXTENSION_DIR}/wpe
+    DEPENDS ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/wpe
+    COMMAND ln -n -s -f ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/wpe ${FORWARDING_HEADERS_WPE_EXTENSION_DIR}/wpe
 )
 
-add_custom_target(webkit2wpe-fake-api-headers
+add_custom_target(webkitwpe-fake-api-headers
     DEPENDS ${FORWARDING_HEADERS_WPE_DIR}/wpe
             ${FORWARDING_HEADERS_WPE_EXTENSION_DIR}/wpe
 )
 
-set(WEBKIT2_EXTRA_DEPENDENCIES
-    webkit2wpe-fake-api-headers
-    webkit2wpe-forwarding-headers
+set(WEBKIT_EXTRA_DEPENDENCIES
+    webkitwpe-fake-api-headers
+    webkitwpe-forwarding-headers
 )
 
 list(APPEND WebProcess_SOURCES
@@ -50,7 +50,7 @@ list(APPEND StorageProcess_SOURCES
     StorageProcess/EntryPoint/unix/StorageProcessMain.cpp
 )
 
-list(APPEND WebKit2_SOURCES
+list(APPEND WebKit_SOURCES
     NetworkProcess/CustomProtocols/soup/LegacyCustomProtocolManagerSoup.cpp
 
     NetworkProcess/cache/NetworkCacheCodersSoup.cpp
@@ -267,67 +267,67 @@ list(APPEND WebKit2_SOURCES
     WebProcess/wpe/WebProcessMainWPE.cpp
 )
 
-list(APPEND WebKit2_MESSAGES_IN_FILES
+list(APPEND WebKit_MESSAGES_IN_FILES
     UIProcess/API/wpe/CompositingManagerProxy.messages.in
 )
 
-list(APPEND WebKit2_DERIVED_SOURCES
-    ${DERIVED_SOURCES_WEBKIT2_DIR}/WebKit2ResourcesGResourceBundle.c
+list(APPEND WebKit_DERIVED_SOURCES
+    ${DERIVED_SOURCES_WEBKIT_DIR}/WebKitResourcesGResourceBundle.c
 
     ${DERIVED_SOURCES_WPE_API_DIR}/WebKitEnumTypes.cpp
 )
 
 set(WPE_API_INSTALLED_HEADERS
     ${DERIVED_SOURCES_WPE_API_DIR}/WebKitEnumTypes.h
-    ${WEBKIT2_DIR}/UIProcess/API/wpe/WebKitApplicationInfo.h
-    ${WEBKIT2_DIR}/UIProcess/API/wpe/WebKitAuthenticationRequest.h
-    ${WEBKIT2_DIR}/UIProcess/API/wpe/WebKitAutomationSession.h
-    ${WEBKIT2_DIR}/UIProcess/API/wpe/WebKitBackForwardList.h
-    ${WEBKIT2_DIR}/UIProcess/API/wpe/WebKitBackForwardListItem.h
-    ${WEBKIT2_DIR}/UIProcess/API/wpe/WebKitCredential.h
-    ${WEBKIT2_DIR}/UIProcess/API/wpe/WebKitContextMenu.h
-    ${WEBKIT2_DIR}/UIProcess/API/wpe/WebKitContextMenuActions.h
-    ${WEBKIT2_DIR}/UIProcess/API/wpe/WebKitContextMenuItem.h
-    ${WEBKIT2_DIR}/UIProcess/API/wpe/WebKitCookieManager.h
-    ${WEBKIT2_DIR}/UIProcess/API/wpe/WebKitDefines.h
-    ${WEBKIT2_DIR}/UIProcess/API/wpe/WebKitDownload.h
-    ${WEBKIT2_DIR}/UIProcess/API/wpe/WebKitEditingCommands.h
-    ${WEBKIT2_DIR}/UIProcess/API/wpe/WebKitEditorState.h
-    ${WEBKIT2_DIR}/UIProcess/API/wpe/WebKitError.h
-    ${WEBKIT2_DIR}/UIProcess/API/wpe/WebKitFaviconDatabase.h
-    ${WEBKIT2_DIR}/UIProcess/API/wpe/WebKitFindController.h
-    ${WEBKIT2_DIR}/UIProcess/API/wpe/WebKitFormSubmissionRequest.h
-    ${WEBKIT2_DIR}/UIProcess/API/wpe/WebKitGeolocationPermissionRequest.h
-    ${WEBKIT2_DIR}/UIProcess/API/wpe/WebKitHitTestResult.h
-    ${WEBKIT2_DIR}/UIProcess/API/wpe/WebKitInstallMissingMediaPluginsPermissionRequest.h
-    ${WEBKIT2_DIR}/UIProcess/API/wpe/WebKitJavascriptResult.h
-    ${WEBKIT2_DIR}/UIProcess/API/wpe/WebKitMimeInfo.h
-    ${WEBKIT2_DIR}/UIProcess/API/wpe/WebKitNavigationAction.h
-    ${WEBKIT2_DIR}/UIProcess/API/wpe/WebKitNavigationPolicyDecision.h
-    ${WEBKIT2_DIR}/UIProcess/API/wpe/WebKitNetworkProxySettings.h
-    ${WEBKIT2_DIR}/UIProcess/API/wpe/WebKitNotificationPermissionRequest.h
-    ${WEBKIT2_DIR}/UIProcess/API/wpe/WebKitNotification.h
-    ${WEBKIT2_DIR}/UIProcess/API/wpe/WebKitPermissionRequest.h
-    ${WEBKIT2_DIR}/UIProcess/API/wpe/WebKitPlugin.h
-    ${WEBKIT2_DIR}/UIProcess/API/wpe/WebKitPolicyDecision.h
-    ${WEBKIT2_DIR}/UIProcess/API/wpe/WebKitResponsePolicyDecision.h
-    ${WEBKIT2_DIR}/UIProcess/API/wpe/WebKitSecurityManager.h
-    ${WEBKIT2_DIR}/UIProcess/API/wpe/WebKitSecurityOrigin.h
-    ${WEBKIT2_DIR}/UIProcess/API/wpe/WebKitSettings.h
-    ${WEBKIT2_DIR}/UIProcess/API/wpe/WebKitURIRequest.h
-    ${WEBKIT2_DIR}/UIProcess/API/wpe/WebKitURIResponse.h
-    ${WEBKIT2_DIR}/UIProcess/API/wpe/WebKitURISchemeRequest.h
-    ${WEBKIT2_DIR}/UIProcess/API/wpe/WebKitUserContent.h
-    ${WEBKIT2_DIR}/UIProcess/API/wpe/WebKitUserContentManager.h
-    ${WEBKIT2_DIR}/UIProcess/API/wpe/WebKitUserMediaPermissionRequest.h
-    ${WEBKIT2_DIR}/UIProcess/API/wpe/WebKitWebContext.h
-    ${WEBKIT2_DIR}/UIProcess/API/wpe/WebKitWebResource.h
-    ${WEBKIT2_DIR}/UIProcess/API/wpe/WebKitWebView.h
-    ${WEBKIT2_DIR}/UIProcess/API/wpe/WebKitWebViewSessionState.h
-    ${WEBKIT2_DIR}/UIProcess/API/wpe/WebKitWebsiteData.h
-    ${WEBKIT2_DIR}/UIProcess/API/wpe/WebKitWebsiteDataManager.h
-    ${WEBKIT2_DIR}/UIProcess/API/wpe/WebKitWindowProperties.h
-    ${WEBKIT2_DIR}/UIProcess/API/wpe/webkit.h
+    ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitApplicationInfo.h
+    ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitAuthenticationRequest.h
+    ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitAutomationSession.h
+    ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitBackForwardList.h
+    ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitBackForwardListItem.h
+    ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitCredential.h
+    ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitContextMenu.h
+    ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitContextMenuActions.h
+    ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitContextMenuItem.h
+    ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitCookieManager.h
+    ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitDefines.h
+    ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitDownload.h
+    ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitEditingCommands.h
+    ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitEditorState.h
+    ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitError.h
+    ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitFaviconDatabase.h
+    ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitFindController.h
+    ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitFormSubmissionRequest.h
+    ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitGeolocationPermissionRequest.h
+    ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitHitTestResult.h
+    ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitInstallMissingMediaPluginsPermissionRequest.h
+    ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitJavascriptResult.h
+    ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitMimeInfo.h
+    ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitNavigationAction.h
+    ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitNavigationPolicyDecision.h
+    ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitNetworkProxySettings.h
+    ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitNotificationPermissionRequest.h
+    ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitNotification.h
+    ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitPermissionRequest.h
+    ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitPlugin.h
+    ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitPolicyDecision.h
+    ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitResponsePolicyDecision.h
+    ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitSecurityManager.h
+    ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitSecurityOrigin.h
+    ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitSettings.h
+    ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitURIRequest.h
+    ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitURIResponse.h
+    ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitURISchemeRequest.h
+    ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitUserContent.h
+    ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitUserContentManager.h
+    ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitUserMediaPermissionRequest.h
+    ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitWebContext.h
+    ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitWebResource.h
+    ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitWebView.h
+    ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitWebViewSessionState.h
+    ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitWebsiteData.h
+    ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitWebsiteDataManager.h
+    ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitWindowProperties.h
+    ${WEBKIT_DIR}/UIProcess/API/wpe/webkit.h
 )
 
 # To generate WebKitEnumTypes.h we want to use all installed headers, except WebKitEnumTypes.h itself.
@@ -338,38 +338,38 @@ add_custom_command(
            ${DERIVED_SOURCES_WPE_API_DIR}/WebKitEnumTypes.cpp
     DEPENDS ${WPE_ENUM_GENERATION_HEADERS}
 
-    COMMAND glib-mkenums --template ${WEBKIT2_DIR}/UIProcess/API/wpe/WebKitEnumTypes.h.template ${WPE_ENUM_GENERATION_HEADERS} | sed s/web_kit/webkit/ | sed s/WEBKIT_TYPE_KIT/WEBKIT_TYPE/ > ${DERIVED_SOURCES_WPE_API_DIR}/WebKitEnumTypes.h
+    COMMAND glib-mkenums --template ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitEnumTypes.h.template ${WPE_ENUM_GENERATION_HEADERS} | sed s/web_kit/webkit/ | sed s/WEBKIT_TYPE_KIT/WEBKIT_TYPE/ > ${DERIVED_SOURCES_WPE_API_DIR}/WebKitEnumTypes.h
 
-    COMMAND glib-mkenums --template ${WEBKIT2_DIR}/UIProcess/API/wpe/WebKitEnumTypes.cpp.template ${WPE_ENUM_GENERATION_HEADERS} | sed s/web_kit/webkit/ > ${DERIVED_SOURCES_WPE_API_DIR}/WebKitEnumTypes.cpp
+    COMMAND glib-mkenums --template ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitEnumTypes.cpp.template ${WPE_ENUM_GENERATION_HEADERS} | sed s/web_kit/webkit/ > ${DERIVED_SOURCES_WPE_API_DIR}/WebKitEnumTypes.cpp
     VERBATIM
 )
 
-set(WebKit2Resources
+set(WebKitResources
 )
 
 if (ENABLE_WEB_AUDIO)
-    list(APPEND WebKit2Resources
+    list(APPEND WebKitResources
         "        <file alias=\"audio/Composite\">Composite.wav</file>\n"
     )
 endif ()
 
-file(WRITE ${DERIVED_SOURCES_WEBKIT2_DIR}/WebKit2ResourcesGResourceBundle.xml
+file(WRITE ${DERIVED_SOURCES_WEBKIT_DIR}/WebKitResourcesGResourceBundle.xml
     "<?xml version=1.0 encoding=UTF-8?>\n"
     "<gresources>\n"
     "    <gresource prefix=\"/org/webkitwpe/resources\">\n"
-    ${WebKit2Resources}
+    ${WebKitResources}
     "    </gresource>\n"
     "</gresources>\n"
 )
 
 add_custom_command(
-    OUTPUT ${DERIVED_SOURCES_WEBKIT2_DIR}/WebKit2ResourcesGResourceBundle.c
-    DEPENDS ${DERIVED_SOURCES_WEBKIT2_DIR}/WebKit2ResourcesGResourceBundle.xml
-    COMMAND glib-compile-resources --generate --sourcedir=${CMAKE_SOURCE_DIR}/Source/WebCore/Resources --sourcedir=${CMAKE_SOURCE_DIR}/Source/WebCore/platform/audio/resources --target=${DERIVED_SOURCES_WEBKIT2_DIR}/WebKit2ResourcesGResourceBundle.c ${DERIVED_SOURCES_WEBKIT2_DIR}/WebKit2ResourcesGResourceBundle.xml
+    OUTPUT ${DERIVED_SOURCES_WEBKIT_DIR}/WebKitResourcesGResourceBundle.c
+    DEPENDS ${DERIVED_SOURCES_WEBKIT_DIR}/WebKitResourcesGResourceBundle.xml
+    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
     VERBATIM
 )
 
-list(APPEND WebKit2_INCLUDE_DIRECTORIES
+list(APPEND WebKit_INCLUDE_DIRECTORIES
     "${FORWARDING_HEADERS_DIR}"
     "${FORWARDING_HEADERS_WPE_DIR}"
     "${FORWARDING_HEADERS_WPE_EXTENSION_DIR}"
@@ -380,37 +380,37 @@ list(APPEND WebKit2_INCLUDE_DIRECTORIES
     "${WEBCORE_DIR}/platform/graphics/opentype"
     "${WEBCORE_DIR}/platform/graphics/texmap/coordinated"
     "${WEBCORE_DIR}/platform/network/soup"
-    "${WEBKIT2_DIR}/NetworkProcess/CustomProtocols/soup"
-    "${WEBKIT2_DIR}/NetworkProcess/Downloads/soup"
-    "${WEBKIT2_DIR}/NetworkProcess/soup"
-    "${WEBKIT2_DIR}/NetworkProcess/unix"
-    "${WEBKIT2_DIR}/Platform/IPC/glib"
-    "${WEBKIT2_DIR}/Platform/IPC/unix"
-    "${WEBKIT2_DIR}/Platform/classifier"
-    "${WEBKIT2_DIR}/Shared/API/c/wpe"
-    "${WEBKIT2_DIR}/Shared/API/glib"
-    "${WEBKIT2_DIR}/Shared/CoordinatedGraphics"
-    "${WEBKIT2_DIR}/Shared/CoordinatedGraphics/threadedcompositor"
-    "${WEBKIT2_DIR}/Shared/glib"
-    "${WEBKIT2_DIR}/Shared/soup"
-    "${WEBKIT2_DIR}/Shared/unix"
-    "${WEBKIT2_DIR}/Shared/wpe"
-    "${WEBKIT2_DIR}/StorageProcess/unix"
-    "${WEBKIT2_DIR}/UIProcess/API/C/cairo"
-    "${WEBKIT2_DIR}/UIProcess/API/C/wpe"
-    "${WEBKIT2_DIR}/UIProcess/API/glib"
-    "${WEBKIT2_DIR}/UIProcess/API/wpe"
-    "${WEBKIT2_DIR}/UIProcess/Network/CustomProtocols/soup"
-    "${WEBKIT2_DIR}/UIProcess/gstreamer"
-    "${WEBKIT2_DIR}/UIProcess/linux"
-    "${WEBKIT2_DIR}/UIProcess/soup"
-    "${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/glib"
-    "${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/wpe"
-    "${WEBKIT2_DIR}/WebProcess/soup"
-    "${WEBKIT2_DIR}/WebProcess/unix"
-    "${WEBKIT2_DIR}/WebProcess/WebCoreSupport/soup"
-    "${WEBKIT2_DIR}/WebProcess/WebPage/CoordinatedGraphics"
-    "${WEBKIT2_DIR}/WebProcess/WebPage/wpe"
+    "${WEBKIT_DIR}/NetworkProcess/CustomProtocols/soup"
+    "${WEBKIT_DIR}/NetworkProcess/Downloads/soup"
+    "${WEBKIT_DIR}/NetworkProcess/soup"
+    "${WEBKIT_DIR}/NetworkProcess/unix"
+    "${WEBKIT_DIR}/Platform/IPC/glib"
+    "${WEBKIT_DIR}/Platform/IPC/unix"
+    "${WEBKIT_DIR}/Platform/classifier"
+    "${WEBKIT_DIR}/Shared/API/c/wpe"
+    "${WEBKIT_DIR}/Shared/API/glib"
+    "${WEBKIT_DIR}/Shared/CoordinatedGraphics"
+    "${WEBKIT_DIR}/Shared/CoordinatedGraphics/threadedcompositor"
+    "${WEBKIT_DIR}/Shared/glib"
+    "${WEBKIT_DIR}/Shared/soup"
+    "${WEBKIT_DIR}/Shared/unix"
+    "${WEBKIT_DIR}/Shared/wpe"
+    "${WEBKIT_DIR}/StorageProcess/unix"
+    "${WEBKIT_DIR}/UIProcess/API/C/cairo"
+    "${WEBKIT_DIR}/UIProcess/API/C/wpe"
+    "${WEBKIT_DIR}/UIProcess/API/glib"
+    "${WEBKIT_DIR}/UIProcess/API/wpe"
+    "${WEBKIT_DIR}/UIProcess/Network/CustomProtocols/soup"
+    "${WEBKIT_DIR}/UIProcess/gstreamer"
+    "${WEBKIT_DIR}/UIProcess/linux"
+    "${WEBKIT_DIR}/UIProcess/soup"
+    "${WEBKIT_DIR}/WebProcess/InjectedBundle/API/glib"
+    "${WEBKIT_DIR}/WebProcess/InjectedBundle/API/wpe"
+    "${WEBKIT_DIR}/WebProcess/soup"
+    "${WEBKIT_DIR}/WebProcess/unix"
+    "${WEBKIT_DIR}/WebProcess/WebCoreSupport/soup"
+    "${WEBKIT_DIR}/WebProcess/WebPage/CoordinatedGraphics"
+    "${WEBKIT_DIR}/WebProcess/WebPage/wpe"
     "${WTF_DIR}/wtf/gtk/"
     "${WTF_DIR}/wtf/gobject"
     "${WTF_DIR}"
@@ -423,7 +423,7 @@ list(APPEND WebKit2_INCLUDE_DIRECTORIES
     ${WPE_INCLUDE_DIRS}
 )
 
-list(APPEND WebKit2_LIBRARIES
+list(APPEND WebKit_LIBRARIES
     WebCorePlatformWPE
     ${CAIRO_LIBRARIES}
     ${FREETYPE2_LIBRARIES}
@@ -499,115 +499,115 @@ list(APPEND WPEWebInspectorResources_INCLUDE_DIRECTORIES
 )
 
 add_library(WPEWebInspectorResources SHARED ${WPEWebInspectorResources_DERIVED_SOURCES})
-add_dependencies(WPEWebInspectorResources WebKit2)
+add_dependencies(WPEWebInspectorResources WebKit)
 target_link_libraries(WPEWebInspectorResources ${WPEWebInspectorResources_LIBRARIES})
 target_include_directories(WPEWebInspectorResources PUBLIC ${WPEWebInspectorResources_INCLUDE_DIRECTORIES})
 install(TARGETS WPEWebInspectorResources DESTINATION "${LIB_INSTALL_DIR}")
 
-add_library(WPEInjectedBundle MODULE "${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/glib/WebKitInjectedBundleMain.cpp")
-add_webkit2_prefix_header(WPEInjectedBundle)
-target_link_libraries(WPEInjectedBundle WebKit2)
+add_library(WPEInjectedBundle MODULE "${WEBKIT_DIR}/WebProcess/InjectedBundle/API/glib/WebKitInjectedBundleMain.cpp")
+ADD_WEBKIT_PREFIX_HEADER(WPEInjectedBundle)
+target_link_libraries(WPEInjectedBundle WebKit)
 
 if (EXPORT_DEPRECATED_WEBKIT2_C_API)
     set(WPE_INSTALLED_WEBKIT_HEADERS
-        ${WEBKIT2_DIR}/Shared/API/c/WKArray.h
-        ${WEBKIT2_DIR}/Shared/API/c/WKBase.h
-        ${WEBKIT2_DIR}/Shared/API/c/WKData.h
-        ${WEBKIT2_DIR}/Shared/API/c/WKDeclarationSpecifiers.h
-        ${WEBKIT2_DIR}/Shared/API/c/WKDiagnosticLoggingResultType.h
-        ${WEBKIT2_DIR}/Shared/API/c/WKDictionary.h
-        ${WEBKIT2_DIR}/Shared/API/c/WKErrorRef.h
-        ${WEBKIT2_DIR}/Shared/API/c/WKEvent.h
-        ${WEBKIT2_DIR}/Shared/API/c/WKFindOptions.h
-        ${WEBKIT2_DIR}/Shared/API/c/WKGeometry.h
-        ${WEBKIT2_DIR}/Shared/API/c/WKImage.h
-        ${WEBKIT2_DIR}/Shared/API/c/WKMutableArray.h
-        ${WEBKIT2_DIR}/Shared/API/c/WKMutableDictionary.h
-        ${WEBKIT2_DIR}/Shared/API/c/WKNumber.h
-        ${WEBKIT2_DIR}/Shared/API/c/WKPageLoadTypes.h
-        ${WEBKIT2_DIR}/Shared/API/c/WKPageVisibilityTypes.h
-        ${WEBKIT2_DIR}/Shared/API/c/WKSecurityOriginRef.h
-        ${WEBKIT2_DIR}/Shared/API/c/WKSerializedScriptValue.h
-        ${WEBKIT2_DIR}/Shared/API/c/WKString.h
-        ${WEBKIT2_DIR}/Shared/API/c/WKType.h
-        ${WEBKIT2_DIR}/Shared/API/c/WKURL.h
-        ${WEBKIT2_DIR}/Shared/API/c/WKURLRequest.h
-        ${WEBKIT2_DIR}/Shared/API/c/WKURLResponse.h
-        ${WEBKIT2_DIR}/Shared/API/c/WKUserContentInjectedFrames.h
-        ${WEBKIT2_DIR}/Shared/API/c/WKUserContentURLPattern.h
-        ${WEBKIT2_DIR}/Shared/API/c/WKUserScriptInjectionTime.h
-
-        ${WEBKIT2_DIR}/Shared/API/c/wpe/WKBaseWPE.h
-
-        ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/c/WKBundle.h
-        ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/c/WKBundleBackForwardList.h
-        ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/c/WKBundleBackForwardListItem.h
-        ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/c/WKBundleDOMWindowExtension.h
-        ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/c/WKBundleFileHandleRef.h
-        ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/c/WKBundleFrame.h
-        ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/c/WKBundleHitTestResult.h
-        ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/c/WKBundleInitialize.h
-        ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/c/WKBundleInspector.h
-        ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/c/WKBundleNavigationAction.h
-        ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/c/WKBundleNodeHandle.h
-        ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/c/WKBundlePage.h
-        ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/c/WKBundlePageBanner.h
-        ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/c/WKBundlePageContextMenuClient.h
-        ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/c/WKBundlePageEditorClient.h
-        ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/c/WKBundlePageFormClient.h
-        ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/c/WKBundlePageFullScreenClient.h
-        ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/c/WKBundlePageGroup.h
-        ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/c/WKBundlePageLoaderClient.h
-        ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/c/WKBundlePageOverlay.h
-        ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/c/WKBundlePagePolicyClient.h
-        ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/c/WKBundlePageResourceLoadClient.h
-        ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/c/WKBundlePageUIClient.h
-        ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/c/WKBundleRangeHandle.h
-        ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/c/WKBundleScriptWorld.h
-
-        ${WEBKIT2_DIR}/UIProcess/API/C/WKBackForwardListItemRef.h
-        ${WEBKIT2_DIR}/UIProcess/API/C/WKBackForwardListRef.h
-        ${WEBKIT2_DIR}/UIProcess/API/C/WKContextConfigurationRef.h
-        ${WEBKIT2_DIR}/UIProcess/API/C/WKContextConnectionClient.h
-        ${WEBKIT2_DIR}/UIProcess/API/C/WKContextDownloadClient.h
-        ${WEBKIT2_DIR}/UIProcess/API/C/WKContextHistoryClient.h
-        ${WEBKIT2_DIR}/UIProcess/API/C/WKContextInjectedBundleClient.h
-        ${WEBKIT2_DIR}/UIProcess/API/C/WKContext.h
-        ${WEBKIT2_DIR}/UIProcess/API/C/WKCookieManager.h
-        ${WEBKIT2_DIR}/UIProcess/API/C/WKCredential.h
-        ${WEBKIT2_DIR}/UIProcess/API/C/WKCredentialTypes.h
-        ${WEBKIT2_DIR}/UIProcess/API/C/WKFrame.h
-        ${WEBKIT2_DIR}/UIProcess/API/C/WKFrameInfoRef.h
-        ${WEBKIT2_DIR}/UIProcess/API/C/WKFramePolicyListener.h
-        ${WEBKIT2_DIR}/UIProcess/API/C/WKHitTestResult.h
-        ${WEBKIT2_DIR}/UIProcess/API/C/WKNativeEvent.h
-        ${WEBKIT2_DIR}/UIProcess/API/C/WKNavigationActionRef.h
-        ${WEBKIT2_DIR}/UIProcess/API/C/WKNavigationDataRef.h
-        ${WEBKIT2_DIR}/UIProcess/API/C/WKNavigationRef.h
-        ${WEBKIT2_DIR}/UIProcess/API/C/WKNavigationResponseRef.h
-        ${WEBKIT2_DIR}/UIProcess/API/C/WKPage.h
-        ${WEBKIT2_DIR}/UIProcess/API/C/WKPageConfigurationRef.h
-        ${WEBKIT2_DIR}/UIProcess/API/C/WKPageContextMenuClient.h
-        ${WEBKIT2_DIR}/UIProcess/API/C/WKPageDiagnosticLoggingClient.h
-        ${WEBKIT2_DIR}/UIProcess/API/C/WKPageFindClient.h
-        ${WEBKIT2_DIR}/UIProcess/API/C/WKPageFindMatchesClient.h
-        ${WEBKIT2_DIR}/UIProcess/API/C/WKPageFormClient.h
-        ${WEBKIT2_DIR}/UIProcess/API/C/WKPageGroup.h
-        ${WEBKIT2_DIR}/UIProcess/API/C/WKPageInjectedBundleClient.h
-        ${WEBKIT2_DIR}/UIProcess/API/C/WKPageLoaderClient.h
-        ${WEBKIT2_DIR}/UIProcess/API/C/WKPageNavigationClient.h
-        ${WEBKIT2_DIR}/UIProcess/API/C/WKPagePolicyClient.h
-        ${WEBKIT2_DIR}/UIProcess/API/C/WKPageRenderingProgressEvents.h
-        ${WEBKIT2_DIR}/UIProcess/API/C/WKPageUIClient.h
-        ${WEBKIT2_DIR}/UIProcess/API/C/WKPluginLoadPolicy.h
-        ${WEBKIT2_DIR}/UIProcess/API/C/WKPreferencesRef.h
-        ${WEBKIT2_DIR}/UIProcess/API/C/WKSessionStateRef.h
-        ${WEBKIT2_DIR}/UIProcess/API/C/WKUserContentControllerRef.h
-        ${WEBKIT2_DIR}/UIProcess/API/C/WKUserScriptRef.h
-        ${WEBKIT2_DIR}/UIProcess/API/C/WKViewportAttributes.h
-        ${WEBKIT2_DIR}/UIProcess/API/C/WKWindowFeaturesRef.h
-
-        ${WEBKIT2_DIR}/UIProcess/API/C/wpe/WKView.h
+        ${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}
@@ -616,7 +616,7 @@ if (EXPORT_DEPRECATED_WEBKIT2_C_API)
     )
 
     set(WPE_INSTALLED_HEADERS
-        ${WEBKIT2_DIR}/Shared/API/c/wpe/WebKit.h
+        ${WEBKIT_DIR}/Shared/API/c/wpe/WebKit.h
     )
 
     install(FILES ${WPE_INSTALLED_HEADERS}
index 0384a78..35716c8 100644 (file)
@@ -1,14 +1,14 @@
-set(WebKit2_OUTPUT_NAME WebKit2)
-set(WebKit2_WebProcess_OUTPUT_NAME WebKitWebProcess)
-set(WebKit2_NetworkProcess_OUTPUT_NAME WebKitNetworkProcess)
-set(WebKit2_PluginProcess_OUTPUT_NAME WebKitPluginProcess)
-set(WebKit2_StorageProcess_OUTPUT_NAME WebKitStorageProcess)
+set(WebKit_OUTPUT_NAME WebKit)
+set(WebKit_WebProcess_OUTPUT_NAME WebKitWebProcess)
+set(WebKit_NetworkProcess_OUTPUT_NAME WebKitNetworkProcess)
+set(WebKit_PluginProcess_OUTPUT_NAME WebKitPluginProcess)
+set(WebKit_StorageProcess_OUTPUT_NAME WebKitStorageProcess)
 
-file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKIT2_DIR})
+file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKIT_DIR})
 
 add_definitions(-DBUILDING_WEBKIT)
 
-list(APPEND WebKit2_SOURCES
+list(APPEND WebKit_SOURCES
     NetworkProcess/Downloads/curl/DownloadCurl.cpp
 
     NetworkProcess/curl/NetworkProcessCurl.cpp
@@ -30,38 +30,38 @@ add_custom_command(
     COMMAND cp ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorBackendCommands.js ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol/InspectorBackendCommands.js
 )
 
-list(APPEND WebKit2_INCLUDE_DIRECTORIES
-    "${WEBKIT2_DIR}/NetworkProcess/win"
-    "${WEBKIT2_DIR}/Platform/classifier"
-    "${WEBKIT2_DIR}/PluginProcess/win"
-    "${WEBKIT2_DIR}/Shared/API/c/win"
-    "${WEBKIT2_DIR}/Shared/CoordinatedGraphics"
-    "${WEBKIT2_DIR}/Shared/CoordinatedGraphics/threadedcompositor"
-    "${WEBKIT2_DIR}/Shared/Plugins/win"
-    "${WEBKIT2_DIR}/Shared/unix"
-    "${WEBKIT2_DIR}/Shared/win"
-    "${WEBKIT2_DIR}/StorageProcess/win"
-    "${WEBKIT2_DIR}/UIProcess/API/C/cairo"
-    "${WEBKIT2_DIR}/UIProcess/API/C/win"
-    "${WEBKIT2_DIR}/UIProcess/API/cpp/win"
-    "${WEBKIT2_DIR}/UIProcess/API/win"
-    "${WEBKIT2_DIR}/UIProcess/Plugins/win"
-    "${WEBKIT2_DIR}/UIProcess/win"
-    "${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/win"
-    "${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/win/DOM"
-    "${WEBKIT2_DIR}/WebProcess/win"
-    "${WEBKIT2_DIR}/WebProcess/WebCoreSupport/win"
-    "${WEBKIT2_DIR}/WebProcess/WebPage/CoordinatedGraphics"
-    "${WEBKIT2_DIR}/WebProcess/WebPage/win"
-    "${WEBKIT2_DIR}/win"
+list(APPEND WebKit_INCLUDE_DIRECTORIES
+    "${WEBKIT_DIR}/NetworkProcess/win"
+    "${WEBKIT_DIR}/Platform/classifier"
+    "${WEBKIT_DIR}/PluginProcess/win"
+    "${WEBKIT_DIR}/Shared/API/c/win"
+    "${WEBKIT_DIR}/Shared/CoordinatedGraphics"
+    "${WEBKIT_DIR}/Shared/CoordinatedGraphics/threadedcompositor"
+    "${WEBKIT_DIR}/Shared/Plugins/win"
+    "${WEBKIT_DIR}/Shared/unix"
+    "${WEBKIT_DIR}/Shared/win"
+    "${WEBKIT_DIR}/StorageProcess/win"
+    "${WEBKIT_DIR}/UIProcess/API/C/cairo"
+    "${WEBKIT_DIR}/UIProcess/API/C/win"
+    "${WEBKIT_DIR}/UIProcess/API/cpp/win"
+    "${WEBKIT_DIR}/UIProcess/API/win"
+    "${WEBKIT_DIR}/UIProcess/Plugins/win"
+    "${WEBKIT_DIR}/UIProcess/win"
+    "${WEBKIT_DIR}/WebProcess/InjectedBundle/API/win"
+    "${WEBKIT_DIR}/WebProcess/InjectedBundle/API/win/DOM"
+    "${WEBKIT_DIR}/WebProcess/win"
+    "${WEBKIT_DIR}/WebProcess/WebCoreSupport/win"
+    "${WEBKIT_DIR}/WebProcess/WebPage/CoordinatedGraphics"
+    "${WEBKIT_DIR}/WebProcess/WebPage/win"
+    "${WEBKIT_DIR}/win"
 )
 
-list(APPEND WebKit2_SYSTEM_INCLUDE_DIRECTORIES
+list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES
     ${CAIRO_INCLUDE_DIRS}
 )
 
-set(WebKit2CommonIncludeDirectories ${WebKit2_INCLUDE_DIRECTORIES})
-set(WebKit2CommonSystemIncludeDirectories ${WebKit2_SYSTEM_INCLUDE_DIRECTORIES})
+set(WebKitCommonIncludeDirectories ${WebKit_INCLUDE_DIRECTORIES})
+set(WebKitCommonSystemIncludeDirectories ${WebKit_SYSTEM_INCLUDE_DIRECTORIES})
 
 list(APPEND WebProcess_SOURCES
     WebProcess/EntryPoint/win/WebProcessMain.cpp
@@ -83,7 +83,7 @@ endif ()
 if (${WTF_PLATFORM_WIN_CAIRO})
     add_definitions(-DUSE_CAIRO=1 -DUSE_CURL=1)
 
-    list(APPEND WebKit2_LIBRARIES
+    list(APPEND WebKit_LIBRARIES
         libeay32.lib
         mfuuid.lib
         ssleay32.lib
@@ -91,25 +91,25 @@ if (${WTF_PLATFORM_WIN_CAIRO})
     )
 endif ()
 
-list(APPEND WebKit2_LIBRARIES
+list(APPEND WebKit_LIBRARIES
     WebCoreDerivedSources${DEBUG_SUFFIX}
 )
 
-set(SharedWebKit2Libraries
-    ${WebKit2_LIBRARIES}
+set(SharedWebKitLibraries
+    ${WebKit_LIBRARIES}
 )
 
-add_custom_target(WebKit2-forwarding-headers
+add_custom_target(WebKit-forwarding-headers
                   COMMAND ${PERL_EXECUTABLE}
-                  ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl
-                  --include-path ${WEBKIT2_DIR}
+                  ${WEBKIT_DIR}/Scripts/generate-forwarding-headers.pl
+                  --include-path ${WEBKIT_DIR}
                   --output ${FORWARDING_HEADERS_DIR}
                   --platform win
                   --platform curl
                   )
 
-set(WEBKIT2_EXTRA_DEPENDENCIES
-    WebKit2-forwarding-headers
+set(WEBKIT_EXTRA_DEPENDENCIES
+    WebKit-forwarding-headers
 )
 
-WEBKIT_WRAP_SOURCELIST(${WebKit2_SOURCES})
+WEBKIT_WRAP_SOURCELIST(${WebKit_SOURCES})
index 7594444..4c34e90 100644 (file)
@@ -28,7 +28,7 @@
 
 #if PLATFORM(WAYLAND) && USE(EGL)
 
-#include "WebKit2WaylandServerProtocol.h"
+#include "WebKitWaylandServerProtocol.h"
 #include <EGL/egl.h>
 #include <EGL/eglext.h>
 #include <WebCore/GLContext.h>
index a0429c8..4ccd162 100644 (file)
@@ -28,7 +28,7 @@
 
 #if PLATFORM(WAYLAND)
 
-#include "WebKit2WaylandClientProtocol.h"
+#include "WebKitWaylandClientProtocol.h"
 #include "WebPage.h"
 
 using namespace WebCore;
index b74a103..c3ef489 100644 (file)
@@ -1,8 +1,8 @@
 cmake_minimum_required(VERSION 2.8.12)
 include(WebKitCommon)
-set_property(DIRECTORY . PROPERTY FOLDER "WebKit")
+set_property(DIRECTORY . PROPERTY FOLDER "WebKitLegacy")
 
-set(WebKit_SOURCES
+set(WebKitLegacy_SOURCES
     Storage/StorageAreaImpl.cpp
     Storage/StorageAreaSync.cpp
     Storage/StorageNamespaceImpl.cpp
@@ -16,49 +16,49 @@ set(WebKit_SOURCES
     WebCoreSupport/WebViewGroup.cpp
 )
 
-set(WebKit_INCLUDE_DIRECTORIES
+set(WebKitLegacy_INCLUDE_DIRECTORIES
     "${CMAKE_BINARY_DIR}"
-    "${WEBKIT_DIR}/Storage"
-    "${WEBKIT_DIR}/WebCoreSupport"
+    "${WEBKITLEGACY_DIR}/Storage"
+    "${WEBKITLEGACY_DIR}/WebCoreSupport"
     "${FORWARDING_HEADERS_DIR}/JavaScriptCore"
     "${FORWARDING_HEADERS_DIR}/WebCore"
     "${FORWARDING_HEADERS_DIR}/WebKitLegacy"
 )
 
-set(WebKit_SYSTEM_INCLUDE_DIRECTORIES
+set(WebKitLegacy_SYSTEM_INCLUDE_DIRECTORIES
     "${ICU_INCLUDE_DIRS}"
 )
 
-set(WebKit_LIBRARIES
+set(WebKitLegacy_LIBRARIES
     PRIVATE JavaScriptCore${DEBUG_SUFFIX}
     PRIVATE WebCore${DEBUG_SUFFIX}
     PRIVATE PAL${DEBUG_SUFFIX}
 )
 
-WEBKIT_FRAMEWORK_DECLARE(WebKit)
+WEBKIT_FRAMEWORK_DECLARE(WebKitLegacy)
 WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
 
 if (MSVC)
-    WEBKIT_ADD_PRECOMPILED_HEADER("WebKitPrefix.h" "win/WebKitPrefix.cpp" WebKit_SOURCES)
-    list(APPEND WebKit_SOURCES win/WebKit.resources/WebKit.rc)
-    add_definitions(/DWEBKIT_EXPORTS /DFRAMEWORK_NAME=WebKit)
+    WEBKIT_ADD_PRECOMPILED_HEADER("WebKitPrefix.h" "win/WebKitPrefix.cpp" WebKitLegacy_SOURCES)
+    list(APPEND WebKitLegacy_SOURCES win/WebKit.resources/WebKit.rc)
+    add_definitions(/DWEBKIT_EXPORTS /DFRAMEWORK_NAME=WebKitLegacy)
 endif ()
 
-WEBKIT_FRAMEWORK(WebKit)
+WEBKIT_FRAMEWORK(WebKitLegacy)
 
-add_dependencies(WebKit WebCore)
-if (TARGET WebKitGUID)
-    add_dependencies(WebKit WebKitGUID)
+add_dependencies(WebKitLegacy WebCore)
+if (TARGET WebKitLegacyGUID)
+    add_dependencies(WebKitLegacy WebKitLegacyGUID)
 endif ()
 
 if (APPLE)
-    set_target_properties(WebKit PROPERTIES LINK_FLAGS "-umbrella WebKit")
+    set_target_properties(WebKitLegacy PROPERTIES LINK_FLAGS "-umbrella WebKitLegacy")
 endif ()
 
 if (MSVC)
     add_custom_command(
-        TARGET WebKit
+        TARGET WebKitLegacy
         POST_BUILD
-        COMMAND ${PERL_EXECUTABLE} ${WEBKIT_LIBRARIES_DIR}/tools/scripts/version-stamp.pl ${DERIVED_SOURCES_WEBKIT_DIR} $<TARGET_FILE:WebKit>
+        COMMAND ${PERL_EXECUTABLE} ${WEBKIT_LIBRARIES_DIR}/tools/scripts/version-stamp.pl ${DERIVED_SOURCES_WEBKITLEGACY_DIR} $<TARGET_FILE:WebKitLegacy>
         VERBATIM)
 endif ()
index 60330eb..2a7fc41 100644 (file)
@@ -1,3 +1,16 @@
+2017-09-18  Michael Catanzaro  <mcatanzaro@igalia.com>
+
+        [CMake] Rename WebKit target to WebKitLegacy and rename WebKit2 target to WebKit
+        https://bugs.webkit.org/show_bug.cgi?id=174558
+
+        Reviewed by Alex Christensen.
+
+        With help from Stephan Szabo, thanks!
+
+        * CMakeLists.txt:
+        * PlatformMac.cmake:
+        * PlatformWin.cmake:
+
 2017-09-16  Tim Horton  <timothy_horton@apple.com>
 
         Fix the Tools build with CMake on macOS
index db1643d..dad5cbd 100644 (file)
@@ -3,12 +3,12 @@ find_library(QUARTZ_LIBRARY Quartz)
 add_definitions(-iframework ${QUARTZ_LIBRARY}/Frameworks)
 add_definitions(-iframework ${APPLICATIONSERVICES_LIBRARY}/Versions/Current/Frameworks)
 
-list(APPEND WebKit_INCLUDE_DIRECTORIES
+list(APPEND WebKitLegacy_INCLUDE_DIRECTORIES
     "${DERIVED_SOURCES_WEBKITLEGACY_DIR}"
     "${CMAKE_SOURCE_DIR}/WebKitLibraries"
 )
 
-list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES
+list(APPEND WebKitLegacy_SYSTEM_INCLUDE_DIRECTORIES
     mac
     mac/Carbon
     mac/DefaultDelegates
@@ -25,7 +25,7 @@ list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES
     mac/WebView
 )
 
-list(APPEND WebKit_SOURCES
+list(APPEND WebKitLegacy_SOURCES
     cf/WebCoreSupport/WebInspectorClientCF.cpp
 
     mac/Carbon/CarbonUtils.m
@@ -358,10 +358,10 @@ set(WebKitLegacy_FORWARDING_HEADERS_FILES
 add_definitions("-include WebKitPrefix.h")
 
 set(C99_FILES
-    ${WEBKIT_DIR}/mac/Carbon/CarbonUtils.m
-    ${WEBKIT_DIR}/mac/Carbon/CarbonWindowContentView.m
-    ${WEBKIT_DIR}/mac/Carbon/CarbonWindowFrame.m
-    ${WEBKIT_DIR}/mac/Carbon/HIViewAdapter.m
+    ${WEBKITLEGACY_DIR}/mac/Carbon/CarbonUtils.m
+    ${WEBKITLEGACY_DIR}/mac/Carbon/CarbonWindowContentView.m
+    ${WEBKITLEGACY_DIR}/mac/Carbon/CarbonWindowFrame.m
+    ${WEBKITLEGACY_DIR}/mac/Carbon/HIViewAdapter.m
 
     mac/DefaultDelegates/WebDefaultEditingDelegate.m
     mac/DefaultDelegates/WebDefaultPolicyDelegate.m
@@ -395,7 +395,7 @@ set(C99_FILES
     mac/WebView/WebFormDelegate.m
 )
 
-foreach (_file ${WebKit_SOURCES})
+foreach (_file ${WebKitLegacy_SOURCES})
     list(FIND C99_FILES ${_file} _c99_index)
     if (${_c99_index} EQUAL -1)
         set_source_files_properties(${_file} PROPERTIES COMPILE_FLAGS "-ObjC++ -std=c++14")
@@ -440,7 +440,6 @@ list(APPEND WebKit_SOURCES
 )
 
 WEBKIT_CREATE_FORWARDING_HEADERS(WebKitLegacy DIRECTORIES ${WebKitLegacy_FORWARDING_HEADERS_DIRECTORIES} FILES ${WebKitLegacy_FORWARDING_HEADERS_FILES})
-WEBKIT_CREATE_FORWARDING_HEADERS(WebKit DIRECTORIES ${FORWARDING_HEADERS_DIR}/WebKitLegacy)
 
 # FIXME: Forwarding headers should be copies of actual headers.
 file(GLOB ObjCHeaders ${WEBCORE_DIR}/plugins/*.h)
@@ -455,6 +454,6 @@ foreach (_file ${ObjCHeaders})
     endif ()
 endforeach ()
 
-set(WebKit_OUTPUT_NAME WebKitLegacy)
+set(WebKitLegacy_OUTPUT_NAME WebKitLegacy)
 
 set(CMAKE_SHARED_LINKER_FLAGS ${CMAKE_SHARED_LINKER_FLAGS} "-compatibility_version 1 -current_version ${WEBKIT_MAC_VERSION}")
index 2b47bf5..8a061df 100644 (file)
@@ -1,25 +1,25 @@
 if (${WTF_PLATFORM_WIN_CAIRO})
     add_definitions(-DUSE_CAIRO=1 -DUSE_CURL=1 -DWEBKIT_EXPORTS=1)
-    list(APPEND WebKit_INCLUDE_DIRECTORIES
+    list(APPEND WebKitLegacy_INCLUDE_DIRECTORIES
         ${CAIRO_INCLUDE_DIRS}
         "${WEBKIT_LIBRARIES_DIR}/include"
         "${WEBCORE_DIR}/platform/graphics/cairo"
     )
-    list(APPEND WebKit_SOURCES_Classes
+    list(APPEND WebKitLegacy_SOURCES_Classes
         win/WebDownloadCURL.cpp
         win/WebURLAuthenticationChallengeSenderCURL.cpp
     )
-    list(APPEND WebKit_LIBRARIES
+    list(APPEND WebKitLegacy_LIBRARIES
         ${OPENSSL_LIBRARIES}
         PRIVATE mfuuid.lib
         PRIVATE strmiids.lib
     )
 else ()
-    list(APPEND WebKit_SOURCES_Classes
+    list(APPEND WebKitLegacy_SOURCES_Classes
         win/WebDownloadCFNet.cpp
         win/WebURLAuthenticationChallengeSenderCFNet.cpp
     )
-    list(APPEND WebKit_LIBRARIES
+    list(APPEND WebKitLegacy_LIBRARIES
         PRIVATE CFNetwork${DEBUG_SUFFIX}
         PRIVATE CoreGraphics${DEBUG_SUFFIX}
         PRIVATE CoreText${DEBUG_SUFFIX}
@@ -35,33 +35,33 @@ else ()
     )
 endif ()
 
-list(APPEND WebKit_LIBRARIES PRIVATE WTF${DEBUG_SUFFIX})
+list(APPEND WebKitLegacy_LIBRARIES PRIVATE WTF${DEBUG_SUFFIX})
 
 add_custom_command(
-    OUTPUT ${DERIVED_SOURCES_WEBKIT_DIR}/WebKitVersion.h
-    MAIN_DEPENDENCY ${WEBKIT_DIR}/scripts/generate-webkitversion.pl
-    DEPENDS ${WEBKIT_DIR}/mac/Configurations/Version.xcconfig
-    COMMAND ${PERL_EXECUTABLE} ${WEBKIT_DIR}/scripts/generate-webkitversion.pl --config ${WEBKIT_DIR}/mac/Configurations/Version.xcconfig --outputDir ${DERIVED_SOURCES_WEBKIT_DIR}
+    OUTPUT ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/WebKitVersion.h
+    MAIN_DEPENDENCY ${WEBKITLEGACY_DIR}/scripts/generate-webkitversion.pl
+    DEPENDS ${WEBKITLEGACY_DIR}/mac/Configurations/Version.xcconfig
+    COMMAND ${PERL_EXECUTABLE} ${WEBKITLEGACY_DIR}/scripts/generate-webkitversion.pl --config ${WEBKITLEGACY_DIR}/mac/Configurations/Version.xcconfig --outputDir ${DERIVED_SOURCES_WEBKITLEGACY_DIR}
     VERBATIM)
-list(APPEND WebKit_SOURCES ${DERIVED_SOURCES_WEBKIT_DIR}/WebKitVersion.h)
+list(APPEND WebKitLegacy_SOURCES ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/WebKitVersion.h)
 
-list(APPEND WebKit_INCLUDE_DIRECTORIES
+list(APPEND WebKitLegacy_INCLUDE_DIRECTORIES
     "${CMAKE_BINARY_DIR}/../include/private"
     "${CMAKE_BINARY_DIR}/../include/private/JavaScriptCore"
     "${CMAKE_BINARY_DIR}/../include/private/WebCore"
-    "${WEBKIT_DIR}/win"
-    "${WEBKIT_DIR}/win/plugins"
-    "${WEBKIT_DIR}/win/WebCoreSupport"
-    "${DERIVED_SOURCES_WEBKIT_DIR}/include"
-    "${DERIVED_SOURCES_WEBKIT_DIR}/Interfaces"
+    "${WEBKITLEGACY_DIR}/win"
+    "${WEBKITLEGACY_DIR}/win/plugins"
+    "${WEBKITLEGACY_DIR}/win/WebCoreSupport"
+    "${DERIVED_SOURCES_WEBKITLEGACY_DIR}/include"
+    "${DERIVED_SOURCES_WEBKITLEGACY_DIR}/Interfaces"
     "${FORWARDING_HEADERS_DIR}/ANGLE"
     "${FORWARDING_HEADERS_DIR}/ANGLE/include"
     "${FORWARDING_HEADERS_DIR}/ANGLE/include/egl"
     "${FORWARDING_HEADERS_DIR}/ANGLE/include/khr"
-    "${DERIVED_SOURCES_DIR}/WebKit"
+    "${DERIVED_SOURCES_DIR}/WebKitLegacy"
 )
 
-list(APPEND WebKit_INCLUDES
+list(APPEND WebKitLegacy_INCLUDES
     win/CFDictionaryPropertyBag.h
     win/COMEnumVariant.h
     win/COMPropertyBag.h
@@ -131,7 +131,7 @@ list(APPEND WebKit_INCLUDES
     win/WebWorkersPrivate.h
 )
 
-list(APPEND WebKit_SOURCES_Classes
+list(APPEND WebKitLegacy_SOURCES_Classes
     win/AccessibleBase.cpp
     win/AccessibleDocument.cpp
     win/AccessibleImage.cpp
@@ -214,7 +214,7 @@ list(APPEND WebKit_SOURCES_Classes
     win/storage/WebDatabaseProvider.cpp
 )
 
-list(APPEND WebKit_SOURCES_WebCoreSupport
+list(APPEND WebKitLegacy_SOURCES_WebCoreSupport
     win/WebCoreSupport/AcceleratedCompositingContext.cpp
     win/WebCoreSupport/EmbeddedWidget.cpp
     win/WebCoreSupport/EmbeddedWidget.h
@@ -247,11 +247,11 @@ list(APPEND WebKit_SOURCES_WebCoreSupport
 )
 
 if (USE_CF)
-    list(APPEND WebKit_SOURCES_Classes
+    list(APPEND WebKitLegacy_SOURCES_Classes
         cf/WebCoreSupport/WebInspectorClientCF.cpp
     )
 
-    list(APPEND WebKit_LIBRARIES
+    list(APPEND WebKitLegacy_LIBRARIES
         ${COREFOUNDATION_LIBRARY}
     )
 endif ()
@@ -262,44 +262,44 @@ if (CMAKE_SIZEOF_VOID_P EQUAL 8)
         set(MASM_EXECUTABLE ml64)
         set(MASM_FLAGS /c /Fo)
         add_custom_command(
-            OUTPUT ${DERIVED_SOURCES_WEBKIT_DIR}/PaintHooks.obj
+            OUTPUT ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/PaintHooks.obj
             MAIN_DEPENDENCY win/plugins/PaintHooks.asm
             COMMAND ${MASM_EXECUTABLE} ${MASM_FLAGS}
-                ${DERIVED_SOURCES_WEBKIT_DIR}/PaintHooks.obj
+                ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/PaintHooks.obj
                 ${CMAKE_CURRENT_SOURCE_DIR}/win/plugins/PaintHooks.asm
             VERBATIM)
-        list(APPEND WebKit_SOURCES
-            ${DERIVED_SOURCES_WEBKIT_DIR}/PaintHooks.obj
+        list(APPEND WebKitLegacy_SOURCES
+            ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/PaintHooks.obj
         )
     else ()
-        list(APPEND WebKit_SOURCES
+        list(APPEND WebKitLegacy_SOURCES
             win/plugins/PaintHooks.asm
         )
     endif ()
 endif ()
 
-list(APPEND WebKit_SOURCES ${WebKit_INCLUDES} ${WebKit_SOURCES_Classes} ${WebKit_SOURCES_WebCoreSupport})
+list(APPEND WebKitLegacy_SOURCES ${WebKitLegacy_INCLUDES} ${WebKitLegacy_SOURCES_Classes} ${WebKitLegacy_SOURCES_WebCoreSupport})
 
-source_group(Includes FILES ${WebKit_INCLUDES})
-source_group(Classes FILES ${WebKit_SOURCES_Classes})
-source_group(WebCoreSupport FILES ${WebKit_SOURCES_WebCoreSupport})
+source_group(Includes FILES ${WebKitLegacy_INCLUDES})
+source_group(Classes FILES ${WebKitLegacy_SOURCES_Classes})
+source_group(WebCoreSupport FILES ${WebKitLegacy_SOURCES_WebCoreSupport})
 
 # Build the COM interface:
 macro(GENERATE_INTERFACE _infile _defines _depends)
     get_filename_component(_filewe ${_infile} NAME_WE)
     add_custom_command(
-        OUTPUT  ${DERIVED_SOURCES_WEBKIT_DIR}/Interfaces/${_filewe}.h
+        OUTPUT  ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/Interfaces/${_filewe}.h
         MAIN_DEPENDENCY ${_infile}
         DEPENDS ${_depends}
-        COMMAND midl.exe /I "${CMAKE_CURRENT_SOURCE_DIR}/win/Interfaces" /I "${CMAKE_CURRENT_SOURCE_DIR}/win/Interfaces/Accessible2" /I "${DERIVED_SOURCES_WEBKIT_DIR}/include" /I "${CMAKE_CURRENT_SOURCE_DIR}/win" /WX /char signed /env win32 /tlb "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${_filewe}.tlb" /out "${DERIVED_SOURCES_WEBKIT_DIR}/Interfaces" /h "${DERIVED_SOURCES_WEBKIT_DIR}/Interfaces/${_filewe}.h" /iid "${_filewe}_i.c" ${_defines} "${CMAKE_CURRENT_SOURCE_DIR}/${_infile}"
+        COMMAND midl.exe /I "${CMAKE_CURRENT_SOURCE_DIR}/win/Interfaces" /I "${CMAKE_CURRENT_SOURCE_DIR}/win/Interfaces/Accessible2" /I "${DERIVED_SOURCES_WEBKITLEGACY_DIR}/include" /I "${CMAKE_CURRENT_SOURCE_DIR}/win" /WX /char signed /env win32 /tlb "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${_filewe}.tlb" /out "${DERIVED_SOURCES_WEBKITLEGACY_DIR}/Interfaces" /h "${DERIVED_SOURCES_WEBKITLEGACY_DIR}/Interfaces/${_filewe}.h" /iid "${_filewe}_i.c" ${_defines} "${CMAKE_CURRENT_SOURCE_DIR}/${_infile}"
         VERBATIM)
-    set_source_files_properties(${DERIVED_SOURCES_WEBKIT_DIR}/Interfaces/${_filewe}.h PROPERTIES GENERATED TRUE)
-    set_source_files_properties(${DERIVED_SOURCES_WEBKIT_DIR}/Interfaces/${_filewe}_i.c PROPERTIES GENERATED TRUE)
+    set_source_files_properties(${DERIVED_SOURCES_WEBKITLEGACY_DIR}/Interfaces/${_filewe}.h PROPERTIES GENERATED TRUE)
+    set_source_files_properties(${DERIVED_SOURCES_WEBKITLEGACY_DIR}/Interfaces/${_filewe}_i.c PROPERTIES GENERATED TRUE)
 endmacro()
 
 set(MIDL_DEFINES /D\ \"__PRODUCTION__=01\")
 
-set(WEBKIT_IDL_DEPENDENCIES
+set(WEBKITLEGACY_IDL_DEPENDENCIES
     win/Interfaces/AccessibleComparable.idl
     win/Interfaces/DOMCSS.idl
     win/Interfaces/DOMCore.idl
@@ -391,49 +391,49 @@ set(WEBKIT_IDL_DEPENDENCIES
     win/Interfaces/Accessible2/AccessibleText.idl
     win/Interfaces/Accessible2/AccessibleText2.idl
     win/Interfaces/Accessible2/IA2CommonTypes.idl
-    "${DERIVED_SOURCES_WEBKIT_DIR}/include/autoversion.h"
+    "${DERIVED_SOURCES_WEBKITLEGACY_DIR}/include/autoversion.h"
 )
 
 add_custom_command(
-    OUTPUT ${DERIVED_SOURCES_WEBKIT_DIR}/include/autoversion.h
+    OUTPUT ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/include/autoversion.h
     WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-    COMMAND ${PERL_EXECUTABLE} ${WEBKIT_LIBRARIES_DIR}/tools/scripts/auto-version.pl ${DERIVED_SOURCES_WEBKIT_DIR}
+    COMMAND ${PERL_EXECUTABLE} ${WEBKIT_LIBRARIES_DIR}/tools/scripts/auto-version.pl ${DERIVED_SOURCES_WEBKITLEGACY_DIR}
     VERBATIM)
 
-GENERATE_INTERFACE(win/Interfaces/WebKit.idl ${MIDL_DEFINES} "${WEBKIT_IDL_DEPENDENCIES}")
-GENERATE_INTERFACE(win/Interfaces/Accessible2/AccessibleApplication.idl ${MIDL_DEFINES} "${WEBKIT_IDL_DEPENDENCIES}")
-GENERATE_INTERFACE(win/Interfaces/Accessible2/Accessible2.idl ${MIDL_DEFINES} "${WEBKIT_IDL_DEPENDENCIES}")
-GENERATE_INTERFACE(win/Interfaces/Accessible2/Accessible2_2.idl ${MIDL_DEFINES} "${WEBKIT_IDL_DEPENDENCIES}")
-GENERATE_INTERFACE(win/Interfaces/Accessible2/AccessibleRelation.idl ${MIDL_DEFINES} "${WEBKIT_IDL_DEPENDENCIES}")
-GENERATE_INTERFACE(win/Interfaces/Accessible2/AccessibleStates.idl ${MIDL_DEFINES} "${WEBKIT_IDL_DEPENDENCIES}")
-GENERATE_INTERFACE(win/Interfaces/Accessible2/IA2CommonTypes.idl ${MIDL_DEFINES} "${WEBKIT_IDL_DEPENDENCIES}")
-GENERATE_INTERFACE(win/Interfaces/Accessible2/AccessibleEditableText.idl ${MIDL_DEFINES} "${WEBKIT_IDL_DEPENDENCIES}")
-GENERATE_INTERFACE(win/Interfaces/Accessible2/AccessibleText.idl ${MIDL_DEFINES} "${WEBKIT_IDL_DEPENDENCIES}")
-GENERATE_INTERFACE(win/Interfaces/Accessible2/AccessibleText2.idl ${MIDL_DEFINES} "${WEBKIT_IDL_DEPENDENCIES}")
+GENERATE_INTERFACE(win/Interfaces/WebKit.idl ${MIDL_DEFINES} "${WEBKITLEGACY_IDL_DEPENDENCIES}")
+GENERATE_INTERFACE(win/Interfaces/Accessible2/AccessibleApplication.idl ${MIDL_DEFINES} "${WEBKITLEGACY_IDL_DEPENDENCIES}")
+GENERATE_INTERFACE(win/Interfaces/Accessible2/Accessible2.idl ${MIDL_DEFINES} "${WEBKITLEGACY_IDL_DEPENDENCIES}")
+GENERATE_INTERFACE(win/Interfaces/Accessible2/Accessible2_2.idl ${MIDL_DEFINES} "${WEBKITLEGACY_IDL_DEPENDENCIES}")
+GENERATE_INTERFACE(win/Interfaces/Accessible2/AccessibleRelation.idl ${MIDL_DEFINES} "${WEBKITLEGACY_IDL_DEPENDENCIES}")
+GENERATE_INTERFACE(win/Interfaces/Accessible2/AccessibleStates.idl ${MIDL_DEFINES} "${WEBKITLEGACY_IDL_DEPENDENCIES}")
+GENERATE_INTERFACE(win/Interfaces/Accessible2/IA2CommonTypes.idl ${MIDL_DEFINES} "${WEBKITLEGACY_IDL_DEPENDENCIES}")
+GENERATE_INTERFACE(win/Interfaces/Accessible2/AccessibleEditableText.idl ${MIDL_DEFINES} "${WEBKITLEGACY_IDL_DEPENDENCIES}")
+GENERATE_INTERFACE(win/Interfaces/Accessible2/AccessibleText.idl ${MIDL_DEFINES} "${WEBKITLEGACY_IDL_DEPENDENCIES}")
+GENERATE_INTERFACE(win/Interfaces/Accessible2/AccessibleText2.idl ${MIDL_DEFINES} "${WEBKITLEGACY_IDL_DEPENDENCIES}")
 
-add_library(WebKitGUID STATIC
-    "${DERIVED_SOURCES_WEBKIT_DIR}/Interfaces/WebKit.h"
-    "${DERIVED_SOURCES_WEBKIT_DIR}/Interfaces/AccessibleApplication.h"
-    "${DERIVED_SOURCES_WEBKIT_DIR}/Interfaces/Accessible2.h"
-    "${DERIVED_SOURCES_WEBKIT_DIR}/Interfaces/Accessible2_2.h"
-    "${DERIVED_SOURCES_WEBKIT_DIR}/Interfaces/AccessibleRelation.h"
-    "${DERIVED_SOURCES_WEBKIT_DIR}/Interfaces/AccessibleStates.h"
-    "${DERIVED_SOURCES_WEBKIT_DIR}/Interfaces/IA2CommonTypes.h"
-    "${DERIVED_SOURCES_WEBKIT_DIR}/Interfaces/AccessibleEditableText.h"
-    "${DERIVED_SOURCES_WEBKIT_DIR}/Interfaces/AccessibleText.h"
-    "${DERIVED_SOURCES_WEBKIT_DIR}/Interfaces/AccessibleText2.h"
-    "${DERIVED_SOURCES_WEBKIT_DIR}/Interfaces/WebKit_i.c"
-    "${DERIVED_SOURCES_WEBKIT_DIR}/Interfaces/AccessibleApplication_i.c"
-    "${DERIVED_SOURCES_WEBKIT_DIR}/Interfaces/Accessible2_i.c"
-    "${DERIVED_SOURCES_WEBKIT_DIR}/Interfaces/Accessible2_2_i.c"
-    "${DERIVED_SOURCES_WEBKIT_DIR}/Interfaces/AccessibleRelation_i.c"
-    "${DERIVED_SOURCES_WEBKIT_DIR}/Interfaces/AccessibleEditableText_i.c"
-    "${DERIVED_SOURCES_WEBKIT_DIR}/Interfaces/AccessibleText_i.c"
-    "${DERIVED_SOURCES_WEBKIT_DIR}/Interfaces/AccessibleText2_i.c"
+add_library(WebKitLegacyGUID STATIC
+    "${DERIVED_SOURCES_WEBKITLEGACY_DIR}/Interfaces/WebKit.h"
+    "${DERIVED_SOURCES_WEBKITLEGACY_DIR}/Interfaces/AccessibleApplication.h"
+    "${DERIVED_SOURCES_WEBKITLEGACY_DIR}/Interfaces/Accessible2.h"
+    "${DERIVED_SOURCES_WEBKITLEGACY_DIR}/Interfaces/Accessible2_2.h"
+    "${DERIVED_SOURCES_WEBKITLEGACY_DIR}/Interfaces/AccessibleRelation.h"
+    "${DERIVED_SOURCES_WEBKITLEGACY_DIR}/Interfaces/AccessibleStates.h"
+    "${DERIVED_SOURCES_WEBKITLEGACY_DIR}/Interfaces/IA2CommonTypes.h"
+    "${DERIVED_SOURCES_WEBKITLEGACY_DIR}/Interfaces/AccessibleEditableText.h"
+    "${DERIVED_SOURCES_WEBKITLEGACY_DIR}/Interfaces/AccessibleText.h"
+    "${DERIVED_SOURCES_WEBKITLEGACY_DIR}/Interfaces/AccessibleText2.h"
+    "${DERIVED_SOURCES_WEBKITLEGACY_DIR}/Interfaces/WebKit_i.c"
+    "${DERIVED_SOURCES_WEBKITLEGACY_DIR}/Interfaces/AccessibleApplication_i.c"
+    "${DERIVED_SOURCES_WEBKITLEGACY_DIR}/Interfaces/Accessible2_i.c"
+    "${DERIVED_SOURCES_WEBKITLEGACY_DIR}/Interfaces/Accessible2_2_i.c"
+    "${DERIVED_SOURCES_WEBKITLEGACY_DIR}/Interfaces/AccessibleRelation_i.c"
+    "${DERIVED_SOURCES_WEBKITLEGACY_DIR}/Interfaces/AccessibleEditableText_i.c"
+    "${DERIVED_SOURCES_WEBKITLEGACY_DIR}/Interfaces/AccessibleText_i.c"
+    "${DERIVED_SOURCES_WEBKITLEGACY_DIR}/Interfaces/AccessibleText2_i.c"
 )
-set_target_properties(WebKitGUID PROPERTIES OUTPUT_NAME WebKitGUID${DEBUG_SUFFIX})
+set_target_properties(WebKitLegacyGUID PROPERTIES OUTPUT_NAME WebKitLegacyGUID${DEBUG_SUFFIX})
 
-list(APPEND WebKit_LIBRARIES
+list(APPEND WebKitLegacy_LIBRARIES
     PRIVATE Comctl32
     PRIVATE Comsupp
     PRIVATE Crypt32
@@ -447,13 +447,13 @@ list(APPEND WebKit_LIBRARIES
     PRIVATE Usp10
     PRIVATE Version
     PRIVATE Winmm
-    PRIVATE WebKitGUID${DEBUG_SUFFIX}
+    PRIVATE WebKitLegacyGUID${DEBUG_SUFFIX}
     PRIVATE WebCoreDerivedSources${DEBUG_SUFFIX}
     PRIVATE WindowsCodecs
 )
 
 if (ENABLE_GRAPHICS_CONTEXT_3D)
-    list(APPEND WebKit_LIBRARIES
+    list(APPEND WebKitLegacy_LIBRARIES
         libANGLE${DEBUG_SUFFIX}
         libEGL${DEBUG_SUFFIX}
         libGLESv2${DEBUG_SUFFIX}
@@ -466,7 +466,7 @@ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SUBSYSTEM:WINDOWS")
 # We need the webkit libraries to come before the system default libraries to prevent symbol conflicts with uuid.lib.
 # To do this we add system default libs as webkit libs and zero out system default libs.
 string(REPLACE " " "\;" CXX_LIBS ${CMAKE_CXX_STANDARD_LIBRARIES})
-list(APPEND WebKit_LIBRARIES ${CXX_LIBS})
+list(APPEND WebKitLegacy_LIBRARIES ${CXX_LIBS})
 set(CMAKE_CXX_STANDARD_LIBRARIES "")
 
 set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /NODEFAULTLIB:MSVCRT /NODEFAULTLIB:MSVCRTD")
@@ -474,17 +474,17 @@ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /NODEFAULTLIB:MSVCRT
 # If this directory isn't created before midl runs and attempts to output WebKit.tlb,
 # It fails with an unusual error - midl failed - failed to save all changes
 file(MAKE_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
-file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKIT_DIR}/Interfaces)
+file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/Interfaces)
 
-set(WebKitGUID_PRE_BUILD_COMMAND "${CMAKE_BINARY_DIR}/DerivedSources/WebKit/preBuild.cmd")
-file(WRITE "${WebKitGUID_PRE_BUILD_COMMAND}" "@xcopy /y /d /f \"${CMAKE_CURRENT_SOURCE_DIR}/win/WebKitCOMAPI.h\" \"${FORWARDING_HEADERS_DIR}/WebKit\" >nul 2>nul\n@xcopy /y /d /f \"${CMAKE_CURRENT_SOURCE_DIR}/win/CFDictionaryPropertyBag.h\" \"${FORWARDING_HEADERS_DIR}/WebKit\" >nul 2>nul\n")
-file(MAKE_DIRECTORY ${FORWARDING_HEADERS_DIR}/WebKit)
-add_custom_command(TARGET WebKitGUID PRE_BUILD COMMAND ${WebKitGUID_PRE_BUILD_COMMAND} VERBATIM)
+set(WebKitLegacyGUID_PRE_BUILD_COMMAND "${CMAKE_BINARY_DIR}/DerivedSources/WebKitLegacy/preBuild.cmd")
+file(WRITE "${WebKitLegacyGUID_PRE_BUILD_COMMAND}" "@xcopy /y /d /f \"${CMAKE_CURRENT_SOURCE_DIR}/win/WebKitCOMAPI.h\" \"${FORWARDING_HEADERS_DIR}/WebKitLegacy\" >nul 2>nul\n@xcopy /y /d /f \"${CMAKE_CURRENT_SOURCE_DIR}/win/CFDictionaryPropertyBag.h\" \"${FORWARDING_HEADERS_DIR}/WebKitLegacy\" >nul 2>nul\n")
+file(MAKE_DIRECTORY ${FORWARDING_HEADERS_DIR}/WebKitLegacy)
+add_custom_command(TARGET WebKitLegacyGUID PRE_BUILD COMMAND ${WebKitLegacyGUID_PRE_BUILD_COMMAND} VERBATIM)
 
-set(WebKitGUID_POST_BUILD_COMMAND "${CMAKE_BINARY_DIR}/DerivedSources/WebKit/postBuild.cmd")
-file(WRITE "${WebKitGUID_POST_BUILD_COMMAND}" "@xcopy /y /d /f \"${DERIVED_SOURCES_WEBKIT_DIR}/Interfaces/*.h\" \"${FORWARDING_HEADERS_DIR}/WebKit\" >nul 2>nul")
-add_custom_command(TARGET WebKitGUID POST_BUILD COMMAND ${WebKitGUID_POST_BUILD_COMMAND} VERBATIM)
+set(WebKitLegacyGUID_POST_BUILD_COMMAND "${CMAKE_BINARY_DIR}/DerivedSources/WebKitLegacy/postBuild.cmd")
+file(WRITE "${WebKitLegacyGUID_POST_BUILD_COMMAND}" "@xcopy /y /d /f \"${DERIVED_SOURCES_WEBKITLEGACY_DIR}/Interfaces/*.h\" \"${FORWARDING_HEADERS_DIR}/WebKitLegacy\" >nul 2>nul")
+add_custom_command(TARGET WebKitLegacyGUID POST_BUILD COMMAND ${WebKitLegacyGUID_POST_BUILD_COMMAND} VERBATIM)
 
-set(WebKit_OUTPUT_NAME
+set(WebKitLegacy_OUTPUT_NAME
     WebKit${DEBUG_SUFFIX}
 )
index 6d9f287..f7fb1ef 100644 (file)
@@ -118,7 +118,7 @@ else ()
     WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MINIBROWSER PUBLIC OFF)
     WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_API_TESTS PRIVATE OFF)
     if (NOT CMAKE_SYSTEM_NAME MATCHES "Darwin")
-        set(WebKit2_VERSION_SCRIPT "-Wl,--version-script,${CMAKE_MODULE_PATH}/gtksymbols.filter")
+        set(WebKit_VERSION_SCRIPT "-Wl,--version-script,${CMAKE_MODULE_PATH}/gtksymbols.filter")
     endif ()
 endif ()
 
index 4fdc05c..6c37be3 100644 (file)
@@ -129,7 +129,7 @@ SET_AND_EXPOSE_TO_BUILD(USE_COORDINATED_GRAPHICS_THREADED TRUE)
 set(FORWARDING_HEADERS_DIR ${DERIVED_SOURCES_DIR}/ForwardingHeaders)
 set(FORWARDING_HEADERS_WPE_DIR ${FORWARDING_HEADERS_DIR}/wpe)
 set(FORWARDING_HEADERS_WPE_EXTENSION_DIR ${FORWARDING_HEADERS_DIR}/wpe-webextension)
-set(DERIVED_SOURCES_WPE_API_DIR ${DERIVED_SOURCES_WEBKIT2_DIR}/wpe)
+set(DERIVED_SOURCES_WPE_API_DIR ${DERIVED_SOURCES_WEBKIT_DIR}/wpe)
 
 # Build with -fvisibility=hidden to reduce the size of the shared library.
 # Not to be used when building the WebKitTestRunner library.
index f919af7..bac0f2c 100644 (file)
@@ -68,12 +68,11 @@ if (NOT HAS_RUN_WEBKIT_COMMON)
     endif ()
 
     if (ENABLE_WEBKIT)
-        file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKIT2_DIR})
+        file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKIT_DIR})
     endif ()
 
     if (ENABLE_WEBKIT_LEGACY)
         file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKITLEGACY_DIR})
-        file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKIT_DIR})
     endif ()
 
     if (ENABLE_WEBDRIVER)
index be96f16..9ddc981 100644 (file)
@@ -13,11 +13,11 @@ endif ()
 if (NOT PAL_DIR)
     set(PAL_DIR "${CMAKE_SOURCE_DIR}/Source/WebCore/PAL")
 endif ()
-if (NOT WEBKIT_DIR)
-    set(WEBKIT_DIR "${CMAKE_SOURCE_DIR}/Source/WebKitLegacy")
+if (NOT WEBKITLEGACY_DIR)
+    set(WEBKITLEGACY_DIR "${CMAKE_SOURCE_DIR}/Source/WebKitLegacy")
 endif ()
-if (NOT WEBKIT2_DIR)
-    set(WEBKIT2_DIR "${CMAKE_SOURCE_DIR}/Source/WebKit")
+if (NOT WEBKIT_DIR)
+    set(WEBKIT_DIR "${CMAKE_SOURCE_DIR}/Source/WebKit")
 endif ()
 if (NOT THIRDPARTY_DIR)
     set(THIRDPARTY_DIR "${CMAKE_SOURCE_DIR}/Source/ThirdParty")
@@ -36,7 +36,6 @@ set(DERIVED_SOURCES_WEBCORE_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebCore")
 set(DERIVED_SOURCES_WEBDRIVER_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebDriver")
 set(DERIVED_SOURCES_WEBKITLEGACY_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebKitLegacy")
 set(DERIVED_SOURCES_WEBKIT_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebKit")
-set(DERIVED_SOURCES_WEBKIT2_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebKit2")
 set(DERIVED_SOURCES_WEBINSPECTORUI_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebInspectorUI")
 set(DERIVED_SOURCES_WTF_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WTF")
 
index 8c09fdb..29c7f89 100644 (file)
@@ -1,3 +1,60 @@
+2017-09-18  Michael Catanzaro  <mcatanzaro@igalia.com>
+
+        [CMake] Rename WebKit target to WebKitLegacy and rename WebKit2 target to WebKit
+        https://bugs.webkit.org/show_bug.cgi?id=174558
+
+        Reviewed by Alex Christensen.
+
+        With help from Stephan Szabo, thanks!
+
+        * DumpRenderTree/PlatformMac.cmake:
+        * DumpRenderTree/PlatformWin.cmake:
+        * DumpRenderTree/win/AccessibilityControllerWin.cpp:
+        * DumpRenderTree/win/DRTDesktopNotificationPresenter.h:
+        * DumpRenderTree/win/DumpRenderTree.cpp:
+        * DumpRenderTree/win/EditingDelegate.h:
+        * DumpRenderTree/win/EventSender.cpp:
+        * DumpRenderTree/win/FrameLoadDelegate.cpp:
+        * DumpRenderTree/win/FrameLoadDelegate.h:
+        * DumpRenderTree/win/GCControllerWin.cpp:
+        * DumpRenderTree/win/HistoryDelegate.cpp:
+        * DumpRenderTree/win/HistoryDelegate.h:
+        * DumpRenderTree/win/PolicyDelegate.h:
+        * DumpRenderTree/win/ResourceLoadDelegate.cpp:
+        * DumpRenderTree/win/ResourceLoadDelegate.h:
+        * DumpRenderTree/win/TestRunnerWin.cpp:
+        * DumpRenderTree/win/TextInputControllerWin.cpp:
+        * DumpRenderTree/win/UIDelegate.cpp:
+        * DumpRenderTree/win/UIDelegate.h:
+        * DumpRenderTree/win/WorkQueueItemWin.cpp:
+        * MiniBrowser/gtk/CMakeLists.txt:
+        * MiniBrowser/mac/CMakeLists.txt:
+        * MiniBrowser/win/AccessibilityDelegate.cpp:
+        * MiniBrowser/win/AccessibilityDelegate.h:
+        * MiniBrowser/win/CMakeLists.txt:
+        * MiniBrowser/win/Common.cpp:
+        * MiniBrowser/win/DOMDefaultImpl.h:
+        * MiniBrowser/win/MiniBrowser.cpp:
+        * MiniBrowser/win/MiniBrowser.h:
+        * MiniBrowser/win/MiniBrowserWebHost.cpp:
+        * MiniBrowser/win/MiniBrowserWebHost.h:
+        * MiniBrowser/win/PageLoadTestClient.h:
+        * MiniBrowser/win/PrintWebUIDelegate.cpp:
+        * MiniBrowser/win/PrintWebUIDelegate.h:
+        * MiniBrowser/win/ResourceLoadDelegate.cpp:
+        * MiniBrowser/win/ResourceLoadDelegate.h:
+        * MiniBrowser/win/WebDownloadDelegate.h:
+        * TestWebKitAPI/CMakeLists.txt:
+        * TestWebKitAPI/PlatformGTK.cmake:
+        * TestWebKitAPI/PlatformWPE.cmake:
+        * TestWebKitAPI/PlatformWin.cmake:
+        * TestWebKitAPI/Tests/WebKitLegacy/win/ScaleWebView.cpp:
+        * TestWebKitAPI/Tests/WebKitLegacy/win/WebViewDestruction.cpp:
+        * TestWebKitAPI/glib/CMakeLists.txt:
+        * WebKitTestRunner/CMakeLists.txt:
+        * WebKitTestRunner/PlatformGTK.cmake:
+        * WebKitTestRunner/PlatformWPE.cmake:
+
 2017-09-18  Myles C. Maxfield  <mmaxfield@apple.com>
 
         Fill out vector types in WSL's standard library
index cdc981a..4a3cdef 100644 (file)
@@ -16,14 +16,14 @@ link_directories(../../WebKitLibraries)
 
 list(APPEND TestNetscapePlugIn_LIBRARIES
     ${QUARTZ_LIBRARY}
-    WebKit2
+    WebKitLegacy
 )
 
 list(APPEND DumpRenderTree_LIBRARIES
     ${CARBON_LIBRARY}
     ${QUARTZ_LIBRARY}
     ${WEBKITSYSTEMINTERFACE_LIBRARY}
-    WebKit2
+    WebKitLegacy
 )
 
 if ("${CURRENT_OSX_VERSION}" MATCHES "10.9")
index 68518d2..626ede1 100644 (file)
@@ -24,7 +24,7 @@ set(DumpRenderTreeLib_SOURCES
 )
 
 list(APPEND TestNetscapePlugIn_LIBRARIES
-    WebKit
+    WebKitLegacy
 )
 
 set(DumpRenderTree_SOURCES
@@ -55,7 +55,7 @@ endif ()
 list(APPEND TestNetscapePlugIn_LIBRARIES
     Msimg32
     Shlwapi
-    WebKit
+    WebKitLegacy
 )
 
 list(APPEND DumpRenderTree_INCLUDE_DIRECTORIES
@@ -65,13 +65,13 @@ list(APPEND DumpRenderTree_INCLUDE_DIRECTORIES
     TestNetscapePlugIn/Tests
     TestNetscapePlugIn/win
     TestNetscapePlugIn/Tests/win
-    ${WEBKIT_DIR}/win
-    ${DERIVED_SOURCES_DIR}/WebKit/Interfaces
+    ${WEBKITLegacy_DIR}/win
+    ${DERIVED_SOURCES_DIR}/WebKitLegacy/Interfaces
 )
 
 list(APPEND DumpRenderTree_LIBRARIES
     WTF
-    WebKit
+    WebKitLegacy
     shlwapi
 )
 
@@ -79,7 +79,7 @@ set(DumpRenderTreeLib_LIBRARIES
     ${DumpRenderTree_LIBRARIES}
     Comsuppw
     Oleacc
-    WebKitGUID
+    WebKitLegacyGUID
 )
 
 if (${WTF_PLATFORM_WIN_CAIRO})
index 052e469..cf5d246 100644 (file)
@@ -35,7 +35,7 @@
 #include <JavaScriptCore/JSStringRefBSTR.h>
 #include <WebCore/AccessibilityObjectWrapperWin.h>
 #include <WebCore/COMPtr.h>
-#include <WebKit/WebKit.h>
+#include <WebKitLegacy/WebKit.h>
 #include <comutil.h>
 #include <oleacc.h>
 #include <string>
index eb0c7df..eb2ce49 100644 (file)
@@ -29,7 +29,7 @@
 #ifndef DRTDesktopNotificationPresenter_h
 #define DRTDesktopNotificationPresenter_h
 
-#include <WebKit/WebKit.h>
+#include <WebKitLegacy/WebKit.h>
 #include <windef.h>
 
 class DRTDesktopNotificationPresenter : public IWebDesktopNotificationsDelegate {
index 2a291b4..fde1fe1 100644 (file)
@@ -46,8 +46,8 @@
 #include <CoreFoundation/CoreFoundation.h>
 #include <JavaScriptCore/TestRunnerUtils.h>
 #include <WebCore/FileSystem.h>
-#include <WebKit/WebKit.h>
-#include <WebKit/WebKitCOMAPI.h>
+#include <WebKitLegacy/WebKit.h>
+#include <WebKitLegacy/WebKitCOMAPI.h>
 #include <comutil.h>
 #include <cstdio>
 #include <cstring>
index 7d95a5e..8110ffa 100644 (file)
@@ -29,7 +29,7 @@
 #ifndef EditingDelegate_h
 #define EditingDelegate_h
 
-#include <WebKit/WebKit.h>
+#include <WebKitLegacy/WebKit.h>
 
 class __declspec(uuid("265DCD4B-79C3-44a2-84BC-511C3EDABD6F")) EditingDelegate : public IWebEditingDelegate2, public IWebNotificationObserver {
 public:
index 2b39606..8ca8d55 100644 (file)
@@ -39,7 +39,7 @@
 
 #include <JavaScriptCore/JavaScriptCore.h>
 #include <WebCore/COMPtr.h>
-#include <WebKit/WebKit.h>
+#include <WebKitLegacy/WebKit.h>
 #include <windows.h>
 #include <wtf/ASCIICType.h>
 #include <wtf/Assertions.h>
index 3f6bd9e..a86baec 100644 (file)
@@ -42,7 +42,7 @@
 #include "WorkQueue.h"
 #include <WebCore/COMPtr.h>
 #include <JavaScriptCore/JavaScriptCore.h>
-#include <WebKit/WebKit.h>
+#include <WebKitLegacy/WebKit.h>
 #include <stdio.h>
 #include <string>
 #include <wtf/Assertions.h>
index 8695c42..2ce2e9d 100644 (file)
@@ -29,7 +29,7 @@
 #ifndef FrameLoadDelegate_h
 #define FrameLoadDelegate_h
 
-#include <WebKit/WebKit.h>
+#include <WebKitLegacy/WebKit.h>
 
 class AccessibilityController;
 class TextInputController;
index 376ec53..fee1ed6 100644 (file)
@@ -31,8 +31,8 @@
 
 #include "DumpRenderTree.h"
 #include <WebCore/COMPtr.h>
-#include <WebKit/WebKit.h>
-#include <WebKit/WebKitCOMAPI.h>
+#include <WebKitLegacy/WebKit.h>
+#include <WebKitLegacy/WebKitCOMAPI.h>
 
 void GCController::collect() const
 {
index a1ec868..45260ce 100644 (file)
@@ -29,9 +29,9 @@
 #include "DumpRenderTree.h"
 #include "DumpRenderTreeWin.h"
 #include "TestRunner.h"
+#include <WebKitLegacy/WebKit.h>
 #include <comutil.h>
 #include <string>
-#include <WebKit/WebKit.h>
 
 using std::wstring;
 
index 281c883..ba6a1af 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef HistoryDelegate_h
 #define HistoryDelegate_h
 
-#include <WebKit/WebKit.h>
+#include <WebKitLegacy/WebKit.h>
 
 class HistoryDelegate : public IWebHistoryDelegate {
 public:
index bd099b4..a27a1e3 100644 (file)
@@ -29,7 +29,7 @@
 #ifndef PolicyDelegate_h
 #define PolicyDelegate_h
 
-#include <WebKit/WebKit.h>
+#include <WebKitLegacy/WebKit.h>
 
 class TestRunner;
 
index eb14efc..e02cba7 100644 (file)
@@ -31,7 +31,7 @@
 
 #include "DumpRenderTree.h"
 #include "TestRunner.h"
-#include <WebKit/WebKitCOMAPI.h>
+#include <WebKitLegacy/WebKitCOMAPI.h>
 #include <comutil.h>
 #include <sstream>
 #include <tchar.h>
index 59e24f6..11aeb78 100644 (file)
@@ -29,7 +29,7 @@
 #ifndef ResourceLoadDelegate_h
 #define ResourceLoadDelegate_h
 
-#include <WebKit/WebKit.h>
+#include <WebKitLegacy/WebKit.h>
 #include <string>
 #include <wtf/HashMap.h>
 
index abe824b..46e581a 100644 (file)
@@ -39,8 +39,8 @@
 #include <JavaScriptCore/JSStringRefBSTR.h>
 #include <JavaScriptCore/JavaScriptCore.h>
 #include <WebCore/COMPtr.h>
-#include <WebKit/WebKit.h>
-#include <WebKit/WebKitCOMAPI.h>
+#include <WebKitLegacy/WebKit.h>
+#include <WebKitLegacy/WebKitCOMAPI.h>
 #include <comutil.h>
 #include <shlguid.h>
 #include <shlwapi.h>
index 388ec63..199f684 100644 (file)
@@ -32,7 +32,7 @@
 #include "DumpRenderTree.h"
 #include <JavaScriptCore/JSStringRefBSTR.h>
 #include <WebCore/COMPtr.h>
-#include <WebKit/WebKit.h>
+#include <WebKitLegacy/WebKit.h>
 #include <comutil.h>
 #include <string>
 
index 9f7ab43..f0adbce 100644 (file)
@@ -39,8 +39,8 @@
 #include <wtf/Platform.h>
 #include <wtf/Vector.h>
 #include <JavaScriptCore/JavaScriptCore.h>
-#include <WebKit/WebKit.h>
-#include <WebKit/WebKitCOMAPI.h>
+#include <WebKitLegacy/WebKit.h>
+#include <WebKitLegacy/WebKitCOMAPI.h>
 #include <comutil.h>
 #include <stdio.h>
 
index 624b40f..fa4edbb 100644 (file)
@@ -30,7 +30,7 @@
 #define UIDelegate_h
 
 #include <WebCore/COMPtr.h>
-#include <WebKit/WebKit.h>
+#include <WebKitLegacy/WebKit.h>
 #include <windef.h>
 
 class DRTUndoManager;
index 19831f0..70f0345 100644 (file)
 
 #include <comutil.h>
 #include "DumpRenderTree.h"
-#include <WebCore/COMPtr.h>
-#include <WebKit/WebKit.h>
-#include <WebKit/WebKitCOMAPI.h>
 #include <JavaScriptCore/JSStringRef.h>
 #include <JavaScriptCore/JSStringRefBSTR.h>
 #include <JavaScriptCore/JSStringRefCF.h>
+#include <WebCore/COMPtr.h>
+#include <WebKitLegacy/WebKit.h>
+#include <WebKitLegacy/WebKitCOMAPI.h>
 #include <wtf/RetainPtr.h>
 #include <wtf/Vector.h>
 #include <string>
index e832a86..dc2b61e 100644 (file)
@@ -36,7 +36,7 @@ set(MiniBrowser_SYSTEM_INCLUDE_DIRECTORIES
 
 set(MiniBrowser_LIBRARIES
     ${JavaScriptCore_LIBRARY_NAME}
-    WebKit2
+    WebKit
     ${GTK3_LIBRARIES}
     ${GLIB_LIBRARIES}
     ${LIBSOUP_LIBRARIES}
index c2f8538..33e3d32 100644 (file)
@@ -22,7 +22,7 @@ set(MiniBrowser_INCLUDE_DIRECTORIES
 )
 
 set(MiniBrowser_LIBRARIES
-    WebKit2
+    WebKit
 )
 
 set(EXECUTABLE_NAME MiniBrowser)
index 12f7626..ce8a9a6 100644 (file)
@@ -26,7 +26,7 @@
 #include "stdafx.h"
 #include "AccessibilityDelegate.h"
 
-#include <WebKit/WebKitCOMAPI.h>
+#include <WebKitLegacy/WebKitCOMAPI.h>
 #include <commctrl.h>
 #include <commdlg.h>
 #include <objbase.h>
index a377c89..39cdbe2 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef AccessibilityDelegate_h
 #define AccessibilityDelegate_h
 
-#include <WebKit/WebKit.h>
+#include <WebKitLegacy/WebKit.h>
 
 class AccessibilityDelegate : public IAccessibilityDelegate {
 public:
index e4eca5e..796f015 100644 (file)
@@ -1,6 +1,6 @@
 set(MiniBrowser_INCLUDE_DIRECTORIES
     "${FORWARDING_HEADERS_DIR}"
-    "${FORWARDING_HEADERS_DIR}/WebKit"
+    "${FORWARDING_HEADERS_DIR}/WebKitLegacy"
     "${CMAKE_SOURCE_DIR}"
     "${CMAKE_SOURCE_DIR}/Source"
 )
@@ -22,8 +22,8 @@ set(MiniBrowser_SOURCES
 set(MiniBrowser_LIBRARIES
     DbgHelp
     WTF
-    WebKit
-    WebKitGUID
+    WebKitLegacy
+    WebKitLegacyGUID
     comctl32
     comsupp
     comsuppw
index 1b71a76..bb7a354 100644 (file)
@@ -33,7 +33,7 @@
 #include "WebDownloadDelegate.h"
 #include "MiniBrowser.h"
 #include "MiniBrowserReplace.h"
-#include <WebKit/WebKitCOMAPI.h>
+#include <WebKitLegacy/WebKitCOMAPI.h>
 #include <wtf/ExportMacros.h>
 #include <wtf/Platform.h>
 #include <wtf/text/CString.h>
@@ -41,7 +41,7 @@
 
 #if USE(CF)
 #include <CoreFoundation/CFRunLoop.h>
-#include <WebKit/CFDictionaryPropertyBag.h>
+#include <WebKitLegacy/CFDictionaryPropertyBag.h>
 #endif
 
 #include <cassert>
index cbb30a9..5c58830 100644 (file)
@@ -28,7 +28,7 @@
 #ifndef DOMDefaultImpl_h
 #define DOMDefaultImpl_h
 
-#include <WebKit/WebKit.h>
+#include <WebKitLegacy/WebKit.h>
 
 class WebScriptObject : public IWebScriptObject {
 public:
index b5aee85..ffbc98f 100644 (file)
@@ -32,7 +32,7 @@
 #include "DOMDefaultImpl.h"
 #include "MiniBrowserLibResource.h"
 #include "MiniBrowserReplace.h"
-#include <WebKit/WebKitCOMAPI.h>
+#include <WebKitLegacy/WebKitCOMAPI.h>
 #include <wtf/ExportMacros.h>
 #include <wtf/Platform.h>
 
index 4cb507c..a7032f4 100644 (file)
@@ -24,7 +24,7 @@
  */
 
 #include "PageLoadTestClient.h"
-#include <WebKit/WebKit.h>
+#include <WebKitLegacy/WebKit.h>
 #include <comip.h>
 #include <memory>
 #include <vector>
index 28db6e3..16a87c0 100644 (file)
@@ -32,7 +32,7 @@
 #include "DOMDefaultImpl.h"
 #include "PageLoadTestClient.h"
 #include "MiniBrowser.h"
-#include <WebKit/WebKit.h>
+#include <WebKitLegacy/WebKit.h>
 
 class SimpleEventListener : public DOMEventListener {
 public:
index ecbf1b8..a7c3304 100644 (file)
@@ -26,8 +26,8 @@
 #pragma once
 
 #include "resource.h"
+#include <WebKitLegacy/WebKit.h>
 #include <comutil.h>
-#include <WebKit/WebKit.h>
 
 class MiniBrowser;
 
index 74aaad5..a044b20 100644 (file)
@@ -27,7 +27,7 @@
 #define PageLoadTestClient_h
 
 #include <CoreFoundation/CFDate.h>
-#include <WebKit/WebKit.h>
+#include <WebKitLegacy/WebKit.h>
 #include <wtf/Assertions.h>
 #include <wtf/HashSet.h>
 #include <wtf/Noncopyable.h>
index 0c188c3..99ca5ff 100644 (file)
@@ -31,7 +31,7 @@
 #include <CoreFoundation/CoreFoundation.h>
 #endif
 #include <WebCore/COMPtr.h>
-#include <WebKit/WebKitCOMAPI.h>
+#include <WebKitLegacy/WebKitCOMAPI.h>
 #include <comip.h>
 #include <commctrl.h>
 #include <commdlg.h>
index 2e46d27..b5d80c7 100644 (file)
@@ -27,7 +27,7 @@
 #ifndef PrintWebUIDelegate_h
 #define PrintWebUIDelegate_h
 
-#include <WebKit/WebKit.h>
+#include <WebKitLegacy/WebKit.h>
 
 class PrintWebUIDelegate : public IWebUIDelegate {
 public:
index 5d17ddd..75d3545 100644 (file)
@@ -28,7 +28,7 @@
 #include "MiniBrowser.h"
 #include "PageLoadTestClient.h"
 #include <COMPtr.h>
-#include <WebKit/WebKitCOMAPI.h>
+#include <WebKitLegacy/WebKitCOMAPI.h>
 #include <comip.h>
 #include <commctrl.h>
 #include <commdlg.h>
index 79b4fb2..b56c6fe 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef ResourceLoadDelegate_h
 #define ResourceLoadDelegate_h
 
-#include <WebKit/WebKit.h>
+#include <WebKitLegacy/WebKit.h>
 
 class MiniBrowser;
 
index 84266d0..289c40b 100644 (file)
@@ -26,8 +26,8 @@
 #ifndef WebDownloadDelegate_h
 #define WebDownloadDelegate_h
 
-#include <WebKit/WebKit.h>
-#include <WebKit/WebKitCOMAPI.h>
+#include <WebKitLegacy/WebKit.h>
+#include <WebKitLegacy/WebKitCOMAPI.h>
 
 class WebDownloadDelegate : public IWebDownloadDelegate {
 public:
index 4dabc14..9780f62 100644 (file)
@@ -15,19 +15,19 @@ set(TestWebKitAPI_LIBRARIES
 )
 
 if (ENABLE_WEBKIT)
-    set(test_webkit2_api_LIBRARIES
+    set(test_webkit_api_LIBRARIES
         JavaScriptCore
         TestWebKitAPIBase
         WTF
-        WebKit2
+        WebKit
         gtest
     )
     list(APPEND TestWebKitAPI_LIBRARIES
-        WebKit2
+        WebKit
     )
 else ()
     list(APPEND TestWebKitAPI_LIBRARIES
-        WebKit${DEBUG_SUFFIX}
+        WebKitLegacy${DEBUG_SUFFIX}
     )
 endif ()
 
@@ -111,15 +111,15 @@ include_directories(
     ${JAVASCRIPTCORE_DIR}
     ${PAL_DIR}
     ${THIRDPARTY_DIR}/gtest/include
-    ${WEBKIT2_DIR}/Platform/IPC
-    ${WEBKIT2_DIR}/Shared
-    ${WEBKIT2_DIR}/Shared/API
-    ${WEBKIT2_DIR}/Shared/API/c
-    ${WEBKIT2_DIR}/Shared/Plugins
-    ${WEBKIT2_DIR}/UIProcess
-    ${WEBKIT2_DIR}/UIProcess/API
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/c
+    ${WEBKIT_DIR}/Platform/IPC
+    ${WEBKIT_DIR}/Shared
+    ${WEBKIT_DIR}/Shared/API
+    ${WEBKIT_DIR}/Shared/API/c
+    ${WEBKIT_DIR}/Shared/Plugins
+    ${WEBKIT_DIR}/UIProcess
+    ${WEBKIT_DIR}/UIProcess/API
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/c
 )
 
 if (ENABLE_WEBKIT)
@@ -214,15 +214,15 @@ endif ()
 if (ENABLE_WEBKIT)
     add_library(TestWebKitAPIBase
         ${test_main_SOURCES}
-        ${webkit2_api_harness_SOURCES}
+        ${webkit_api_harness_SOURCES}
         ${TESTWEBKITAPI_DIR}/JavaScriptTest.cpp
         ${TESTWEBKITAPI_DIR}/PlatformUtilities.cpp
         ${TESTWEBKITAPI_DIR}/TestsController.cpp
     )
 
-    target_link_libraries(TestWebKitAPIBase JavaScriptCore WTF WebKit2 gtest)
+    target_link_libraries(TestWebKitAPIBase JavaScriptCore WTF WebKit gtest)
 
-    add_dependencies(TestWebKitAPIBase WebKit2 ${ForwardingHeadersForTestWebKitAPI_NAME} ${ForwardingNetworkHeadersForTestWebKitAPI_NAME})
+    add_dependencies(TestWebKitAPIBase WebKit ${ForwardingHeadersForTestWebKitAPI_NAME} ${ForwardingNetworkHeadersForTestWebKitAPI_NAME})
 
     if (COMPILER_IS_GCC_OR_CLANG)
         WEBKIT_ADD_TARGET_CXX_FLAGS(TestWebKitAPIBase -Wno-sign-compare
index 510c1c3..6231e16 100644 (file)
@@ -6,8 +6,8 @@ set(TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY_WTF "${TESTWEBKITAPI_RUNTIME_OUTPUT_D
 add_definitions(-DBUILDING_WEBKIT2__)
 
 add_custom_target(TestWebKitAPI-forwarding-headers
-    COMMAND ${PERL_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl --include-path ${TESTWEBKITAPI_DIR} --output ${FORWARDING_HEADERS_DIR} --platform gtk --platform soup
-    DEPENDS WebKit2-forwarding-headers
+    COMMAND ${PERL_EXECUTABLE} ${WEBKIT_DIR}/Scripts/generate-forwarding-headers.pl --include-path ${TESTWEBKITAPI_DIR} --output ${FORWARDING_HEADERS_DIR} --platform gtk --platform soup
+    DEPENDS WebKit-forwarding-headers
 )
 
 set(ForwardingHeadersForTestWebKitAPI_NAME TestWebKitAPI-forwarding-headers)
@@ -15,9 +15,9 @@ set(ForwardingHeadersForTestWebKitAPI_NAME TestWebKitAPI-forwarding-headers)
 include_directories(
     ${FORWARDING_HEADERS_DIR}
     ${FORWARDING_HEADERS_DIR}/JavaScriptCore
-    ${WEBKIT2_DIR}/UIProcess/API/C/soup
-    ${WEBKIT2_DIR}/UIProcess/API/C/gtk
-    ${WEBKIT2_DIR}/UIProcess/API/gtk
+    ${WEBKIT_DIR}/UIProcess/API/C/soup
+    ${WEBKIT_DIR}/UIProcess/API/C/gtk
+    ${WEBKIT_DIR}/UIProcess/API/gtk
 )
 
 include_directories(SYSTEM
@@ -36,7 +36,7 @@ set(bundle_harness_SOURCES
     ${TESTWEBKITAPI_DIR}/gtk/PlatformUtilitiesGtk.cpp
 )
 
-set(webkit2_api_harness_SOURCES
+set(webkit_api_harness_SOURCES
     ${TESTWEBKITAPI_DIR}/gtk/PlatformUtilitiesGtk.cpp
     ${TESTWEBKITAPI_DIR}/gtk/PlatformWebViewGtk.cpp
 )
@@ -46,7 +46,7 @@ list(APPEND test_wtf_LIBRARIES
     ${GTK3_LIBRARIES}
 )
 
-list(APPEND test_webkit2_api_LIBRARIES
+list(APPEND test_webkit_api_LIBRARIES
     ${GDK3_LIBRARIES}
     ${GTK3_LIBRARIES}
 )
@@ -68,7 +68,7 @@ list(APPEND TestJavaScriptCore_LIBRARIES
     ${GTK3_LIBRARIES}
 )
 
-add_executable(TestWebKit2
+add_executable(TestWebKit
     ${TESTWEBKITAPI_DIR}/Tests/WebKit/AboutBlankLoad.cpp
     ${TESTWEBKITAPI_DIR}/Tests/WebKit/CanHandleRequest.cpp
     ${TESTWEBKITAPI_DIR}/Tests/WebKit/CookieManager.cpp
@@ -122,10 +122,10 @@ add_executable(TestWebKit2
     ${TESTWEBKITAPI_DIR}/Tests/WebKit/gtk/InputMethodFilter.cpp
 )
 
-target_link_libraries(TestWebKit2 ${test_webkit2_api_LIBRARIES})
-add_test(TestWebKit2 ${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY}/WebKit2/TestWebKit2)
-set_tests_properties(TestWebKit2 PROPERTIES TIMEOUT 60)
-set_target_properties(TestWebKit2 PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY}/WebKit2)
+target_link_libraries(TestWebKit ${test_webkit_api_LIBRARIES})
+add_test(TestWebKit ${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY}/WebKit/TestWebKit)
+set_tests_properties(TestWebKit PROPERTIES TIMEOUT 60)
+set_target_properties(TestWebKit PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY}/WebKit)
 
 add_executable(TestWebCore
     ${test_main_SOURCES}
@@ -159,9 +159,9 @@ list(APPEND TestWTF_SOURCES
 )
 
 if (COMPILER_IS_GCC_OR_CLANG)
-    WEBKIT_ADD_TARGET_CXX_FLAGS(TestWebKit2 -Wno-sign-compare
-                                            -Wno-undef
-                                            -Wno-unused-parameter)
+    WEBKIT_ADD_TARGET_CXX_FLAGS(TestWebKit -Wno-sign-compare
+                                           -Wno-undef
+                                           -Wno-unused-parameter)
 
     WEBKIT_ADD_TARGET_CXX_FLAGS(TestWebCore -Wno-sign-compare
                                             -Wno-undef
index 5c884a6..c4be6ae 100644 (file)
@@ -6,8 +6,8 @@ set(TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY_WTF "${TESTWEBKITAPI_RUNTIME_OUTPUT_D
 add_definitions(-DBUILDING_WEBKIT2__)
 
 add_custom_target(TestWebKitAPI-forwarding-headers
-    COMMAND ${PERL_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl --include-path ${TESTWEBKITAPI_DIR} --output ${FORWARDING_HEADERS_DIR} --platform wpe --platform soup
-    DEPENDS webkit2wpe-forwarding-headers
+    COMMAND ${PERL_EXECUTABLE} ${WEBKIT_DIR}/Scripts/generate-forwarding-headers.pl --include-path ${TESTWEBKITAPI_DIR} --output ${FORWARDING_HEADERS_DIR} --platform wpe --platform soup
+    DEPENDS webkitwpe-forwarding-headers
 )
 
 set(ForwardingHeadersForTestWebKitAPI_NAME TestWebKitAPI-forwarding-headers)
index e2ca326..498a88d 100644 (file)
@@ -142,12 +142,12 @@ if (${WTF_PLATFORM_WIN_CAIRO})
     )
 endif ()
 
-set(test_webkit_LIBRARIES
+set(test_webkitlegacy_LIBRARIES
     WebCoreTestSupport
-    WebKit${DEBUG_SUFFIX}
+    WebKitLegacy${DEBUG_SUFFIX}
     gtest
 )
-add_library(TestWebKitLib SHARED
+add_library(TestWebKitLegacyLib SHARED
     ${test_main_SOURCES}
     ${TESTWEBKITAPI_DIR}/TestsController.cpp
     ${TESTWEBKITAPI_DIR}/Tests/WebKitLegacy/win/ScaleWebView.cpp
@@ -155,20 +155,20 @@ add_library(TestWebKitLib SHARED
     ${TESTWEBKITAPI_DIR}/win/HostWindow.cpp
 )
 
-target_link_libraries(TestWebKitLib ${test_webkit_LIBRARIES})
+target_link_libraries(TestWebKitLegacyLib ${test_webkitlegacy_LIBRARIES})
 
-add_executable(TestWebKit
+add_executable(TestWebKitLegacy
     ${TOOLS_DIR}/win/DLLLauncher/DLLLauncherMain.cpp
 )
-target_link_libraries(TestWebKit shlwapi)
-add_dependencies(TestWebKit ${ForwardingHeadersForTestWebKitAPI_NAME})
+target_link_libraries(TestWebKitLegacy shlwapi)
+add_dependencies(TestWebKitLegacy ${ForwardingHeadersForTestWebKitAPI_NAME})
 
-add_test(TestWebKit ${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY}/TestWebKit)
-set_tests_properties(TestWebKit PROPERTIES TIMEOUT 60)
+add_test(TestWebKitLegacy ${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY}/TestWebKitLegacy)
+set_tests_properties(TestWebKitLegacy PROPERTIES TIMEOUT 60)
 
 set(test_main_SOURCES
     ${TOOLS_DIR}/win/DLLLauncher/DLLLauncherMain.cpp
 )
 
 add_dependencies(TestWebCore TestWebCoreLib)
-add_dependencies(TestWebKit TestWebKitLib)
+add_dependencies(TestWebKitLegacy TestWebKitLegacyLib)
index e4518d5..0075419 100644 (file)
@@ -27,8 +27,8 @@
 #include "HostWindow.h"
 #include "Test.h"
 #include <WebCore/COMPtr.h>
-#include <WebKit/WebKit.h>
-#include <WebKit/WebKitCOMAPI.h>
+#include <WebKitLegacy/WebKit.h>
+#include <WebKitLegacy/WebKitCOMAPI.h>
 
 namespace TestWebKitAPI {
 
index db8bdea..56d0693 100644 (file)
@@ -27,8 +27,8 @@
 #include "HostWindow.h"
 #include "Test.h"
 #include <WebCore/COMPtr.h>
-#include <WebKit/WebKit.h>
-#include <WebKit/WebKitCOMAPI.h>
+#include <WebKitLegacy/WebKit.h>
+#include <WebKitLegacy/WebKitCOMAPI.h>
 
 namespace TestWebKitAPI {
 
index 073cbb4..eb2bea0 100644 (file)
@@ -22,7 +22,7 @@ set(WebKitGLibAPITests_SYSTEM_INCLUDE_DIRECTORIES
 
 set(WebKitGLibAPITest_LIBRARIES
     JavaScriptCore
-    WebKit2
+    WebKit
     WebKitGLibAPITestsCore
     ${GLIB_LIBRARIES}
     ${LIBSOUP_LIBRARIES}
@@ -30,7 +30,7 @@ set(WebKitGLibAPITest_LIBRARIES
 
 set(WebKitGLibAPITestExtension_LIBRARIES
     JavaScriptCore
-    WebKit2
+    WebKit
     ${GLIB_LIBRARIES}
 )
 
@@ -41,7 +41,7 @@ set(WebKitGLibAPIWebProcessTests
 
 macro(ADD_WK2_TEST_WEB_EXTENSION extension_name)
     add_library(${extension_name} MODULE ${ARGN})
-    add_dependencies(${extension_name} WebKit2)
+    add_dependencies(${extension_name} WebKit)
     set_property(
         TARGET ${extension_name}
         APPEND
@@ -91,7 +91,7 @@ include_directories(${WebKitGLibAPITests_INCLUDE_DIRECTORIES})
 include_directories(SYSTEM ${WebKitGLibAPITests_SYSTEM_INCLUDE_DIRECTORIES})
 
 add_library(WebKitGLibAPITestsCore STATIC ${WebKitGLibAPITests_SOURCES})
-target_link_libraries(WebKitGLibAPITestsCore WebKit2)
+target_link_libraries(WebKitGLibAPITestsCore WebKit)
 
 if (COMPILER_IS_GCC_OR_CLANG)
     WEBKIT_ADD_TARGET_CXX_FLAGS(WebKitGLibAPITestsCore -Wno-unused-parameter)
index 846c944..6a23c8f 100644 (file)
@@ -25,7 +25,7 @@ set(WebKitTestRunner_SOURCES
 set(WebKitTestRunner_LIBRARIES
     JavaScriptCore
     WebCoreTestSupport
-    WebKit2
+    WebKit
 )
 
 set(WebKitTestRunner_INCLUDE_DIRECTORIES
@@ -36,14 +36,14 @@ set(WebKitTestRunner_INCLUDE_DIRECTORIES
     ${WEBKIT_TESTRUNNER_UISCRIPTCONTEXT_DIR}
     ${WEBKIT_TESTRUNNER_BINDINGS_DIR}
     ${WEBCORE_DIR}/testing/js
-    ${WEBKIT2_DIR}/Platform/IPC
-    ${WEBKIT2_DIR}/Shared
-    ${WEBKIT2_DIR}/Shared/API/c
-    ${WEBKIT2_DIR}/Shared/Plugins
-    ${WEBKIT2_DIR}/UIProcess
-    ${WEBKIT2_DIR}/UIProcess/API/C/soup
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle
-    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/c
+    ${WEBKIT_DIR}/Platform/IPC
+    ${WEBKIT_DIR}/Shared
+    ${WEBKIT_DIR}/Shared/API/c
+    ${WEBKIT_DIR}/Shared/Plugins
+    ${WEBKIT_DIR}/UIProcess
+    ${WEBKIT_DIR}/UIProcess/API/C/soup
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle
+    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/c
     ${DERIVED_SOURCES_DIR}/InjectedBundle
     ${DERIVED_SOURCES_DIR}/UIScriptContext
     ${CMAKE_SOURCE_DIR}/Source
@@ -122,5 +122,5 @@ if (COMPILER_IS_GCC_OR_CLANG)
 endif ()
 
 if (NOT APPLE)
-    add_dependencies(WebKit2 ${ForwardingHeadersForWebKitTestRunner_NAME})
+    add_dependencies(WebKit ${ForwardingHeadersForWebKitTestRunner_NAME})
 endif ()
index af53e22..b0af11e 100644 (file)
@@ -1,5 +1,5 @@
 add_custom_target(WebKitTestRunner-forwarding-headers
-    COMMAND ${PERL_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl --include-path ${WEBKIT_TESTRUNNER_DIR} --include-path ${WEBKIT_TESTRUNNER_SHARED_DIR} --output ${FORWARDING_HEADERS_DIR} --platform gtk --platform soup
+    COMMAND ${PERL_EXECUTABLE} ${WEBKIT_DIR}/Scripts/generate-forwarding-headers.pl --include-path ${WEBKIT_TESTRUNNER_DIR} --include-path ${WEBKIT_TESTRUNNER_SHARED_DIR} --output ${FORWARDING_HEADERS_DIR} --platform gtk --platform soup
 )
 
 set(ForwardingHeadersForWebKitTestRunner_NAME WebKitTestRunner-forwarding-headers)
@@ -40,7 +40,7 @@ set(WebKitTestRunnerInjectedBundle_LIBRARIES
     ${GLIB_LIBRARIES}
     ${GTK3_LIBRARIES}
     WebCoreTestSupport
-    WebKit2
+    WebKit
 )
 
 list(APPEND WebKitTestRunnerInjectedBundle_SOURCES
index 024f853..0557e95 100644 (file)
@@ -3,7 +3,7 @@ find_package(WPEBackend-mesa REQUIRED)
 find_package(Libxkbcommon 0.4.0 REQUIRED)
 
 add_custom_target(WebKitTestRunner-forwarding-headers
-    COMMAND ${PERL_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl --include-path ${WEBKIT_TESTRUNNER_DIR} --output ${FORWARDING_HEADERS_DIR} --platform wpe
+    COMMAND ${PERL_EXECUTABLE} ${WEBKIT_DIR}/Scripts/generate-forwarding-headers.pl --include-path ${WEBKIT_TESTRUNNER_DIR} --output ${FORWARDING_HEADERS_DIR} --platform wpe
 )
 
 set(ForwardingHeadersForWebKitTestRunner_NAME WebKitTestRunner-forwarding-headers)