Changeset 222194 in webkit
- Timestamp:
- Sep 18, 2017 5:29:31 PM (7 years ago)
- Location:
- trunk
- Files:
-
- 69 edited
- 1 moved
-
CMakeLists.txt (modified) (1 diff)
-
ChangeLog (modified) (1 diff)
-
Source/PlatformGTK.cmake (modified) (5 diffs)
-
Source/WebDriver/CMakeLists.txt (modified) (1 diff)
-
Source/WebDriver/ChangeLog (modified) (1 diff)
-
Source/WebKit/CMakeLists.txt (modified) (17 diffs)
-
Source/WebKit/ChangeLog (modified) (1 diff)
-
Source/WebKit/PlatformGTK.cmake (modified) (32 diffs)
-
Source/WebKit/PlatformMac.cmake (modified) (8 diffs)
-
Source/WebKit/PlatformWPE.cmake (modified) (11 diffs)
-
Source/WebKit/PlatformWin.cmake (modified) (5 diffs)
-
Source/WebKit/Shared/gtk/WebKitWaylandProtocol.xml (moved) (moved from trunk/Source/WebKit/Shared/gtk/WebKit2WaylandProtocol.xml)
-
Source/WebKit/UIProcess/gtk/WaylandCompositor.cpp (modified) (1 diff)
-
Source/WebKit/WebProcess/gtk/WaylandCompositorDisplay.cpp (modified) (1 diff)
-
Source/WebKitLegacy/CMakeLists.txt (modified) (4 diffs)
-
Source/WebKitLegacy/ChangeLog (modified) (1 diff)
-
Source/WebKitLegacy/PlatformMac.cmake (modified) (6 diffs)
-
Source/WebKitLegacy/PlatformWin.cmake (modified) (14 diffs)
-
Source/cmake/OptionsGTK.cmake (modified) (1 diff)
-
Source/cmake/OptionsWPE.cmake (modified) (1 diff)
-
Source/cmake/WebKitCommon.cmake (modified) (1 diff)
-
Source/cmake/WebKitFS.cmake (modified) (2 diffs)
-
Tools/ChangeLog (modified) (1 diff)
-
Tools/DumpRenderTree/PlatformMac.cmake (modified) (2 diffs)
-
Tools/DumpRenderTree/PlatformWin.cmake (modified) (4 diffs)
-
Tools/DumpRenderTree/win/AccessibilityControllerWin.cpp (modified) (1 diff)
-
Tools/DumpRenderTree/win/DRTDesktopNotificationPresenter.h (modified) (1 diff)
-
Tools/DumpRenderTree/win/DumpRenderTree.cpp (modified) (1 diff)
-
Tools/DumpRenderTree/win/EditingDelegate.h (modified) (1 diff)
-
Tools/DumpRenderTree/win/EventSender.cpp (modified) (1 diff)
-
Tools/DumpRenderTree/win/FrameLoadDelegate.cpp (modified) (1 diff)
-
Tools/DumpRenderTree/win/FrameLoadDelegate.h (modified) (1 diff)
-
Tools/DumpRenderTree/win/GCControllerWin.cpp (modified) (1 diff)
-
Tools/DumpRenderTree/win/HistoryDelegate.cpp (modified) (1 diff)
-
Tools/DumpRenderTree/win/HistoryDelegate.h (modified) (1 diff)
-
Tools/DumpRenderTree/win/PolicyDelegate.h (modified) (1 diff)
-
Tools/DumpRenderTree/win/ResourceLoadDelegate.cpp (modified) (1 diff)
-
Tools/DumpRenderTree/win/ResourceLoadDelegate.h (modified) (1 diff)
-
Tools/DumpRenderTree/win/TestRunnerWin.cpp (modified) (1 diff)
-
Tools/DumpRenderTree/win/TextInputControllerWin.cpp (modified) (1 diff)
-
Tools/DumpRenderTree/win/UIDelegate.cpp (modified) (1 diff)
-
Tools/DumpRenderTree/win/UIDelegate.h (modified) (1 diff)
-
Tools/DumpRenderTree/win/WorkQueueItemWin.cpp (modified) (1 diff)
-
Tools/MiniBrowser/gtk/CMakeLists.txt (modified) (1 diff)
-
Tools/MiniBrowser/mac/CMakeLists.txt (modified) (1 diff)
-
Tools/MiniBrowser/win/AccessibilityDelegate.cpp (modified) (1 diff)
-
Tools/MiniBrowser/win/AccessibilityDelegate.h (modified) (1 diff)
-
Tools/MiniBrowser/win/CMakeLists.txt (modified) (2 diffs)
-
Tools/MiniBrowser/win/Common.cpp (modified) (2 diffs)
-
Tools/MiniBrowser/win/DOMDefaultImpl.h (modified) (1 diff)
-
Tools/MiniBrowser/win/MiniBrowser.cpp (modified) (1 diff)
-
Tools/MiniBrowser/win/MiniBrowser.h (modified) (1 diff)
-
Tools/MiniBrowser/win/MiniBrowserWebHost.cpp (modified) (1 diff)
-
Tools/MiniBrowser/win/MiniBrowserWebHost.h (modified) (1 diff)
-
Tools/MiniBrowser/win/PageLoadTestClient.h (modified) (1 diff)
-
Tools/MiniBrowser/win/PrintWebUIDelegate.cpp (modified) (1 diff)
-
Tools/MiniBrowser/win/PrintWebUIDelegate.h (modified) (1 diff)
-
Tools/MiniBrowser/win/ResourceLoadDelegate.cpp (modified) (1 diff)
-
Tools/MiniBrowser/win/ResourceLoadDelegate.h (modified) (1 diff)
-
Tools/MiniBrowser/win/WebDownloadDelegate.h (modified) (1 diff)
-
Tools/TestWebKitAPI/CMakeLists.txt (modified) (4 diffs)
-
Tools/TestWebKitAPI/PlatformGTK.cmake (modified) (7 diffs)
-
Tools/TestWebKitAPI/PlatformWPE.cmake (modified) (1 diff)
-
Tools/TestWebKitAPI/PlatformWin.cmake (modified) (3 diffs)
-
Tools/TestWebKitAPI/Tests/WebKitLegacy/win/ScaleWebView.cpp (modified) (1 diff)
-
Tools/TestWebKitAPI/Tests/WebKitLegacy/win/WebViewDestruction.cpp (modified) (1 diff)
-
Tools/TestWebKitAPI/glib/CMakeLists.txt (modified) (4 diffs)
-
Tools/WebKitTestRunner/CMakeLists.txt (modified) (3 diffs)
-
Tools/WebKitTestRunner/PlatformGTK.cmake (modified) (2 diffs)
-
Tools/WebKitTestRunner/PlatformWPE.cmake (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/CMakeLists.txt
r220403 r222194 123 123 set(JavaScriptCore_LIBRARY_TYPE SHARED) 124 124 set(PAL_LIBRARY_TYPE STATIC) 125 set(WebKitLegacy_LIBRARY_TYPE SHARED) 125 126 set(WebKit_LIBRARY_TYPE SHARED) 126 set(WebKit2_LIBRARY_TYPE SHARED)127 127 set(WebCoreTestSupport_LIBRARY_TYPE STATIC) 128 128 -
trunk/ChangeLog
r222148 r222194 1 2017-09-18 Michael Catanzaro <mcatanzaro@igalia.com> 2 3 [CMake] Rename WebKit target to WebKitLegacy and rename WebKit2 target to WebKit 4 https://bugs.webkit.org/show_bug.cgi?id=174558 5 6 Reviewed by Alex Christensen. 7 8 * CMakeLists.txt: 9 * Source/PlatformGTK.cmake: 10 * Source/cmake/OptionsGTK.cmake: 11 * Source/cmake/OptionsWPE.cmake: 12 * Source/cmake/WebKitCommon.cmake: 13 * Source/cmake/WebKitFS.cmake: 14 1 15 2017-09-18 Yoshiaki Jitsukawa <Yoshiaki.Jitsukawa@sony.com> 2 16 -
trunk/Source/PlatformGTK.cmake
r220403 r222194 7 7 8 8 list(APPEND DocumentationDependencies 9 WebKit 29 WebKit 10 10 "${CMAKE_SOURCE_DIR}/Source/WebKit/UIProcess/API/gtk/docs/webkit2gtk-docs.sgml" 11 11 "${CMAKE_SOURCE_DIR}/Source/WebKit/UIProcess/API/gtk/docs/webkit2gtk-${WEBKITGTK_API_VERSION}-sections.txt" … … 32 32 endmacro() 33 33 34 add_gtkdoc_generator("docs-build.stamp" "")34 ADD_GTKDOC_GENERATOR("docs-build.stamp" "") 35 35 if (ENABLE_GTKDOC) 36 36 add_custom_target(gtkdoc ALL DEPENDS "${CMAKE_BINARY_DIR}/docs-build.stamp") … … 42 42 # the course of development. 43 43 if (DEVELOPER_MODE) 44 add_gtkdoc_generator("docs-build-no-html.stamp" "--skip-html")44 ADD_GTKDOC_GENERATOR("docs-build-no-html.stamp" "--skip-html") 45 45 add_custom_target(gtkdoc-no-html ALL DEPENDS "${CMAKE_BINARY_DIR}/docs-build-no-html.stamp") 46 46 endif () … … 62 62 DEPENDS ${TOOLS_DIR}/gtk/make-dist.py 63 63 DEPENDS ${CMAKE_BINARY_DIR}/manifest.txt 64 DEPENDS WebKit 264 DEPENDS WebKit 65 65 DEPENDS gtkdoc 66 66 COMMAND ${TOOLS_DIR}/gtk/make-dist.py … … 84 84 DEPENDS ${TOOLS_DIR}/gtk/make-dist.py 85 85 DEPENDS ${CMAKE_BINARY_DIR}/manifest.txt 86 DEPENDS WebKit 286 DEPENDS WebKit 87 87 DEPENDS gtkdoc 88 88 COMMAND ${TOOLS_DIR}/gtk/make-dist.py -
trunk/Source/WebDriver/CMakeLists.txt
r219605 r222194 22 22 23 23 set(WebDriver_SCRIPTS 24 ${WEBKIT 2_DIR}/UIProcess/Automation/atoms/ElementAttribute.js25 ${WEBKIT 2_DIR}/UIProcess/Automation/atoms/ElementDisplayed.js26 ${WEBKIT 2_DIR}/UIProcess/Automation/atoms/FindNodes.js27 ${WEBKIT 2_DIR}/UIProcess/Automation/atoms/FormElementClear.js28 ${WEBKIT 2_DIR}/UIProcess/Automation/atoms/FormSubmit.js24 ${WEBKIT_DIR}/UIProcess/Automation/atoms/ElementAttribute.js 25 ${WEBKIT_DIR}/UIProcess/Automation/atoms/ElementDisplayed.js 26 ${WEBKIT_DIR}/UIProcess/Automation/atoms/FindNodes.js 27 ${WEBKIT_DIR}/UIProcess/Automation/atoms/FormElementClear.js 28 ${WEBKIT_DIR}/UIProcess/Automation/atoms/FormSubmit.js 29 29 ) 30 30 -
trunk/Source/WebDriver/ChangeLog
r222113 r222194 1 2017-09-18 Michael Catanzaro <mcatanzaro@igalia.com> 2 3 [CMake] Rename WebKit target to WebKitLegacy and rename WebKit2 target to WebKit 4 https://bugs.webkit.org/show_bug.cgi?id=174558 5 6 Reviewed by Alex Christensen. 7 8 * CMakeLists.txt: 9 1 10 2017-09-15 JF Bastien <jfbastien@apple.com> 2 11 -
trunk/Source/WebKit/CMakeLists.txt
r222103 r222194 1 1 include(WebKitCommon) 2 2 3 set_property(DIRECTORY . PROPERTY FOLDER "WebKit 2")4 5 set(WebKit 2_INCLUDE_DIRECTORIES6 "${WEBKIT 2_DIR}"7 "${WEBKIT 2_DIR}/NetworkProcess"8 "${WEBKIT 2_DIR}/NetworkProcess/CustomProtocols"9 "${WEBKIT 2_DIR}/NetworkProcess/Downloads"10 "${WEBKIT 2_DIR}/NetworkProcess/FileAPI"11 "${WEBKIT 2_DIR}/NetworkProcess/cache"12 "${WEBKIT 2_DIR}/NetworkProcess/capture"13 "${WEBKIT 2_DIR}/NetworkProcess/webrtc"14 "${WEBKIT 2_DIR}/Platform"15 "${WEBKIT 2_DIR}/Platform/IPC"16 "${WEBKIT 2_DIR}/PluginProcess"17 "${WEBKIT 2_DIR}/Shared"18 "${WEBKIT 2_DIR}/Shared/API"19 "${WEBKIT 2_DIR}/Shared/API/c"20 "${WEBKIT 2_DIR}/Shared/Authentication"21 "${WEBKIT 2_DIR}/Shared/CoreIPCSupport"22 "${WEBKIT 2_DIR}/Shared/Databases"23 "${WEBKIT 2_DIR}/Shared/Databases/IndexedDB"24 "${WEBKIT 2_DIR}/Shared/FileAPI"25 "${WEBKIT 2_DIR}/Shared/Gamepad"26 "${WEBKIT 2_DIR}/Shared/Plugins"27 "${WEBKIT 2_DIR}/Shared/Plugins/Netscape"28 "${WEBKIT 2_DIR}/Shared/Plugins/Netscape/x11"29 "${WEBKIT 2_DIR}/Shared/RemoteLayerTree"30 "${WEBKIT 2_DIR}/Shared/Storage"31 "${WEBKIT 2_DIR}/Shared/WebsiteData"32 "${WEBKIT 2_DIR}/StorageProcess"33 "${WEBKIT 2_DIR}/StorageProcess/IndexedDB"34 "${WEBKIT 2_DIR}/StorageProcess/ServiceWorker"35 "${WEBKIT 2_DIR}/UIProcess"36 "${WEBKIT 2_DIR}/UIProcess/API"37 "${WEBKIT 2_DIR}/UIProcess/API/C"38 "${WEBKIT 2_DIR}/UIProcess/API/cpp"39 "${WEBKIT 2_DIR}/UIProcess/ApplePay"40 "${WEBKIT 2_DIR}/UIProcess/Authentication"41 "${WEBKIT 2_DIR}/UIProcess/Automation"42 "${WEBKIT 2_DIR}/UIProcess/Downloads"43 "${WEBKIT 2_DIR}/UIProcess/Gamepad"44 "${WEBKIT 2_DIR}/UIProcess/Launcher"45 "${WEBKIT 2_DIR}/UIProcess/Network"46 "${WEBKIT 2_DIR}/UIProcess/Network/CustomProtocols"47 "${WEBKIT 2_DIR}/UIProcess/Notifications"48 "${WEBKIT 2_DIR}/UIProcess/Plugins"49 "${WEBKIT 2_DIR}/UIProcess/RemoteLayerTree"50 "${WEBKIT 2_DIR}/UIProcess/Storage"51 "${WEBKIT 2_DIR}/UIProcess/UserContent"52 "${WEBKIT 2_DIR}/UIProcess/WebStorage"53 "${WEBKIT 2_DIR}/UIProcess/WebsiteData"54 "${WEBKIT 2_DIR}/WebProcess"55 "${WEBKIT 2_DIR}/WebProcess/ApplePay"56 "${WEBKIT 2_DIR}/WebProcess/ApplicationCache"57 "${WEBKIT 2_DIR}/WebProcess/Automation"58 "${WEBKIT 2_DIR}/WebProcess/Cache"59 "${WEBKIT 2_DIR}/WebProcess/Cookies"60 "${WEBKIT 2_DIR}/WebProcess/Databases"61 "${WEBKIT 2_DIR}/WebProcess/Databases/IndexedDB"62 "${WEBKIT 2_DIR}/WebProcess/FileAPI"63 "${WEBKIT 2_DIR}/WebProcess/FullScreen"64 "${WEBKIT 2_DIR}/WebProcess/Gamepad"65 "${WEBKIT 2_DIR}/WebProcess/Geolocation"66 "${WEBKIT 2_DIR}/WebProcess/IconDatabase"67 "${WEBKIT 2_DIR}/WebProcess/InjectedBundle"68 "${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API"69 "${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/c"70 "${WEBKIT 2_DIR}/WebProcess/InjectedBundle/DOM"71 "${WEBKIT 2_DIR}/WebProcess/Launching"72 "${WEBKIT 2_DIR}/WebProcess/MediaCache"73 "${WEBKIT 2_DIR}/WebProcess/MediaStream"74 "${WEBKIT 2_DIR}/WebProcess/Network"75 "${WEBKIT 2_DIR}/WebProcess/Network/webrtc"76 "${WEBKIT 2_DIR}/WebProcess/Notifications"77 "${WEBKIT 2_DIR}/WebProcess/OriginData"78 "${WEBKIT 2_DIR}/WebProcess/Plugins"79 "${WEBKIT 2_DIR}/WebProcess/Plugins/Netscape"80 "${WEBKIT 2_DIR}/WebProcess/ResourceCache"81 "${WEBKIT 2_DIR}/WebProcess/Storage"82 "${WEBKIT 2_DIR}/WebProcess/UserContent"83 "${WEBKIT 2_DIR}/WebProcess/WebCoreSupport"84 "${WEBKIT 2_DIR}/WebProcess/WebPage"85 "${WEBKIT 2_DIR}/WebProcess/WebPage/RemoteLayerTree"86 "${WEBKIT 2_DIR}/WebProcess/WebStorage"87 "${DERIVED_SOURCES_WEBKIT 2_DIR}"88 "${DERIVED_SOURCES_WEBKIT 2_DIR}/include"3 set_property(DIRECTORY . PROPERTY FOLDER "WebKit") 4 5 set(WebKit_INCLUDE_DIRECTORIES 6 "${WEBKIT_DIR}" 7 "${WEBKIT_DIR}/NetworkProcess" 8 "${WEBKIT_DIR}/NetworkProcess/CustomProtocols" 9 "${WEBKIT_DIR}/NetworkProcess/Downloads" 10 "${WEBKIT_DIR}/NetworkProcess/FileAPI" 11 "${WEBKIT_DIR}/NetworkProcess/cache" 12 "${WEBKIT_DIR}/NetworkProcess/capture" 13 "${WEBKIT_DIR}/NetworkProcess/webrtc" 14 "${WEBKIT_DIR}/Platform" 15 "${WEBKIT_DIR}/Platform/IPC" 16 "${WEBKIT_DIR}/PluginProcess" 17 "${WEBKIT_DIR}/Shared" 18 "${WEBKIT_DIR}/Shared/API" 19 "${WEBKIT_DIR}/Shared/API/c" 20 "${WEBKIT_DIR}/Shared/Authentication" 21 "${WEBKIT_DIR}/Shared/CoreIPCSupport" 22 "${WEBKIT_DIR}/Shared/Databases" 23 "${WEBKIT_DIR}/Shared/Databases/IndexedDB" 24 "${WEBKIT_DIR}/Shared/FileAPI" 25 "${WEBKIT_DIR}/Shared/Gamepad" 26 "${WEBKIT_DIR}/Shared/Plugins" 27 "${WEBKIT_DIR}/Shared/Plugins/Netscape" 28 "${WEBKIT_DIR}/Shared/Plugins/Netscape/x11" 29 "${WEBKIT_DIR}/Shared/RemoteLayerTree" 30 "${WEBKIT_DIR}/Shared/Storage" 31 "${WEBKIT_DIR}/Shared/WebsiteData" 32 "${WEBKIT_DIR}/StorageProcess" 33 "${WEBKIT_DIR}/StorageProcess/IndexedDB" 34 "${WEBKIT_DIR}/StorageProcess/ServiceWorker" 35 "${WEBKIT_DIR}/UIProcess" 36 "${WEBKIT_DIR}/UIProcess/API" 37 "${WEBKIT_DIR}/UIProcess/API/C" 38 "${WEBKIT_DIR}/UIProcess/API/cpp" 39 "${WEBKIT_DIR}/UIProcess/ApplePay" 40 "${WEBKIT_DIR}/UIProcess/Authentication" 41 "${WEBKIT_DIR}/UIProcess/Automation" 42 "${WEBKIT_DIR}/UIProcess/Downloads" 43 "${WEBKIT_DIR}/UIProcess/Gamepad" 44 "${WEBKIT_DIR}/UIProcess/Launcher" 45 "${WEBKIT_DIR}/UIProcess/Network" 46 "${WEBKIT_DIR}/UIProcess/Network/CustomProtocols" 47 "${WEBKIT_DIR}/UIProcess/Notifications" 48 "${WEBKIT_DIR}/UIProcess/Plugins" 49 "${WEBKIT_DIR}/UIProcess/RemoteLayerTree" 50 "${WEBKIT_DIR}/UIProcess/Storage" 51 "${WEBKIT_DIR}/UIProcess/UserContent" 52 "${WEBKIT_DIR}/UIProcess/WebStorage" 53 "${WEBKIT_DIR}/UIProcess/WebsiteData" 54 "${WEBKIT_DIR}/WebProcess" 55 "${WEBKIT_DIR}/WebProcess/ApplePay" 56 "${WEBKIT_DIR}/WebProcess/ApplicationCache" 57 "${WEBKIT_DIR}/WebProcess/Automation" 58 "${WEBKIT_DIR}/WebProcess/Cache" 59 "${WEBKIT_DIR}/WebProcess/Cookies" 60 "${WEBKIT_DIR}/WebProcess/Databases" 61 "${WEBKIT_DIR}/WebProcess/Databases/IndexedDB" 62 "${WEBKIT_DIR}/WebProcess/FileAPI" 63 "${WEBKIT_DIR}/WebProcess/FullScreen" 64 "${WEBKIT_DIR}/WebProcess/Gamepad" 65 "${WEBKIT_DIR}/WebProcess/Geolocation" 66 "${WEBKIT_DIR}/WebProcess/IconDatabase" 67 "${WEBKIT_DIR}/WebProcess/InjectedBundle" 68 "${WEBKIT_DIR}/WebProcess/InjectedBundle/API" 69 "${WEBKIT_DIR}/WebProcess/InjectedBundle/API/c" 70 "${WEBKIT_DIR}/WebProcess/InjectedBundle/DOM" 71 "${WEBKIT_DIR}/WebProcess/Launching" 72 "${WEBKIT_DIR}/WebProcess/MediaCache" 73 "${WEBKIT_DIR}/WebProcess/MediaStream" 74 "${WEBKIT_DIR}/WebProcess/Network" 75 "${WEBKIT_DIR}/WebProcess/Network/webrtc" 76 "${WEBKIT_DIR}/WebProcess/Notifications" 77 "${WEBKIT_DIR}/WebProcess/OriginData" 78 "${WEBKIT_DIR}/WebProcess/Plugins" 79 "${WEBKIT_DIR}/WebProcess/Plugins/Netscape" 80 "${WEBKIT_DIR}/WebProcess/ResourceCache" 81 "${WEBKIT_DIR}/WebProcess/Storage" 82 "${WEBKIT_DIR}/WebProcess/UserContent" 83 "${WEBKIT_DIR}/WebProcess/WebCoreSupport" 84 "${WEBKIT_DIR}/WebProcess/WebPage" 85 "${WEBKIT_DIR}/WebProcess/WebPage/RemoteLayerTree" 86 "${WEBKIT_DIR}/WebProcess/WebStorage" 87 "${DERIVED_SOURCES_WEBKIT_DIR}" 88 "${DERIVED_SOURCES_WEBKIT_DIR}/include" 89 89 "${CMAKE_SOURCE_DIR}/WebKitLibraries" 90 90 ) … … 92 92 set(PROTOCOL_GENERATOR_SCRIPTS_DIR "${JAVASCRIPTCORE_DIR}/inspector/scripts") 93 93 94 set(WebKit 2_SYSTEM_INCLUDE_DIRECTORIES94 set(WebKit_SYSTEM_INCLUDE_DIRECTORIES 95 95 ${ICU_INCLUDE_DIRS} 96 96 ) 97 97 98 set(WebKit 2_SOURCES98 set(WebKit_SOURCES 99 99 NetworkProcess/CustomProtocols/LegacyCustomProtocolManager.cpp 100 100 … … 591 591 ) 592 592 593 set(WebKit 2_MESSAGES_IN_FILES593 set(WebKit_MESSAGES_IN_FILES 594 594 NetworkProcess/cache/CacheStorageEngineConnection.messages.in 595 595 … … 697 697 698 698 set(WebProcess_LIBRARIES 699 WebKit 2699 WebKit 700 700 ) 701 701 702 702 set(NetworkProcess_LIBRARIES 703 WebKit 2703 WebKit 704 704 ) 705 705 706 706 set(StorageProcess_LIBRARIES 707 WebKit 2707 WebKit 708 708 ) 709 709 710 710 if (APPLE) 711 set(WebKit 2_LIBRARIES711 set(WebKit_LIBRARIES 712 712 PRIVATE WebCore 713 713 PUBLIC JavaScriptCore 714 714 ) 715 715 else () 716 set(WebKit 2_LIBRARIES716 set(WebKit_LIBRARIES 717 717 WebCore 718 718 JavaScriptCore … … 721 721 722 722 set(PluginProcess_LIBRARIES 723 WebKit 2723 WebKit 724 724 ) 725 725 … … 729 729 # added before the ANGLE directories. 730 730 if (USE_LIBEPOXY) 731 list(APPEND WebKit 2_SYSTEM_INCLUDE_DIRECTORIES731 list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES 732 732 ${LIBEPOXY_INCLUDE_DIRS} 733 733 ) 734 list(APPEND WebKit 2_LIBRARIES734 list(APPEND WebKit_LIBRARIES 735 735 ${LIBEPOXY_LIBRARIES} 736 736 ) 737 737 else () 738 738 if (USE_OPENGL) 739 list(APPEND WebKit 2_SYSTEM_INCLUDE_DIRECTORIES739 list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES 740 740 ${OPENGL_INCLUDE_DIRS} 741 741 ) 742 list(APPEND WebKit 2_LIBRARIES742 list(APPEND WebKit_LIBRARIES 743 743 ${OPENGL_LIBRARIES} 744 744 ) 745 745 add_definitions(${OPENGL_DEFINITIONS}) 746 746 elseif (USE_OPENGL_ES_2) 747 list(APPEND WebKit 2_SYSTEM_INCLUDE_DIRECTORIES747 list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES 748 748 ${OPENGLES2_INCLUDE_DIRS} 749 749 ) 750 list(APPEND WebKit 2_LIBRARIES750 list(APPEND WebKit_LIBRARIES 751 751 ${OPENGLES2_LIBRARIES} 752 752 ) … … 755 755 756 756 if (USE_EGL) 757 list(APPEND WebKit 2_SYSTEM_INCLUDE_DIRECTORIES757 list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES 758 758 ${EGL_INCLUDE_DIRS} 759 759 ) 760 list(APPEND WebKit 2_LIBRARIES760 list(APPEND WebKit_LIBRARIES 761 761 ${EGL_LIBRARIES} 762 762 ) … … 765 765 endif () 766 766 767 list(APPEND WebKit 2_INCLUDE_DIRECTORIES767 list(APPEND WebKit_INCLUDE_DIRECTORIES 768 768 "${THIRDPARTY_DIR}/ANGLE" 769 769 "${THIRDPARTY_DIR}/ANGLE/include/KHR" … … 789 789 check_cxx_source_compiles("${ATOMIC_TEST_SOURCE}" ATOMIC_INT64_REQUIRES_LIBATOMIC) 790 790 if (ATOMIC_INT64_REQUIRES_LIBATOMIC) 791 list(APPEND WebKit 2_LIBRARIES atomic)791 list(APPEND WebKit_LIBRARIES atomic) 792 792 endif () 793 793 unset(CMAKE_REQUIRED_LIBRARIES) … … 801 801 check_function_exists(shm_open SHM_OPEN_REQUIRES_LIBRT) 802 802 if (SHM_OPEN_REQUIRES_LIBRT) 803 list(APPEND WebKit 2_LIBRARIES rt)803 list(APPEND WebKit_LIBRARIES rt) 804 804 endif () 805 805 endif () 806 806 endif () 807 807 808 macro(ADD_WEBKIT 2_PREFIX_HEADER _target)809 if (WebKit 2_USE_PREFIX_HEADER)808 macro(ADD_WEBKIT_PREFIX_HEADER _target) 809 if (WebKit_USE_PREFIX_HEADER) 810 810 get_target_property(OLD_COMPILE_FLAGS ${_target} COMPILE_FLAGS) 811 811 if (${OLD_COMPILE_FLAGS} STREQUAL "OLD_COMPILE_FLAGS-NOTFOUND") 812 812 set(OLD_COMPILE_FLAGS "") 813 813 endif () 814 set_target_properties(${_target} PROPERTIES COMPILE_FLAGS "${OLD_COMPILE_FLAGS} -include ${WEBKIT 2_DIR}/WebKit2Prefix.h")814 set_target_properties(${_target} PROPERTIES COMPILE_FLAGS "${OLD_COMPILE_FLAGS} -include ${WEBKIT_DIR}/WebKit2Prefix.h") 815 815 endif () 816 816 endmacro() 817 817 818 set(WebKit 2_AUTOMATION_PROTOCOL_GENERATOR_EXTRA_FLAGS819 ) 820 821 WEBKIT_FRAMEWORK_DECLARE(WebKit 2)818 set(WebKit_AUTOMATION_PROTOCOL_GENERATOR_EXTRA_FLAGS 819 ) 820 821 WEBKIT_FRAMEWORK_DECLARE(WebKit) 822 822 WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS() 823 823 824 824 # Helper macro which wraps generate-message-receiver.py and generate-message-header.py scripts 825 # _output_source is a list name which will contain generated sources.(eg. WebKit 2_SOURCES)825 # _output_source is a list name which will contain generated sources.(eg. WebKit_SOURCES) 826 826 # _input_files are messages.in files to generate. 827 827 macro(GENERATE_MESSAGE_SOURCES _output_source _input_files) … … 829 829 get_filename_component(_name ${_file} NAME_WE) 830 830 add_custom_command( 831 OUTPUT ${DERIVED_SOURCES_WEBKIT 2_DIR}/${_name}MessageReceiver.cpp ${DERIVED_SOURCES_WEBKIT2_DIR}/${_name}Messages.h831 OUTPUT ${DERIVED_SOURCES_WEBKIT_DIR}/${_name}MessageReceiver.cpp ${DERIVED_SOURCES_WEBKIT_DIR}/${_name}Messages.h 832 832 MAIN_DEPENDENCY ${_file} 833 DEPENDS ${WEBKIT 2_DIR}/Scripts/webkit/__init__.py834 ${WEBKIT 2_DIR}/Scripts/webkit/messages.py835 ${WEBKIT 2_DIR}/Scripts/webkit/model.py836 ${WEBKIT 2_DIR}/Scripts/webkit/parser.py837 COMMAND ${PYTHON_EXECUTABLE} ${WEBKIT 2_DIR}/Scripts/generate-message-receiver.py ${_file} > ${DERIVED_SOURCES_WEBKIT2_DIR}/${_name}MessageReceiver.cpp838 COMMAND ${PYTHON_EXECUTABLE} ${WEBKIT 2_DIR}/Scripts/generate-messages-header.py ${_file} > ${DERIVED_SOURCES_WEBKIT2_DIR}/${_name}Messages.h839 WORKING_DIRECTORY ${WEBKIT 2_DIR}833 DEPENDS ${WEBKIT_DIR}/Scripts/webkit/__init__.py 834 ${WEBKIT_DIR}/Scripts/webkit/messages.py 835 ${WEBKIT_DIR}/Scripts/webkit/model.py 836 ${WEBKIT_DIR}/Scripts/webkit/parser.py 837 COMMAND ${PYTHON_EXECUTABLE} ${WEBKIT_DIR}/Scripts/generate-message-receiver.py ${_file} > ${DERIVED_SOURCES_WEBKIT_DIR}/${_name}MessageReceiver.cpp 838 COMMAND ${PYTHON_EXECUTABLE} ${WEBKIT_DIR}/Scripts/generate-messages-header.py ${_file} > ${DERIVED_SOURCES_WEBKIT_DIR}/${_name}Messages.h 839 WORKING_DIRECTORY ${WEBKIT_DIR} 840 840 VERBATIM) 841 841 842 list(APPEND ${_output_source} ${DERIVED_SOURCES_WEBKIT 2_DIR}/${_name}MessageReceiver.cpp)842 list(APPEND ${_output_source} ${DERIVED_SOURCES_WEBKIT_DIR}/${_name}MessageReceiver.cpp) 843 843 endforeach () 844 844 endmacro() 845 GENERATE_MESSAGE_SOURCES(WebKit 2_DERIVED_SOURCES "${WebKit2_MESSAGES_IN_FILES}")846 847 set(WebKit 2_AUTOMATION_PROTOCOL_GENERATOR_SCRIPTS845 GENERATE_MESSAGE_SOURCES(WebKit_DERIVED_SOURCES "${WebKit_MESSAGES_IN_FILES}") 846 847 set(WebKit_AUTOMATION_PROTOCOL_GENERATOR_SCRIPTS 848 848 ${PROTOCOL_GENERATOR_SCRIPTS_DIR}/generate-inspector-protocol-bindings.py 849 849 ${PROTOCOL_GENERATOR_SCRIPTS_DIR}/codegen/cpp_generator.py … … 860 860 ) 861 861 862 set(WebKit 2_AUTOMATION_PROTOCOL_GENERATOR_INPUTS863 ${WEBKIT 2_DIR}/UIProcess/Automation/Automation.json862 set(WebKit_AUTOMATION_PROTOCOL_GENERATOR_INPUTS 863 ${WEBKIT_DIR}/UIProcess/Automation/Automation.json 864 864 ) 865 865 866 866 add_custom_command( 867 OUTPUT ${DERIVED_SOURCES_WEBKIT 2_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.cpp868 MAIN_DEPENDENCY ${WebKit 2_AUTOMATION_PROTOCOL_GENERATOR_INPUTS}869 DEPENDS ${WebKit 2_AUTOMATION_PROTOCOL_GENERATOR_SCRIPTS}870 COMMAND ${PYTHON_EXECUTABLE} ${PROTOCOL_GENERATOR_SCRIPTS_DIR}/generate-inspector-protocol-bindings.py --outputDir "${DERIVED_SOURCES_WEBKIT 2_DIR}" --framework WebKit ${WebKit2_AUTOMATION_PROTOCOL_GENERATOR_EXTRA_FLAGS} --backend ${WebKit2_AUTOMATION_PROTOCOL_GENERATOR_INPUTS}867 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 868 MAIN_DEPENDENCY ${WebKit_AUTOMATION_PROTOCOL_GENERATOR_INPUTS} 869 DEPENDS ${WebKit_AUTOMATION_PROTOCOL_GENERATOR_SCRIPTS} 870 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} 871 871 VERBATIM) 872 872 873 list(APPEND WebKit 2_HEADERS874 ${DERIVED_SOURCES_WEBKIT 2_DIR}/AutomationBackendDispatchers.h875 ${DERIVED_SOURCES_WEBKIT 2_DIR}/AutomationFrontendDispatchers.h876 ${DERIVED_SOURCES_WEBKIT 2_DIR}/AutomationProtocolObjects.h877 ) 878 879 list(APPEND WebKit 2_SOURCES880 ${DERIVED_SOURCES_WEBKIT 2_DIR}/AutomationBackendDispatchers.cpp881 ${DERIVED_SOURCES_WEBKIT 2_DIR}/AutomationFrontendDispatchers.cpp882 ${DERIVED_SOURCES_WEBKIT 2_DIR}/AutomationProtocolObjects.cpp873 list(APPEND WebKit_HEADERS 874 ${DERIVED_SOURCES_WEBKIT_DIR}/AutomationBackendDispatchers.h 875 ${DERIVED_SOURCES_WEBKIT_DIR}/AutomationFrontendDispatchers.h 876 ${DERIVED_SOURCES_WEBKIT_DIR}/AutomationProtocolObjects.h 877 ) 878 879 list(APPEND WebKit_SOURCES 880 ${DERIVED_SOURCES_WEBKIT_DIR}/AutomationBackendDispatchers.cpp 881 ${DERIVED_SOURCES_WEBKIT_DIR}/AutomationFrontendDispatchers.cpp 882 ${DERIVED_SOURCES_WEBKIT_DIR}/AutomationProtocolObjects.cpp 883 883 ) 884 884 885 885 add_custom_command( 886 OUTPUT ${DERIVED_SOURCES_WEBKIT 2_DIR}/WebAutomationSessionProxyScriptSource.h ${DERIVED_SOURCES_WEBKIT2_DIR}/WebAutomationSessionProxy.min.js887 MAIN_DEPENDENCY ${WEBKIT 2_DIR}/WebProcess/Automation/WebAutomationSessionProxy.js886 OUTPUT ${DERIVED_SOURCES_WEBKIT_DIR}/WebAutomationSessionProxyScriptSource.h ${DERIVED_SOURCES_WEBKIT_DIR}/WebAutomationSessionProxy.min.js 887 MAIN_DEPENDENCY ${WEBKIT_DIR}/WebProcess/Automation/WebAutomationSessionProxy.js 888 888 DEPENDS ${JavaScriptCore_SCRIPTS_DIR}/xxd.pl ${JavaScriptCore_SCRIPTS_DIR}/jsmin.py 889 COMMAND ${CMAKE_COMMAND} -E echo "//# sourceURL=__InjectedScript_WebAutomationSessionProxy.js" > ${DERIVED_SOURCES_WEBKIT 2_DIR}/WebAutomationSessionProxy.min.js890 COMMAND ${PYTHON_EXECUTABLE} ${JavaScriptCore_SCRIPTS_DIR}/jsmin.py < ${WEBKIT 2_DIR}/WebProcess/Automation/WebAutomationSessionProxy.js >> ${DERIVED_SOURCES_WEBKIT2_DIR}/WebAutomationSessionProxy.min.js891 COMMAND ${PERL_EXECUTABLE} ${JavaScriptCore_SCRIPTS_DIR}/xxd.pl WebAutomationSessionProxyScriptSource ${DERIVED_SOURCES_WEBKIT 2_DIR}/WebAutomationSessionProxy.min.js ${DERIVED_SOURCES_WEBKIT2_DIR}/WebAutomationSessionProxyScriptSource.h889 COMMAND ${CMAKE_COMMAND} -E echo "//# sourceURL=__InjectedScript_WebAutomationSessionProxy.js" > ${DERIVED_SOURCES_WEBKIT_DIR}/WebAutomationSessionProxy.min.js 890 COMMAND ${PYTHON_EXECUTABLE} ${JavaScriptCore_SCRIPTS_DIR}/jsmin.py < ${WEBKIT_DIR}/WebProcess/Automation/WebAutomationSessionProxy.js >> ${DERIVED_SOURCES_WEBKIT_DIR}/WebAutomationSessionProxy.min.js 891 COMMAND ${PERL_EXECUTABLE} ${JavaScriptCore_SCRIPTS_DIR}/xxd.pl WebAutomationSessionProxyScriptSource ${DERIVED_SOURCES_WEBKIT_DIR}/WebAutomationSessionProxy.min.js ${DERIVED_SOURCES_WEBKIT_DIR}/WebAutomationSessionProxyScriptSource.h 892 892 VERBATIM) 893 893 894 list(APPEND WebKit 2_HEADERS895 ${DERIVED_SOURCES_WEBKIT 2_DIR}/WebAutomationSessionProxyScriptSource.h896 ) 897 898 list(APPEND WebKit 2_SOURCES ${WebKit2_DERIVED_SOURCES})899 900 WEBKIT_FRAMEWORK(WebKit 2)901 add_dependencies(WebKit 2 WebCore ${WEBKIT2_EXTRA_DEPENDENCIES})902 add_webkit2_prefix_header(WebKit2)894 list(APPEND WebKit_HEADERS 895 ${DERIVED_SOURCES_WEBKIT_DIR}/WebAutomationSessionProxyScriptSource.h 896 ) 897 898 list(APPEND WebKit_SOURCES ${WebKit_DERIVED_SOURCES}) 899 900 WEBKIT_FRAMEWORK(WebKit) 901 add_dependencies(WebKit WebCore ${WEBKIT_EXTRA_DEPENDENCIES}) 902 ADD_WEBKIT_PREFIX_HEADER(WebKit) 903 903 904 904 if (COMPILER_IS_GCC_OR_CLANG AND NOT APPLE) 905 target_link_libraries(WebKit 2-Wl,--start-group WebCore WebCoreDerivedSources -Wl,--end-group)906 endif () 907 908 if (WebKit 2_VERSION_SCRIPT)909 WEBKIT_ADD_TARGET_PROPERTIES(WebKit 2 LINK_FLAGS "${WebKit2_VERSION_SCRIPT}")905 target_link_libraries(WebKit -Wl,--start-group WebCore WebCoreDerivedSources -Wl,--end-group) 906 endif () 907 908 if (WebKit_VERSION_SCRIPT) 909 WEBKIT_ADD_TARGET_PROPERTIES(WebKit LINK_FLAGS "${WebKit_VERSION_SCRIPT}") 910 910 endif () 911 911 912 912 add_executable(WebProcess ${WebProcess_SOURCES}) 913 add_webkit2_prefix_header(WebProcess)913 ADD_WEBKIT_PREFIX_HEADER(WebProcess) 914 914 target_link_libraries(WebProcess ${WebProcess_LIBRARIES}) 915 915 916 if (WebKit 2_WebProcess_OUTPUT_NAME)917 set_target_properties(WebProcess PROPERTIES OUTPUT_NAME ${WebKit 2_WebProcess_OUTPUT_NAME})916 if (WebKit_WebProcess_OUTPUT_NAME) 917 set_target_properties(WebProcess PROPERTIES OUTPUT_NAME ${WebKit_WebProcess_OUTPUT_NAME}) 918 918 endif () 919 919 920 920 add_executable(NetworkProcess ${NetworkProcess_SOURCES}) 921 add_webkit2_prefix_header(NetworkProcess)921 ADD_WEBKIT_PREFIX_HEADER(NetworkProcess) 922 922 target_link_libraries(NetworkProcess ${NetworkProcess_LIBRARIES}) 923 923 924 if (WebKit 2_NetworkProcess_OUTPUT_NAME)925 set_target_properties(NetworkProcess PROPERTIES OUTPUT_NAME ${WebKit 2_NetworkProcess_OUTPUT_NAME})924 if (WebKit_NetworkProcess_OUTPUT_NAME) 925 set_target_properties(NetworkProcess PROPERTIES OUTPUT_NAME ${WebKit_NetworkProcess_OUTPUT_NAME}) 926 926 endif () 927 927 928 928 if (NOT "${PORT}" STREQUAL "Mac") 929 929 add_executable(StorageProcess ${StorageProcess_SOURCES}) 930 add_webkit2_prefix_header(StorageProcess)930 ADD_WEBKIT_PREFIX_HEADER(StorageProcess) 931 931 target_link_libraries(StorageProcess ${StorageProcess_LIBRARIES}) 932 932 install(TARGETS StorageProcess DESTINATION "${LIBEXEC_INSTALL_DIR}") … … 936 936 endif () 937 937 938 if (WebKit 2_StorageProcess_OUTPUT_NAME)939 set_target_properties(StorageProcess PROPERTIES OUTPUT_NAME ${WebKit 2_StorageProcess_OUTPUT_NAME})938 if (WebKit_StorageProcess_OUTPUT_NAME) 939 set_target_properties(StorageProcess PROPERTIES OUTPUT_NAME ${WebKit_StorageProcess_OUTPUT_NAME}) 940 940 endif () 941 941 endif () 942 942 943 # Suppress unused parameter warnings for sources in WebKit2.944 943 if (COMPILER_IS_GCC_OR_CLANG) 945 WEBKIT_ADD_TARGET_CXX_FLAGS(WebKit 2-Wno-unused-parameter)944 WEBKIT_ADD_TARGET_CXX_FLAGS(WebKit -Wno-unused-parameter) 946 945 WEBKIT_ADD_TARGET_CXX_FLAGS(WebProcess -Wno-unused-parameter) 947 946 WEBKIT_ADD_TARGET_CXX_FLAGS(NetworkProcess -Wno-unused-parameter) … … 951 950 add_definitions(-DENABLE_PLUGIN_PROCESS=1) 952 951 add_executable(PluginProcess ${PluginProcess_SOURCES}) 953 add_webkit2_prefix_header(PluginProcess)952 ADD_WEBKIT_PREFIX_HEADER(PluginProcess) 954 953 target_link_libraries(PluginProcess ${PluginProcess_LIBRARIES}) 955 954 install(TARGETS PluginProcess DESTINATION "${LIBEXEC_INSTALL_DIR}") … … 959 958 endif () 960 959 961 if (WebKit 2_PluginProcess_OUTPUT_NAME)962 set_target_properties(PluginProcess PROPERTIES OUTPUT_NAME ${WebKit 2_PluginProcess_OUTPUT_NAME})960 if (WebKit_PluginProcess_OUTPUT_NAME) 961 set_target_properties(PluginProcess PROPERTIES OUTPUT_NAME ${WebKit_PluginProcess_OUTPUT_NAME}) 963 962 endif () 964 963 endif () … … 971 970 972 971 add_custom_target(WebContentProcessNib COMMAND 973 ibtool --compile ${_web_xpc_dir}/Resources/WebContentProcess.nib ${WEBKIT 2_DIR}/Resources/WebContentProcess.xib972 ibtool --compile ${_web_xpc_dir}/Resources/WebContentProcess.nib ${WEBKIT_DIR}/Resources/WebContentProcess.xib 974 973 VERBATIM) 975 add_dependencies(WebKit 2WebContentProcessNib)974 add_dependencies(WebKit WebContentProcessNib) 976 975 977 976 # FIXME: This shouldn't be two operations. 978 file(COPY ${WEBKIT 2_DIR}/WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX.plist DESTINATION ${_web_xpc_dir})977 file(COPY ${WEBKIT_DIR}/WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX.plist DESTINATION ${_web_xpc_dir}) 979 978 file(RENAME ${_web_xpc_dir}/Info-OSX.plist ${_web_xpc_dir}/Info.plist) 980 979 … … 987 986 988 987 # FIXME: This shouldn't be two operations. 989 file(COPY ${WEBKIT 2_DIR}/NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX.plist DESTINATION ${_net_xpc_dir})988 file(COPY ${WEBKIT_DIR}/NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX.plist DESTINATION ${_net_xpc_dir}) 990 989 file(RENAME ${_net_xpc_dir}/Info-OSX.plist ${_net_xpc_dir}/Info.plist) 991 990 992 991 set_target_properties(NetworkProcess PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${_net_xpc_dir}/MacOS") 993 992 else () 994 WEBKIT_POPULATE_LIBRARY_VERSION(WEBKIT 2)995 set_target_properties(WebKit 2 PROPERTIES VERSION ${WEBKIT2_VERSION} SOVERSION ${WEBKIT2_VERSION_MAJOR})996 997 install(TARGETS WebKit 2WebProcess NetworkProcess993 WEBKIT_POPULATE_LIBRARY_VERSION(WEBKIT) 994 set_target_properties(WebKit PROPERTIES VERSION ${WEBKIT_VERSION} SOVERSION ${WEBKIT_VERSION_MAJOR}) 995 996 install(TARGETS WebKit WebProcess NetworkProcess 998 997 LIBRARY DESTINATION "${LIB_INSTALL_DIR}" 999 998 RUNTIME DESTINATION "${LIBEXEC_INSTALL_DIR}" -
trunk/Source/WebKit/ChangeLog
r222183 r222194 1 2017-09-18 Michael Catanzaro <mcatanzaro@igalia.com> 2 3 [CMake] Rename WebKit target to WebKitLegacy and rename WebKit2 target to WebKit 4 https://bugs.webkit.org/show_bug.cgi?id=174558 5 6 Reviewed by Alex Christensen. 7 8 * CMakeLists.txt: 9 * PlatformGTK.cmake: 10 * PlatformMac.cmake: 11 * PlatformWPE.cmake: 12 * PlatformWin.cmake: 13 * Shared/gtk/WebKitWaylandProtocol.xml: Renamed from Source/WebKit/Shared/gtk/WebKit2WaylandProtocol.xml. 14 * UIProcess/gtk/WaylandCompositor.cpp: 15 * WebProcess/gtk/WaylandCompositorDisplay.cpp: 16 1 17 2017-09-18 Andy Estes <aestes@apple.com> 2 18 -
trunk/Source/WebKit/PlatformGTK.cmake
r222133 r222194 1 set(WebKit 2_OUTPUT_NAME webkit2gtk-${WEBKITGTK_API_VERSION})2 set(WebKit 2_WebProcess_OUTPUT_NAME WebKitWebProcess)3 set(WebKit 2_NetworkProcess_OUTPUT_NAME WebKitNetworkProcess)4 set(WebKit 2_PluginProcess_OUTPUT_NAME WebKitPluginProcess)5 set(WebKit 2_StorageProcess_OUTPUT_NAME WebKitStorageProcess)1 set(WebKit_OUTPUT_NAME webkit2gtk-${WEBKITGTK_API_VERSION}) 2 set(WebKit_WebProcess_OUTPUT_NAME WebKitWebProcess) 3 set(WebKit_NetworkProcess_OUTPUT_NAME WebKitNetworkProcess) 4 set(WebKit_PluginProcess_OUTPUT_NAME WebKitPluginProcess) 5 set(WebKit_StorageProcess_OUTPUT_NAME WebKitStorageProcess) 6 6 7 7 file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKIT2GTK_API_DIR}) … … 23 23 add_definitions(-DDATADIR="${CMAKE_INSTALL_FULL_DATADIR}") 24 24 25 set(WebKit 2_USE_PREFIX_HEADER ON)26 27 list(APPEND WebKit 2_SOURCES25 set(WebKit_USE_PREFIX_HEADER ON) 26 27 list(APPEND WebKit_SOURCES 28 28 NetworkProcess/CustomProtocols/soup/LegacyCustomProtocolManagerSoup.cpp 29 29 … … 406 406 ) 407 407 408 list(APPEND WebKit 2_DERIVED_SOURCES408 list(APPEND WebKit_DERIVED_SOURCES 409 409 ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/InspectorGResourceBundle.c 410 ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/WebKit 2ResourcesGResourceBundle.c410 ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/WebKitResourcesGResourceBundle.c 411 411 412 412 ${DERIVED_SOURCES_WEBKIT2GTK_API_DIR}/WebKitEnumTypes.cpp … … 414 414 415 415 if (ENABLE_WAYLAND_TARGET) 416 list(APPEND WebKit 2_DERIVED_SOURCES417 ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/WebKit 2WaylandClientProtocol.c416 list(APPEND WebKit_DERIVED_SOURCES 417 ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/WebKitWaylandClientProtocol.c 418 418 ) 419 419 endif () … … 422 422 ${DERIVED_SOURCES_WEBKIT2GTK_API_DIR}/WebKitEnumTypes.h 423 423 ${DERIVED_SOURCES_WEBKIT2GTK_API_DIR}/WebKitVersion.h 424 ${WEBKIT 2_DIR}/UIProcess/API/gtk/WebKitApplicationInfo.h425 ${WEBKIT 2_DIR}/UIProcess/API/gtk/WebKitAuthenticationRequest.h426 ${WEBKIT 2_DIR}/UIProcess/API/gtk/WebKitAutocleanups.h427 ${WEBKIT 2_DIR}/UIProcess/API/gtk/WebKitAutomationSession.h428 ${WEBKIT 2_DIR}/UIProcess/API/gtk/WebKitBackForwardList.h429 ${WEBKIT 2_DIR}/UIProcess/API/gtk/WebKitBackForwardListItem.h430 ${WEBKIT 2_DIR}/UIProcess/API/gtk/WebKitColorChooserRequest.h431 ${WEBKIT 2_DIR}/UIProcess/API/gtk/WebKitCredential.h432 ${WEBKIT 2_DIR}/UIProcess/API/gtk/WebKitContextMenu.h433 ${WEBKIT 2_DIR}/UIProcess/API/gtk/WebKitContextMenuActions.h434 ${WEBKIT 2_DIR}/UIProcess/API/gtk/WebKitContextMenuItem.h435 ${WEBKIT 2_DIR}/UIProcess/API/gtk/WebKitCookieManager.h436 ${WEBKIT 2_DIR}/UIProcess/API/gtk/WebKitDefines.h437 ${WEBKIT 2_DIR}/UIProcess/API/gtk/WebKitDownload.h438 ${WEBKIT 2_DIR}/UIProcess/API/gtk/WebKitEditingCommands.h439 ${WEBKIT 2_DIR}/UIProcess/API/gtk/WebKitEditorState.h440 ${WEBKIT 2_DIR}/UIProcess/API/gtk/WebKitError.h441 ${WEBKIT 2_DIR}/UIProcess/API/gtk/WebKitFaviconDatabase.h442 ${WEBKIT 2_DIR}/UIProcess/API/gtk/WebKitFileChooserRequest.h443 ${WEBKIT 2_DIR}/UIProcess/API/gtk/WebKitFindController.h444 ${WEBKIT 2_DIR}/UIProcess/API/gtk/WebKitFormSubmissionRequest.h445 ${WEBKIT 2_DIR}/UIProcess/API/gtk/WebKitForwardDeclarations.h446 ${WEBKIT 2_DIR}/UIProcess/API/gtk/WebKitGeolocationPermissionRequest.h447 ${WEBKIT 2_DIR}/UIProcess/API/gtk/WebKitHitTestResult.h448 ${WEBKIT 2_DIR}/UIProcess/API/gtk/WebKitInstallMissingMediaPluginsPermissionRequest.h449 ${WEBKIT 2_DIR}/UIProcess/API/gtk/WebKitJavascriptResult.h450 ${WEBKIT 2_DIR}/UIProcess/API/gtk/WebKitMimeInfo.h451 ${WEBKIT 2_DIR}/UIProcess/API/gtk/WebKitNavigationAction.h452 ${WEBKIT 2_DIR}/UIProcess/API/gtk/WebKitNavigationPolicyDecision.h453 ${WEBKIT 2_DIR}/UIProcess/API/gtk/WebKitNetworkProxySettings.h454 ${WEBKIT 2_DIR}/UIProcess/API/gtk/WebKitNotificationPermissionRequest.h455 ${WEBKIT 2_DIR}/UIProcess/API/gtk/WebKitNotification.h456 ${WEBKIT 2_DIR}/UIProcess/API/gtk/WebKitOptionMenu.h457 ${WEBKIT 2_DIR}/UIProcess/API/gtk/WebKitOptionMenuItem.h458 ${WEBKIT 2_DIR}/UIProcess/API/gtk/WebKitPermissionRequest.h459 ${WEBKIT 2_DIR}/UIProcess/API/gtk/WebKitPlugin.h460 ${WEBKIT 2_DIR}/UIProcess/API/gtk/WebKitPolicyDecision.h461 ${WEBKIT 2_DIR}/UIProcess/API/gtk/WebKitPrintCustomWidget.h462 ${WEBKIT 2_DIR}/UIProcess/API/gtk/WebKitPrintOperation.h463 ${WEBKIT 2_DIR}/UIProcess/API/gtk/WebKitResponsePolicyDecision.h464 ${WEBKIT 2_DIR}/UIProcess/API/gtk/WebKitScriptDialog.h465 ${WEBKIT 2_DIR}/UIProcess/API/gtk/WebKitSecurityManager.h466 ${WEBKIT 2_DIR}/UIProcess/API/gtk/WebKitSecurityOrigin.h467 ${WEBKIT 2_DIR}/UIProcess/API/gtk/WebKitSettings.h468 ${WEBKIT 2_DIR}/UIProcess/API/gtk/WebKitURIRequest.h469 ${WEBKIT 2_DIR}/UIProcess/API/gtk/WebKitURIResponse.h470 ${WEBKIT 2_DIR}/UIProcess/API/gtk/WebKitURISchemeRequest.h471 ${WEBKIT 2_DIR}/UIProcess/API/gtk/WebKitUserContent.h472 ${WEBKIT 2_DIR}/UIProcess/API/gtk/WebKitUserContentManager.h473 ${WEBKIT 2_DIR}/UIProcess/API/gtk/WebKitUserMediaPermissionRequest.h474 ${WEBKIT 2_DIR}/UIProcess/API/gtk/WebKitWebContext.h475 ${WEBKIT 2_DIR}/UIProcess/API/gtk/WebKitWebInspector.h476 ${WEBKIT 2_DIR}/UIProcess/API/gtk/WebKitWebResource.h477 ${WEBKIT 2_DIR}/UIProcess/API/gtk/WebKitWebView.h478 ${WEBKIT 2_DIR}/UIProcess/API/gtk/WebKitWebViewBase.h479 ${WEBKIT 2_DIR}/UIProcess/API/gtk/WebKitWebViewSessionState.h480 ${WEBKIT 2_DIR}/UIProcess/API/gtk/WebKitWebsiteData.h481 ${WEBKIT 2_DIR}/UIProcess/API/gtk/WebKitWebsiteDataManager.h482 ${WEBKIT 2_DIR}/UIProcess/API/gtk/WebKitWindowProperties.h483 ${WEBKIT 2_DIR}/UIProcess/API/gtk/webkit2.h424 ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitApplicationInfo.h 425 ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitAuthenticationRequest.h 426 ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitAutocleanups.h 427 ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitAutomationSession.h 428 ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitBackForwardList.h 429 ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitBackForwardListItem.h 430 ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitColorChooserRequest.h 431 ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitCredential.h 432 ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitContextMenu.h 433 ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitContextMenuActions.h 434 ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitContextMenuItem.h 435 ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitCookieManager.h 436 ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitDefines.h 437 ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitDownload.h 438 ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitEditingCommands.h 439 ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitEditorState.h 440 ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitError.h 441 ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitFaviconDatabase.h 442 ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitFileChooserRequest.h 443 ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitFindController.h 444 ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitFormSubmissionRequest.h 445 ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitForwardDeclarations.h 446 ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitGeolocationPermissionRequest.h 447 ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitHitTestResult.h 448 ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitInstallMissingMediaPluginsPermissionRequest.h 449 ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitJavascriptResult.h 450 ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitMimeInfo.h 451 ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitNavigationAction.h 452 ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitNavigationPolicyDecision.h 453 ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitNetworkProxySettings.h 454 ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitNotificationPermissionRequest.h 455 ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitNotification.h 456 ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitOptionMenu.h 457 ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitOptionMenuItem.h 458 ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitPermissionRequest.h 459 ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitPlugin.h 460 ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitPolicyDecision.h 461 ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitPrintCustomWidget.h 462 ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitPrintOperation.h 463 ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitResponsePolicyDecision.h 464 ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitScriptDialog.h 465 ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitSecurityManager.h 466 ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitSecurityOrigin.h 467 ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitSettings.h 468 ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitURIRequest.h 469 ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitURIResponse.h 470 ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitURISchemeRequest.h 471 ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitUserContent.h 472 ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitUserContentManager.h 473 ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitUserMediaPermissionRequest.h 474 ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitWebContext.h 475 ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitWebInspector.h 476 ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitWebResource.h 477 ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitWebView.h 478 ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitWebViewBase.h 479 ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitWebViewSessionState.h 480 ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitWebsiteData.h 481 ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitWebsiteDataManager.h 482 ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitWindowProperties.h 483 ${WEBKIT_DIR}/UIProcess/API/gtk/webkit2.h 484 484 ) 485 485 486 486 set(WebKit2WebExtension_INSTALLED_HEADERS 487 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/WebKitConsoleMessage.h488 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/WebKitFrame.h489 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/WebKitScriptWorld.h490 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/WebKitWebEditor.h491 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/WebKitWebExtension.h492 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/WebKitWebExtensionAutocleanups.h493 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/WebKitWebHitTestResult.h494 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/WebKitWebPage.h495 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/webkit-web-extension.h487 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/WebKitConsoleMessage.h 488 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/WebKitFrame.h 489 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/WebKitScriptWorld.h 490 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/WebKitWebEditor.h 491 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/WebKitWebExtension.h 492 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/WebKitWebExtensionAutocleanups.h 493 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/WebKitWebHitTestResult.h 494 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/WebKitWebPage.h 495 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/webkit-web-extension.h 496 496 ) 497 497 498 498 set(WebKitDOM_INSTALLED_HEADERS 499 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/webkitdomautocleanups.h500 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/webkitdomdefines.h501 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/webkitdom.h502 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMAttr.h503 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMBlob.h504 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCDATASection.h505 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCharacterData.h506 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMClientRect.h507 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMClientRectList.h508 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMComment.h509 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCSSRule.h510 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCSSRuleList.h511 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCSSStyleDeclaration.h512 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCSSStyleSheet.h513 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCSSValue.h514 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCustom.h515 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCustomUnstable.h516 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDeprecated.h517 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDocumentFragment.h518 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDocumentFragmentUnstable.h519 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDocument.h520 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDocumentType.h521 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDocumentUnstable.h522 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDOMImplementation.h523 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDOMSelection.h524 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDOMTokenList.h525 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDOMWindow.h526 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDOMWindowUnstable.h527 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMElement.h528 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMElementUnstable.h529 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMEvent.h530 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMEventTarget.h531 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMFile.h532 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMFileList.h533 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLAnchorElement.h534 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLAppletElement.h535 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLAreaElement.h536 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLBaseElement.h537 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLBodyElement.h538 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLBRElement.h539 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLButtonElement.h540 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLCanvasElement.h541 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLCollection.h542 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLDirectoryElement.h543 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLDivElement.h544 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLDListElement.h545 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLDocument.h546 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLElement.h547 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLElementUnstable.h548 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLEmbedElement.h549 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLFieldSetElement.h550 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLFontElement.h551 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLFormElement.h552 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLFrameElement.h553 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLFrameSetElement.h554 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLHeadElement.h555 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLHeadingElement.h556 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLHRElement.h557 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLHtmlElement.h558 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLIFrameElement.h559 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLImageElement.h560 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLInputElement.h561 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLLabelElement.h562 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLLegendElement.h563 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLLIElement.h564 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLLinkElement.h565 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLMapElement.h566 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLMarqueeElement.h567 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLMenuElement.h568 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLMetaElement.h569 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLModElement.h570 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLObjectElement.h571 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLOListElement.h572 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLOptGroupElement.h573 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLOptionElement.h574 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLOptionsCollection.h575 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLParagraphElement.h576 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLParamElement.h577 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLPreElement.h578 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLQuoteElement.h579 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLScriptElement.h580 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLSelectElement.h581 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLStyleElement.h582 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTableCaptionElement.h583 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTableCellElement.h584 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTableColElement.h585 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTableElement.h586 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTableRowElement.h587 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTableSectionElement.h588 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTextAreaElement.h589 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTitleElement.h590 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLUListElement.h591 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMKeyboardEvent.h592 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMMediaList.h593 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMMouseEvent.h594 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMNamedNodeMap.h595 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMNodeFilter.h596 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMNode.h597 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMNodeIterator.h598 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMNodeList.h599 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMObject.h600 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMProcessingInstruction.h601 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMRange.h602 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMRangeUnstable.h603 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMStyleSheet.h604 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMStyleSheetList.h605 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMText.h606 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMTreeWalker.h607 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMUIEvent.h608 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMWheelEvent.h609 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMXPathExpression.h610 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMXPathNSResolver.h611 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMXPathResult.h499 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/webkitdomautocleanups.h 500 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/webkitdomdefines.h 501 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/webkitdom.h 502 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMAttr.h 503 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMBlob.h 504 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCDATASection.h 505 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCharacterData.h 506 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMClientRect.h 507 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMClientRectList.h 508 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMComment.h 509 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCSSRule.h 510 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCSSRuleList.h 511 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCSSStyleDeclaration.h 512 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCSSStyleSheet.h 513 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCSSValue.h 514 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCustom.h 515 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCustomUnstable.h 516 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDeprecated.h 517 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDocumentFragment.h 518 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDocumentFragmentUnstable.h 519 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDocument.h 520 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDocumentType.h 521 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDocumentUnstable.h 522 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDOMImplementation.h 523 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDOMSelection.h 524 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDOMTokenList.h 525 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDOMWindow.h 526 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDOMWindowUnstable.h 527 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMElement.h 528 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMElementUnstable.h 529 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMEvent.h 530 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMEventTarget.h 531 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMFile.h 532 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMFileList.h 533 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLAnchorElement.h 534 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLAppletElement.h 535 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLAreaElement.h 536 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLBaseElement.h 537 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLBodyElement.h 538 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLBRElement.h 539 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLButtonElement.h 540 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLCanvasElement.h 541 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLCollection.h 542 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLDirectoryElement.h 543 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLDivElement.h 544 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLDListElement.h 545 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLDocument.h 546 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLElement.h 547 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLElementUnstable.h 548 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLEmbedElement.h 549 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLFieldSetElement.h 550 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLFontElement.h 551 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLFormElement.h 552 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLFrameElement.h 553 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLFrameSetElement.h 554 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLHeadElement.h 555 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLHeadingElement.h 556 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLHRElement.h 557 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLHtmlElement.h 558 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLIFrameElement.h 559 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLImageElement.h 560 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLInputElement.h 561 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLLabelElement.h 562 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLLegendElement.h 563 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLLIElement.h 564 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLLinkElement.h 565 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLMapElement.h 566 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLMarqueeElement.h 567 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLMenuElement.h 568 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLMetaElement.h 569 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLModElement.h 570 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLObjectElement.h 571 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLOListElement.h 572 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLOptGroupElement.h 573 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLOptionElement.h 574 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLOptionsCollection.h 575 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLParagraphElement.h 576 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLParamElement.h 577 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLPreElement.h 578 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLQuoteElement.h 579 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLScriptElement.h 580 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLSelectElement.h 581 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLStyleElement.h 582 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTableCaptionElement.h 583 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTableCellElement.h 584 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTableColElement.h 585 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTableElement.h 586 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTableRowElement.h 587 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTableSectionElement.h 588 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTextAreaElement.h 589 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTitleElement.h 590 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLUListElement.h 591 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMKeyboardEvent.h 592 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMMediaList.h 593 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMMouseEvent.h 594 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMNamedNodeMap.h 595 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMNodeFilter.h 596 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMNode.h 597 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMNodeIterator.h 598 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMNodeList.h 599 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMObject.h 600 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMProcessingInstruction.h 601 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMRange.h 602 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMRangeUnstable.h 603 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMStyleSheet.h 604 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMStyleSheetList.h 605 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMText.h 606 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMTreeWalker.h 607 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMUIEvent.h 608 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMWheelEvent.h 609 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMXPathExpression.h 610 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMXPathNSResolver.h 611 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMXPathResult.h 612 612 ) 613 613 614 614 set(WebKitDOM_GTKDOC_HEADERS 615 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMAttr.h616 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMBlob.h617 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCDATASection.h618 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCharacterData.h619 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMClientRect.h620 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMClientRectList.h621 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMComment.h622 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCSSRule.h623 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCSSRuleList.h624 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCSSStyleDeclaration.h625 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCSSStyleSheet.h626 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCSSValue.h627 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCustom.h628 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDeprecated.h629 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDocumentFragment.h630 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDocument.h631 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDocumentType.h632 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDOMImplementation.h633 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDOMSelection.h634 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDOMTokenList.h635 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDOMWindow.h636 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMElement.h637 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMEvent.h638 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMEventTarget.h639 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMFile.h640 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMFileList.h641 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLAnchorElement.h642 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLAppletElement.h643 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLAreaElement.h644 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLBaseElement.h645 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLBodyElement.h646 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLBRElement.h647 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLButtonElement.h648 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLCanvasElement.h649 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLCollection.h650 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLDirectoryElement.h651 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLDivElement.h652 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLDListElement.h653 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLDocument.h654 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLElement.h655 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLEmbedElement.h656 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLFieldSetElement.h657 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLFontElement.h658 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLFormElement.h659 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLFrameElement.h660 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLFrameSetElement.h661 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLHeadElement.h662 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLHeadingElement.h663 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLHRElement.h664 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLHtmlElement.h665 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLIFrameElement.h666 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLImageElement.h667 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLInputElement.h668 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLLabelElement.h669 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLLegendElement.h670 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLLIElement.h671 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLLinkElement.h672 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLMapElement.h673 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLMarqueeElement.h674 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLMenuElement.h675 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLMetaElement.h676 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLModElement.h677 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLObjectElement.h678 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLOListElement.h679 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLOptGroupElement.h680 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLOptionElement.h681 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLOptionsCollection.h682 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLParagraphElement.h683 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLParamElement.h684 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLPreElement.h685 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLQuoteElement.h686 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLScriptElement.h687 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLSelectElement.h688 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLStyleElement.h689 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTableCaptionElement.h690 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTableCellElement.h691 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTableColElement.h692 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTableElement.h693 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTableRowElement.h694 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTableSectionElement.h695 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTextAreaElement.h696 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTitleElement.h697 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLUListElement.h698 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMKeyboardEvent.h699 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMMediaList.h700 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMMouseEvent.h701 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMNamedNodeMap.h702 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMNodeFilter.h703 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMNode.h704 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMNodeIterator.h705 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMNodeList.h706 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMObject.h707 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMProcessingInstruction.h708 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMRange.h709 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMStyleSheet.h710 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMStyleSheetList.h711 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMText.h712 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMTreeWalker.h713 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMUIEvent.h714 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMWheelEvent.h715 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMXPathExpression.h716 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMXPathNSResolver.h717 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMXPathResult.h615 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMAttr.h 616 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMBlob.h 617 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCDATASection.h 618 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCharacterData.h 619 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMClientRect.h 620 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMClientRectList.h 621 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMComment.h 622 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCSSRule.h 623 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCSSRuleList.h 624 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCSSStyleDeclaration.h 625 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCSSStyleSheet.h 626 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCSSValue.h 627 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCustom.h 628 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDeprecated.h 629 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDocumentFragment.h 630 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDocument.h 631 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDocumentType.h 632 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDOMImplementation.h 633 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDOMSelection.h 634 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDOMTokenList.h 635 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDOMWindow.h 636 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMElement.h 637 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMEvent.h 638 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMEventTarget.h 639 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMFile.h 640 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMFileList.h 641 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLAnchorElement.h 642 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLAppletElement.h 643 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLAreaElement.h 644 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLBaseElement.h 645 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLBodyElement.h 646 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLBRElement.h 647 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLButtonElement.h 648 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLCanvasElement.h 649 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLCollection.h 650 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLDirectoryElement.h 651 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLDivElement.h 652 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLDListElement.h 653 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLDocument.h 654 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLElement.h 655 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLEmbedElement.h 656 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLFieldSetElement.h 657 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLFontElement.h 658 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLFormElement.h 659 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLFrameElement.h 660 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLFrameSetElement.h 661 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLHeadElement.h 662 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLHeadingElement.h 663 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLHRElement.h 664 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLHtmlElement.h 665 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLIFrameElement.h 666 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLImageElement.h 667 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLInputElement.h 668 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLLabelElement.h 669 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLLegendElement.h 670 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLLIElement.h 671 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLLinkElement.h 672 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLMapElement.h 673 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLMarqueeElement.h 674 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLMenuElement.h 675 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLMetaElement.h 676 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLModElement.h 677 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLObjectElement.h 678 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLOListElement.h 679 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLOptGroupElement.h 680 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLOptionElement.h 681 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLOptionsCollection.h 682 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLParagraphElement.h 683 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLParamElement.h 684 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLPreElement.h 685 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLQuoteElement.h 686 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLScriptElement.h 687 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLSelectElement.h 688 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLStyleElement.h 689 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTableCaptionElement.h 690 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTableCellElement.h 691 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTableColElement.h 692 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTableElement.h 693 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTableRowElement.h 694 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTableSectionElement.h 695 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTextAreaElement.h 696 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTitleElement.h 697 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLUListElement.h 698 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMKeyboardEvent.h 699 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMMediaList.h 700 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMMouseEvent.h 701 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMNamedNodeMap.h 702 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMNodeFilter.h 703 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMNode.h 704 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMNodeIterator.h 705 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMNodeList.h 706 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMObject.h 707 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMProcessingInstruction.h 708 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMRange.h 709 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMStyleSheet.h 710 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMStyleSheetList.h 711 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMText.h 712 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMTreeWalker.h 713 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMUIEvent.h 714 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMWheelEvent.h 715 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMXPathExpression.h 716 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMXPathNSResolver.h 717 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMXPathResult.h 718 718 ) 719 719 … … 755 755 756 756 # This is necessary because of a conflict between the GTK+ API WebKitVersion.h and one generated by WebCore. 757 list(INSERT WebKit 2_INCLUDE_DIRECTORIES 0757 list(INSERT WebKit_INCLUDE_DIRECTORIES 0 758 758 "${FORWARDING_HEADERS_WEBKIT2GTK_DIR}" 759 759 "${FORWARDING_HEADERS_WEBKIT2GTK_EXTENSION_DIR}" … … 762 762 ) 763 763 764 list(APPEND WebKit 2_INCLUDE_DIRECTORIES765 "${WEBKIT 2_DIR}/PluginProcess/unix"766 "${WEBKIT 2_DIR}/NetworkProcess/CustomProtocols/soup"767 "${WEBKIT 2_DIR}/NetworkProcess/Downloads/soup"768 "${WEBKIT 2_DIR}/NetworkProcess/gtk"769 "${WEBKIT 2_DIR}/NetworkProcess/soup"770 "${WEBKIT 2_DIR}/NetworkProcess/unix"771 "${WEBKIT 2_DIR}/Platform/IPC/glib"772 "${WEBKIT 2_DIR}/Platform/IPC/unix"773 "${WEBKIT 2_DIR}/Platform/classifier"774 "${WEBKIT 2_DIR}/Shared/API/c/gtk"775 "${WEBKIT 2_DIR}/Shared/API/glib"776 "${WEBKIT 2_DIR}/Shared/CoordinatedGraphics"777 "${WEBKIT 2_DIR}/Shared/CoordinatedGraphics/threadedcompositor"778 "${WEBKIT 2_DIR}/Shared/Plugins/unix"779 "${WEBKIT 2_DIR}/Shared/glib"780 "${WEBKIT 2_DIR}/Shared/gtk"781 "${WEBKIT 2_DIR}/Shared/linux"782 "${WEBKIT 2_DIR}/Shared/soup"783 "${WEBKIT 2_DIR}/Shared/unix"784 "${WEBKIT 2_DIR}/StorageProcess/unix"785 "${WEBKIT 2_DIR}/UIProcess/API/C/cairo"786 "${WEBKIT 2_DIR}/UIProcess/API/C/gtk"787 "${WEBKIT 2_DIR}/UIProcess/API/glib"788 "${WEBKIT 2_DIR}/UIProcess/API/gtk"789 "${WEBKIT 2_DIR}/UIProcess/Network/CustomProtocols/soup"790 "${WEBKIT 2_DIR}/UIProcess/Plugins/gtk"791 "${WEBKIT 2_DIR}/UIProcess/glib"792 "${WEBKIT 2_DIR}/UIProcess/gstreamer"793 "${WEBKIT 2_DIR}/UIProcess/gtk"794 "${WEBKIT 2_DIR}/UIProcess/linux"795 "${WEBKIT 2_DIR}/UIProcess/soup"796 "${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/glib"797 "${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk"798 "${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM"799 "${WEBKIT 2_DIR}/WebProcess/Plugins/Netscape/unix"800 "${WEBKIT 2_DIR}/WebProcess/Plugins/Netscape/x11"801 "${WEBKIT 2_DIR}/WebProcess/gtk"802 "${WEBKIT 2_DIR}/WebProcess/soup"803 "${WEBKIT 2_DIR}/WebProcess/unix"804 "${WEBKIT 2_DIR}/WebProcess/WebCoreSupport/gtk"805 "${WEBKIT 2_DIR}/WebProcess/WebCoreSupport/soup"806 "${WEBKIT 2_DIR}/WebProcess/WebPage/CoordinatedGraphics"807 "${WEBKIT 2_DIR}/WebProcess/WebPage/atk"808 "${WEBKIT 2_DIR}/WebProcess/WebPage/gtk"809 ) 810 811 list(APPEND WebKit 2_SYSTEM_INCLUDE_DIRECTORIES764 list(APPEND WebKit_INCLUDE_DIRECTORIES 765 "${WEBKIT_DIR}/PluginProcess/unix" 766 "${WEBKIT_DIR}/NetworkProcess/CustomProtocols/soup" 767 "${WEBKIT_DIR}/NetworkProcess/Downloads/soup" 768 "${WEBKIT_DIR}/NetworkProcess/gtk" 769 "${WEBKIT_DIR}/NetworkProcess/soup" 770 "${WEBKIT_DIR}/NetworkProcess/unix" 771 "${WEBKIT_DIR}/Platform/IPC/glib" 772 "${WEBKIT_DIR}/Platform/IPC/unix" 773 "${WEBKIT_DIR}/Platform/classifier" 774 "${WEBKIT_DIR}/Shared/API/c/gtk" 775 "${WEBKIT_DIR}/Shared/API/glib" 776 "${WEBKIT_DIR}/Shared/CoordinatedGraphics" 777 "${WEBKIT_DIR}/Shared/CoordinatedGraphics/threadedcompositor" 778 "${WEBKIT_DIR}/Shared/Plugins/unix" 779 "${WEBKIT_DIR}/Shared/glib" 780 "${WEBKIT_DIR}/Shared/gtk" 781 "${WEBKIT_DIR}/Shared/linux" 782 "${WEBKIT_DIR}/Shared/soup" 783 "${WEBKIT_DIR}/Shared/unix" 784 "${WEBKIT_DIR}/StorageProcess/unix" 785 "${WEBKIT_DIR}/UIProcess/API/C/cairo" 786 "${WEBKIT_DIR}/UIProcess/API/C/gtk" 787 "${WEBKIT_DIR}/UIProcess/API/glib" 788 "${WEBKIT_DIR}/UIProcess/API/gtk" 789 "${WEBKIT_DIR}/UIProcess/Network/CustomProtocols/soup" 790 "${WEBKIT_DIR}/UIProcess/Plugins/gtk" 791 "${WEBKIT_DIR}/UIProcess/glib" 792 "${WEBKIT_DIR}/UIProcess/gstreamer" 793 "${WEBKIT_DIR}/UIProcess/gtk" 794 "${WEBKIT_DIR}/UIProcess/linux" 795 "${WEBKIT_DIR}/UIProcess/soup" 796 "${WEBKIT_DIR}/WebProcess/InjectedBundle/API/glib" 797 "${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk" 798 "${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM" 799 "${WEBKIT_DIR}/WebProcess/Plugins/Netscape/unix" 800 "${WEBKIT_DIR}/WebProcess/Plugins/Netscape/x11" 801 "${WEBKIT_DIR}/WebProcess/gtk" 802 "${WEBKIT_DIR}/WebProcess/soup" 803 "${WEBKIT_DIR}/WebProcess/unix" 804 "${WEBKIT_DIR}/WebProcess/WebCoreSupport/gtk" 805 "${WEBKIT_DIR}/WebProcess/WebCoreSupport/soup" 806 "${WEBKIT_DIR}/WebProcess/WebPage/CoordinatedGraphics" 807 "${WEBKIT_DIR}/WebProcess/WebPage/atk" 808 "${WEBKIT_DIR}/WebProcess/WebPage/gtk" 809 ) 810 811 list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES 812 812 ${CAIRO_INCLUDE_DIRS} 813 813 ${ENCHANT_INCLUDE_DIRS} … … 819 819 820 820 if (USE_LIBNOTIFY) 821 list(APPEND WebKit 2_SYSTEM_INCLUDE_DIRECTORIES821 list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES 822 822 ${LIBNOTIFY_INCLUDE_DIRS} 823 823 ) 824 824 endif () 825 825 826 set(WebKit 2CommonIncludeDirectories ${WebKit2_INCLUDE_DIRECTORIES})827 set(WebKit 2CommonSystemIncludeDirectories ${WebKit2_SYSTEM_INCLUDE_DIRECTORIES})828 829 list(APPEND WebKit 2_SYSTEM_INCLUDE_DIRECTORIES826 set(WebKitCommonIncludeDirectories ${WebKit_INCLUDE_DIRECTORIES}) 827 set(WebKitCommonSystemIncludeDirectories ${WebKit_SYSTEM_INCLUDE_DIRECTORIES}) 828 829 list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES 830 830 ${GLIB_INCLUDE_DIRS} 831 831 ${GTK_INCLUDE_DIRS} … … 845 845 ) 846 846 847 set(SharedWebKit 2Libraries848 ${WebKit 2_LIBRARIES}849 ) 850 851 list(APPEND WebKit 2_LIBRARIES847 set(SharedWebKitLibraries 848 ${WebKit_LIBRARIES} 849 ) 850 851 list(APPEND WebKit_LIBRARIES 852 852 WebCorePlatformGTK 853 853 ${GTK_UNIX_PRINT_LIBRARIES} … … 855 855 856 856 if (LIBNOTIFY_FOUND) 857 list(APPEND WebKit 2_LIBRARIES857 list(APPEND WebKit_LIBRARIES 858 858 ${LIBNOTIFY_LIBRARIES} 859 859 ) … … 868 868 DEPENDS ${WebKit2GTK_ENUM_GENERATION_HEADERS} 869 869 870 COMMAND glib-mkenums --template ${WEBKIT 2_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.h871 872 COMMAND glib-mkenums --template ${WEBKIT 2_DIR}/UIProcess/API/gtk/WebKitEnumTypes.cpp.template ${WebKit2GTK_ENUM_GENERATION_HEADERS} | sed s/web_kit/webkit/ > ${DERIVED_SOURCES_WEBKIT2GTK_API_DIR}/WebKitEnumTypes.cpp870 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 871 872 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 873 873 VERBATIM) 874 874 … … 889 889 ) 890 890 891 set(WebKit 2Resources891 set(WebKitResources 892 892 " <file alias=\"images/missingImage\">missingImage.png</file>\n" 893 893 " <file alias=\"images/missingImage@2x\">missingImage@2x.png</file>\n" … … 898 898 899 899 if (ENABLE_ICONDATABASE) 900 list(APPEND WebKit 2Resources900 list(APPEND WebKitResources 901 901 " <file alias=\"images/urlIcon\">urlIcon.png</file>\n" 902 902 ) … … 904 904 905 905 if (ENABLE_WEB_AUDIO) 906 list(APPEND WebKit 2Resources906 list(APPEND WebKitResources 907 907 " <file alias=\"audio/Composite\">Composite.wav</file>\n" 908 908 ) 909 909 endif () 910 910 911 file(WRITE ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/WebKit 2ResourcesGResourceBundle.xml911 file(WRITE ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/WebKitResourcesGResourceBundle.xml 912 912 "<?xml version=1.0 encoding=UTF-8?>\n" 913 913 "<gresources>\n" 914 914 " <gresource prefix=\"/org/webkitgtk/resources\">\n" 915 ${WebKit 2Resources}915 ${WebKitResources} 916 916 " </gresource>\n" 917 917 "</gresources>\n" … … 919 919 920 920 add_custom_command( 921 OUTPUT ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/WebKit 2ResourcesGResourceBundle.c922 DEPENDS ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/WebKit 2ResourcesGResourceBundle.xml923 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}/WebKit 2ResourcesGResourceBundle.c ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/WebKit2ResourcesGResourceBundle.xml921 OUTPUT ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/WebKitResourcesGResourceBundle.c 922 DEPENDS ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/WebKitResourcesGResourceBundle.xml 923 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 924 924 VERBATIM 925 925 ) … … 928 928 # Wayland protocol extension. 929 929 add_custom_command( 930 OUTPUT ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/WebKit 2WaylandClientProtocol.c931 DEPENDS ${WEBKIT 2_DIR}/Shared/gtk/WebKit2WaylandProtocol.xml932 COMMAND wayland-scanner server-header < ${WEBKIT 2_DIR}/Shared/gtk/WebKit2WaylandProtocol.xml > ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/WebKit2WaylandServerProtocol.h933 COMMAND wayland-scanner client-header < ${WEBKIT 2_DIR}/Shared/gtk/WebKit2WaylandProtocol.xml > ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/WebKit2WaylandClientProtocol.h934 COMMAND wayland-scanner code < ${WEBKIT 2_DIR}/Shared/gtk/WebKit2WaylandProtocol.xml > ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/WebKit2WaylandClientProtocol.c930 OUTPUT ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/WebKitWaylandClientProtocol.c 931 DEPENDS ${WEBKIT_DIR}/Shared/gtk/WebKitWaylandProtocol.xml 932 COMMAND wayland-scanner server-header < ${WEBKIT_DIR}/Shared/gtk/WebKitWaylandProtocol.xml > ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/WebKitWaylandServerProtocol.h 933 COMMAND wayland-scanner client-header < ${WEBKIT_DIR}/Shared/gtk/WebKitWaylandProtocol.xml > ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/WebKitWaylandClientProtocol.h 934 COMMAND wayland-scanner code < ${WEBKIT_DIR}/Shared/gtk/WebKitWaylandProtocol.xml > ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/WebKitWaylandClientProtocol.c 935 935 ) 936 936 endif () … … 940 940 941 941 # FIXME: We should figure out a way to avoid compiling files that are common between the plugin 942 # process and WebKit 2only once instead of recompiling them for the plugin process.942 # process and WebKit only once instead of recompiling them for the plugin process. 943 943 list(APPEND PluginProcessGTK2_SOURCES 944 944 Platform/Logging.cpp … … 1030 1030 WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp 1031 1031 1032 ${DERIVED_SOURCES_WEBKIT 2_DIR}/PluginControllerProxyMessageReceiver.cpp1033 ${DERIVED_SOURCES_WEBKIT 2_DIR}/PluginProcessMessageReceiver.cpp1034 ${DERIVED_SOURCES_WEBKIT 2_DIR}/WebProcessConnectionMessageReceiver.cpp1035 ${DERIVED_SOURCES_WEBKIT 2_DIR}/NPObjectMessageReceiverMessageReceiver.cpp1036 ${DERIVED_SOURCES_WEBKIT 2_DIR}/ChildProcessMessageReceiver.cpp1032 ${DERIVED_SOURCES_WEBKIT_DIR}/PluginControllerProxyMessageReceiver.cpp 1033 ${DERIVED_SOURCES_WEBKIT_DIR}/PluginProcessMessageReceiver.cpp 1034 ${DERIVED_SOURCES_WEBKIT_DIR}/WebProcessConnectionMessageReceiver.cpp 1035 ${DERIVED_SOURCES_WEBKIT_DIR}/NPObjectMessageReceiverMessageReceiver.cpp 1036 ${DERIVED_SOURCES_WEBKIT_DIR}/ChildProcessMessageReceiver.cpp 1037 1037 ) 1038 1038 1039 1039 add_executable(WebKitPluginProcess2 ${PluginProcessGTK2_SOURCES}) 1040 add_webkit2_prefix_header(WebKitPluginProcess2)1040 ADD_WEBKIT_PREFIX_HEADER(WebKitPluginProcess2) 1041 1041 1042 1042 # We need ENABLE_PLUGIN_PROCESS for all targets in this directory, but … … 1048 1048 ) 1049 1049 target_include_directories(WebKitPluginProcess2 PRIVATE 1050 ${WebKit 2CommonIncludeDirectories}1050 ${WebKitCommonIncludeDirectories} 1051 1051 ) 1052 1052 target_include_directories(WebKitPluginProcess2 SYSTEM PRIVATE 1053 ${WebKit 2CommonSystemIncludeDirectories}1053 ${WebKitCommonSystemIncludeDirectories} 1054 1054 ${GTK2_INCLUDE_DIRS} 1055 1055 ${GDK2_INCLUDE_DIRS} … … 1057 1057 1058 1058 set(WebKitPluginProcess2_LIBRARIES 1059 ${SharedWebKit 2Libraries}1059 ${SharedWebKitLibraries} 1060 1060 WebCorePlatformGTK2 1061 1061 ) … … 1063 1063 target_link_libraries(WebKitPluginProcess2 ${WebKitPluginProcess2_LIBRARIES}) 1064 1064 1065 add_dependencies(WebKitPluginProcess2 WebKit 2)1065 add_dependencies(WebKitPluginProcess2 WebKit) 1066 1066 1067 1067 install(TARGETS WebKitPluginProcess2 DESTINATION "${LIBEXEC_INSTALL_DIR}") … … 1079 1079 # Commands for building the built-in injected bundle. 1080 1080 include_directories( 1081 "${WEBKIT 2_DIR}/Platform"1082 "${WEBKIT 2_DIR}/Shared"1083 "${WEBKIT 2_DIR}/Shared/API/c"1084 "${WEBKIT 2_DIR}/UIProcess/API/C"1085 "${WEBKIT 2_DIR}/WebProcess/InjectedBundle"1086 "${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/c"1081 "${WEBKIT_DIR}/Platform" 1082 "${WEBKIT_DIR}/Shared" 1083 "${WEBKIT_DIR}/Shared/API/c" 1084 "${WEBKIT_DIR}/UIProcess/API/C" 1085 "${WEBKIT_DIR}/WebProcess/InjectedBundle" 1086 "${WEBKIT_DIR}/WebProcess/InjectedBundle/API/c" 1087 1087 "${DERIVED_SOURCES_DIR}/InjectedBundle" 1088 1088 "${FORWARDING_HEADERS_DIR}" … … 1090 1090 ) 1091 1091 1092 add_library(webkit2gtkinjectedbundle MODULE "${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/glib/WebKitInjectedBundleMain.cpp")1093 add_webkit2_prefix_header(webkit2gtkinjectedbundle)1094 target_link_libraries(webkit2gtkinjectedbundle WebKit 2)1092 add_library(webkit2gtkinjectedbundle MODULE "${WEBKIT_DIR}/WebProcess/InjectedBundle/API/glib/WebKitInjectedBundleMain.cpp") 1093 ADD_WEBKIT_PREFIX_HEADER(webkit2gtkinjectedbundle) 1094 target_link_libraries(webkit2gtkinjectedbundle WebKit) 1095 1095 1096 1096 if (COMPILER_IS_GCC_OR_CLANG) … … 1124 1124 add_custom_command( 1125 1125 OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir 1126 DEPENDS WebKit 21126 DEPENDS WebKit 1127 1127 DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir 1128 1128 COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations LDFLAGS= … … 1153 1153 -DWEBKIT2_COMPILATION 1154 1154 -I${CMAKE_SOURCE_DIR}/Source 1155 -I${WEBKIT 2_DIR}1155 -I${WEBKIT_DIR} 1156 1156 -I${JAVASCRIPTCORE_DIR} 1157 1157 -I${JAVASCRIPTCORE_DIR}/ForwardingHeaders … … 1160 1160 -I${FORWARDING_HEADERS_WEBKIT2GTK_DIR} 1161 1161 ${WebKit2GTK_INSTALLED_HEADERS} 1162 ${WEBKIT 2_DIR}/Shared/API/glib/*.cpp1163 ${WEBKIT 2_DIR}/UIProcess/API/glib/*.cpp1164 ${WEBKIT 2_DIR}/UIProcess/API/gtk/*.cpp1162 ${WEBKIT_DIR}/Shared/API/glib/*.cpp 1163 ${WEBKIT_DIR}/UIProcess/API/glib/*.cpp 1164 ${WEBKIT_DIR}/UIProcess/API/gtk/*.cpp 1165 1165 ) 1166 1166 … … 1198 1198 -DWEBKIT2_COMPILATION 1199 1199 -I${CMAKE_SOURCE_DIR}/Source 1200 -I${WEBKIT 2_DIR}1200 -I${WEBKIT_DIR} 1201 1201 -I${JAVASCRIPTCORE_DIR} 1202 1202 -I${JAVASCRIPTCORE_DIR}/ForwardingHeaders … … 1206 1206 -I${FORWARDING_HEADERS_WEBKIT2GTK_DIR} 1207 1207 -I${FORWARDING_HEADERS_WEBKIT2GTK_EXTENSION_DIR} 1208 -I${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk1208 -I${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk 1209 1209 ${WebKitDOM_INSTALLED_HEADERS} 1210 1210 ${WebKit2WebExtension_INSTALLED_HEADERS} 1211 ${WEBKIT 2_DIR}/Shared/API/glib/WebKitContextMenu.cpp1212 ${WEBKIT 2_DIR}/Shared/API/glib/WebKitContextMenuItem.cpp1213 ${WEBKIT 2_DIR}/Shared/API/glib/WebKitHitTestResult.cpp1214 ${WEBKIT 2_DIR}/Shared/API/glib/WebKitURIRequest.cpp1215 ${WEBKIT 2_DIR}/Shared/API/glib/WebKitURIResponse.cpp1216 ${WEBKIT 2_DIR}/UIProcess/API/gtk/WebKitContextMenu.h1217 ${WEBKIT 2_DIR}/UIProcess/API/gtk/WebKitContextMenuActions.h1218 ${WEBKIT 2_DIR}/UIProcess/API/gtk/WebKitContextMenuItem.h1219 ${WEBKIT 2_DIR}/UIProcess/API/gtk/WebKitHitTestResult.h1220 ${WEBKIT 2_DIR}/UIProcess/API/gtk/WebKitURIRequest.h1221 ${WEBKIT 2_DIR}/UIProcess/API/gtk/WebKitURIResponse.h1222 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/glib/*.cpp1211 ${WEBKIT_DIR}/Shared/API/glib/WebKitContextMenu.cpp 1212 ${WEBKIT_DIR}/Shared/API/glib/WebKitContextMenuItem.cpp 1213 ${WEBKIT_DIR}/Shared/API/glib/WebKitHitTestResult.cpp 1214 ${WEBKIT_DIR}/Shared/API/glib/WebKitURIRequest.cpp 1215 ${WEBKIT_DIR}/Shared/API/glib/WebKitURIResponse.cpp 1216 ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitContextMenu.h 1217 ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitContextMenuActions.h 1218 ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitContextMenuItem.h 1219 ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitHitTestResult.h 1220 ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitURIRequest.h 1221 ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitURIResponse.h 1222 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/glib/*.cpp 1223 1223 ) 1224 1224 … … 1269 1269 "namespace=webkit\n" 1270 1270 "cflags=-I${CMAKE_SOURCE_DIR}/Source\n" 1271 " -I${WEBKIT 2_DIR}/Shared/API/glib\n"1272 " -I${WEBKIT 2_DIR}/UIProcess/API/glib\n"1273 " -I${WEBKIT 2_DIR}/UIProcess/API/gtk\n"1271 " -I${WEBKIT_DIR}/Shared/API/glib\n" 1272 " -I${WEBKIT_DIR}/UIProcess/API/glib\n" 1273 " -I${WEBKIT_DIR}/UIProcess/API/gtk\n" 1274 1274 " -I${DERIVED_SOURCES_WEBKIT2GTK_DIR}\n" 1275 1275 " -I${FORWARDING_HEADERS_WEBKIT2GTK_DIR}\n" 1276 "doc_dir=${WEBKIT 2_DIR}/UIProcess/API/gtk/docs\n"1277 "source_dirs=${WEBKIT 2_DIR}/Shared/API/glib"1278 " ${WEBKIT 2_DIR}/UIProcess/API/glib\n"1279 " ${WEBKIT 2_DIR}/UIProcess/API/gtk\n"1280 " ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/glib\n"1281 " ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk\n"1276 "doc_dir=${WEBKIT_DIR}/UIProcess/API/gtk/docs\n" 1277 "source_dirs=${WEBKIT_DIR}/Shared/API/glib" 1278 " ${WEBKIT_DIR}/UIProcess/API/glib\n" 1279 " ${WEBKIT_DIR}/UIProcess/API/gtk\n" 1280 " ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/glib\n" 1281 " ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk\n" 1282 1282 " ${DERIVED_SOURCES_WEBKIT2GTK_API_DIR}\n" 1283 1283 "headers=${WebKit2GTK_ENUM_GENERATION_HEADERS} ${WebKit2WebExtension_INSTALLED_HEADERS}\n" … … 1290 1290 "namespace=webkit_dom\n" 1291 1291 "cflags=-I${CMAKE_SOURCE_DIR}/Source\n" 1292 " -I${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM\n"1292 " -I${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM\n" 1293 1293 " -I${DERIVED_SOURCES_WEBKIT2GTK_DIR}\n" 1294 1294 " -I${FORWARDING_HEADERS_WEBKIT2GTK_DIR}\n" 1295 "doc_dir=${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/docs\n"1296 "source_dirs=${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM\n"1295 "doc_dir=${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/docs\n" 1296 "source_dirs=${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM\n" 1297 1297 "headers=${WebKitDOM_GTKDOC_HEADERS}\n" 1298 1298 "main_sgml_file=webkitdomgtk-docs.sgml\n" 1299 1299 ) 1300 1300 1301 add_custom_target(WebKit 2-forwarding-headers1302 COMMAND ${PERL_EXECUTABLE} ${WEBKIT 2_DIR}/Scripts/generate-forwarding-headers.pl --include-path ${WEBKIT2_DIR} --output ${FORWARDING_HEADERS_DIR} --platform gtk --platform soup1301 add_custom_target(WebKit-forwarding-headers 1302 COMMAND ${PERL_EXECUTABLE} ${WEBKIT_DIR}/Scripts/generate-forwarding-headers.pl --include-path ${WEBKIT_DIR} --output ${FORWARDING_HEADERS_DIR} --platform gtk --platform soup 1303 1303 ) 1304 1304 … … 1306 1306 add_custom_command( 1307 1307 OUTPUT ${FORWARDING_HEADERS_WEBKIT2GTK_DIR}/webkit2 1308 DEPENDS ${WEBKIT 2_DIR}/UIProcess/API/gtk1309 COMMAND ln -n -s -f ${WEBKIT 2_DIR}/UIProcess/API/gtk ${FORWARDING_HEADERS_WEBKIT2GTK_DIR}/webkit21308 DEPENDS ${WEBKIT_DIR}/UIProcess/API/gtk 1309 COMMAND ln -n -s -f ${WEBKIT_DIR}/UIProcess/API/gtk ${FORWARDING_HEADERS_WEBKIT2GTK_DIR}/webkit2 1310 1310 ) 1311 1311 add_custom_command( 1312 1312 OUTPUT ${FORWARDING_HEADERS_WEBKIT2GTK_EXTENSION_DIR}/webkit2 1313 DEPENDS ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk1314 COMMAND ln -n -s -f ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk ${FORWARDING_HEADERS_WEBKIT2GTK_EXTENSION_DIR}/webkit21313 DEPENDS ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk 1314 COMMAND ln -n -s -f ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk ${FORWARDING_HEADERS_WEBKIT2GTK_EXTENSION_DIR}/webkit2 1315 1315 ) 1316 1316 add_custom_command( 1317 1317 OUTPUT ${FORWARDING_HEADERS_WEBKIT2GTK_EXTENSION_DIR}/webkitdom 1318 DEPENDS ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM1319 COMMAND ln -n -s -f ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM ${FORWARDING_HEADERS_WEBKIT2GTK_EXTENSION_DIR}/webkitdom1320 ) 1321 add_custom_target(WebKit 2-fake-api-headers1318 DEPENDS ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM 1319 COMMAND ln -n -s -f ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM ${FORWARDING_HEADERS_WEBKIT2GTK_EXTENSION_DIR}/webkitdom 1320 ) 1321 add_custom_target(WebKit-fake-api-headers 1322 1322 DEPENDS ${FORWARDING_HEADERS_WEBKIT2GTK_DIR}/webkit2 1323 1323 ${FORWARDING_HEADERS_WEBKIT2GTK_EXTENSION_DIR}/webkit2 … … 1325 1325 ) 1326 1326 1327 set(WEBKIT 2_EXTRA_DEPENDENCIES1328 WebKit 2-fake-api-headers1329 WebKit 2-forwarding-headers1330 ) 1327 set(WEBKIT_EXTRA_DEPENDENCIES 1328 WebKit-fake-api-headers 1329 WebKit-forwarding-headers 1330 ) -
trunk/Source/WebKit/PlatformMac.cmake
r222165 r222194 10 10 add_definitions(-DWK_XPC_SERVICE_SUFFIX=".Development") 11 11 12 list(APPEND WebKit 2_LIBRARIES13 PRIVATE WebKit 12 list(APPEND WebKit_LIBRARIES 13 PRIVATE WebKitLegacy 14 14 ${APPLICATIONSERVICES_LIBRARY} 15 15 ) 16 16 17 17 if (NOT AVFAUDIO_LIBRARY-NOTFOUND) 18 list(APPEND WebKit 2_LIBRARIES ${AVFAUDIO_LIBRARY})18 list(APPEND WebKit_LIBRARIES ${AVFAUDIO_LIBRARY}) 19 19 endif () 20 20 21 list(APPEND WebKit 2_SOURCES21 list(APPEND WebKit_SOURCES 22 22 NetworkProcess/CustomProtocols/Cocoa/LegacyCustomProtocolManagerCocoa.mm 23 23 … … 389 389 ) 390 390 391 list(APPEND WebKit 2_INCLUDE_DIRECTORIES391 list(APPEND WebKit_INCLUDE_DIRECTORIES 392 392 "${PAL_DIR}" 393 "${WEBKIT 2_DIR}/NetworkProcess/cocoa"394 "${WEBKIT 2_DIR}/NetworkProcess/mac"395 "${WEBKIT 2_DIR}/PluginProcess/mac"396 "${WEBKIT 2_DIR}/UIProcess/mac"397 "${WEBKIT 2_DIR}/UIProcess/API/C/mac"398 "${WEBKIT 2_DIR}/UIProcess/API/Cocoa"399 "${WEBKIT 2_DIR}/UIProcess/API/mac"400 "${WEBKIT 2_DIR}/UIProcess/Cocoa"401 "${WEBKIT 2_DIR}/UIProcess/Launcher/mac"402 "${WEBKIT 2_DIR}/UIProcess/RemoteLayerTree"403 "${WEBKIT 2_DIR}/UIProcess/RemoteLayerTree/ios"404 "${WEBKIT 2_DIR}/UIProcess/ios"405 "${WEBKIT 2_DIR}/Platform/cg"406 "${WEBKIT 2_DIR}/Platform/classifier"407 "${WEBKIT 2_DIR}/Platform/classifier/cocoa"408 "${WEBKIT 2_DIR}/Platform/mac"409 "${WEBKIT 2_DIR}/Platform/unix"410 "${WEBKIT 2_DIR}/Platform/spi/Cocoa"411 "${WEBKIT 2_DIR}/Platform/spi/mac"412 "${WEBKIT 2_DIR}/Platform/IPC/mac"413 "${WEBKIT 2_DIR}/Platform/spi/Cocoa"414 "${WEBKIT 2_DIR}/Shared/API/Cocoa"415 "${WEBKIT 2_DIR}/Shared/API/c/cf"416 "${WEBKIT 2_DIR}/Shared/API/c/cg"417 "${WEBKIT 2_DIR}/Shared/API/c/mac"418 "${WEBKIT 2_DIR}/Shared/cf"419 "${WEBKIT 2_DIR}/Shared/Cocoa"420 "${WEBKIT 2_DIR}/Shared/EntryPointUtilities/mac/XPCService"421 "${WEBKIT 2_DIR}/Shared/mac"422 "${WEBKIT 2_DIR}/Shared/Plugins/mac"423 "${WEBKIT 2_DIR}/Shared/Scrolling"424 "${WEBKIT 2_DIR}/WebProcess/cocoa"425 "${WEBKIT 2_DIR}/WebProcess/mac"426 "${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/Cocoa"427 "${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/mac"428 "${WEBKIT 2_DIR}/WebProcess/Plugins/PDF"429 "${WEBKIT 2_DIR}/WebProcess/Plugins/Netscape/mac"430 "${WEBKIT 2_DIR}/WebProcess/WebPage/Cocoa"431 "${WEBKIT 2_DIR}/WebProcess/WebPage/RemoteLayerTree"432 "${WEBKIT 2_DIR}/WebProcess/WebPage/mac"433 "${WEBKIT 2_DIR}/WebProcess/WebCoreSupport/mac"393 "${WEBKIT_DIR}/NetworkProcess/cocoa" 394 "${WEBKIT_DIR}/NetworkProcess/mac" 395 "${WEBKIT_DIR}/PluginProcess/mac" 396 "${WEBKIT_DIR}/UIProcess/mac" 397 "${WEBKIT_DIR}/UIProcess/API/C/mac" 398 "${WEBKIT_DIR}/UIProcess/API/Cocoa" 399 "${WEBKIT_DIR}/UIProcess/API/mac" 400 "${WEBKIT_DIR}/UIProcess/Cocoa" 401 "${WEBKIT_DIR}/UIProcess/Launcher/mac" 402 "${WEBKIT_DIR}/UIProcess/RemoteLayerTree" 403 "${WEBKIT_DIR}/UIProcess/RemoteLayerTree/ios" 404 "${WEBKIT_DIR}/UIProcess/ios" 405 "${WEBKIT_DIR}/Platform/cg" 406 "${WEBKIT_DIR}/Platform/classifier" 407 "${WEBKIT_DIR}/Platform/classifier/cocoa" 408 "${WEBKIT_DIR}/Platform/mac" 409 "${WEBKIT_DIR}/Platform/unix" 410 "${WEBKIT_DIR}/Platform/spi/Cocoa" 411 "${WEBKIT_DIR}/Platform/spi/mac" 412 "${WEBKIT_DIR}/Platform/IPC/mac" 413 "${WEBKIT_DIR}/Platform/spi/Cocoa" 414 "${WEBKIT_DIR}/Shared/API/Cocoa" 415 "${WEBKIT_DIR}/Shared/API/c/cf" 416 "${WEBKIT_DIR}/Shared/API/c/cg" 417 "${WEBKIT_DIR}/Shared/API/c/mac" 418 "${WEBKIT_DIR}/Shared/cf" 419 "${WEBKIT_DIR}/Shared/Cocoa" 420 "${WEBKIT_DIR}/Shared/EntryPointUtilities/mac/XPCService" 421 "${WEBKIT_DIR}/Shared/mac" 422 "${WEBKIT_DIR}/Shared/Plugins/mac" 423 "${WEBKIT_DIR}/Shared/Scrolling" 424 "${WEBKIT_DIR}/WebProcess/cocoa" 425 "${WEBKIT_DIR}/WebProcess/mac" 426 "${WEBKIT_DIR}/WebProcess/InjectedBundle/API/Cocoa" 427 "${WEBKIT_DIR}/WebProcess/InjectedBundle/API/mac" 428 "${WEBKIT_DIR}/WebProcess/Plugins/PDF" 429 "${WEBKIT_DIR}/WebProcess/Plugins/Netscape/mac" 430 "${WEBKIT_DIR}/WebProcess/WebPage/Cocoa" 431 "${WEBKIT_DIR}/WebProcess/WebPage/RemoteLayerTree" 432 "${WEBKIT_DIR}/WebProcess/WebPage/mac" 433 "${WEBKIT_DIR}/WebProcess/WebCoreSupport/mac" 434 434 "${FORWARDING_HEADERS_DIR}/WebCore" 435 435 "${DERIVED_SOURCES_WEBCORE_DIR}" … … 462 462 463 463 # FIXME: These should not have Development in production builds. 464 set(WebKit 2_WebProcess_OUTPUT_NAME com.apple.WebKit.WebContent.Development)465 set(WebKit 2_NetworkProcess_OUTPUT_NAME com.apple.WebKit.Networking.Development)464 set(WebKit_WebProcess_OUTPUT_NAME com.apple.WebKit.WebContent.Development) 465 set(WebKit_NetworkProcess_OUTPUT_NAME com.apple.WebKit.Networking.Development) 466 466 467 467 add_definitions("-include WebKit2Prefix.h") 468 468 469 set(WebKit 2_FORWARDING_HEADERS_FILES469 set(WebKit_FORWARDING_HEADERS_FILES 470 470 Shared/API/c/WKDiagnosticLoggingResultType.h 471 471 … … 475 475 ) 476 476 477 list(APPEND WebKit 2_MESSAGES_IN_FILES477 list(APPEND WebKit_MESSAGES_IN_FILES 478 478 Shared/API/Cocoa/RemoteObjectRegistry.messages.in 479 479 … … 489 489 ) 490 490 491 set(WebKit 2_FORWARDING_HEADERS_DIRECTORIES491 set(WebKit_FORWARDING_HEADERS_DIRECTORIES 492 492 Platform 493 493 Shared … … 521 521 ) 522 522 523 WEBKIT_CREATE_FORWARDING_HEADERS(WebKit FILES ${WebKit 2_FORWARDING_HEADERS_FILES} DIRECTORIES ${WebKit2_FORWARDING_HEADERS_DIRECTORIES})523 WEBKIT_CREATE_FORWARDING_HEADERS(WebKit FILES ${WebKit_FORWARDING_HEADERS_FILES} DIRECTORIES ${WebKit_FORWARDING_HEADERS_DIRECTORIES}) 524 524 525 525 # This is needed right now to import ObjC headers instead of including them. … … 738 738 endforeach () 739 739 740 list(APPEND WebKit 2_AUTOMATION_PROTOCOL_GENERATOR_EXTRA_FLAGS740 list(APPEND WebKit_AUTOMATION_PROTOCOL_GENERATOR_EXTRA_FLAGS 741 741 --platform=macOS 742 742 ) … … 747 747 set(CMAKE_SHARED_LINKER_FLAGS ${CMAKE_SHARED_LINKER_FLAGS} "-compatibility_version 1 -current_version ${WEBKIT_MAC_VERSION}") 748 748 749 set(WebKit 2_OUTPUT_NAME WebKit)749 set(WebKit_OUTPUT_NAME WebKit) -
trunk/Source/WebKit/PlatformWPE.cmake
r222133 r222194 10 10 add_definitions(-DLOCALEDIR="${CMAKE_INSTALL_FULL_LOCALEDIR}") 11 11 12 set(WebKit 2_USE_PREFIX_HEADER ON)13 14 add_custom_target(webkit 2wpe-forwarding-headers15 COMMAND ${PERL_EXECUTABLE} ${WEBKIT 2_DIR}/Scripts/generate-forwarding-headers.pl --include-path ${WEBKIT2_DIR} --output ${FORWARDING_HEADERS_DIR} --platform wpe --platform soup12 set(WebKit_USE_PREFIX_HEADER ON) 13 14 add_custom_target(webkitwpe-forwarding-headers 15 COMMAND ${PERL_EXECUTABLE} ${WEBKIT_DIR}/Scripts/generate-forwarding-headers.pl --include-path ${WEBKIT_DIR} --output ${FORWARDING_HEADERS_DIR} --platform wpe --platform soup 16 16 ) 17 17 … … 19 19 add_custom_command( 20 20 OUTPUT ${FORWARDING_HEADERS_WPE_DIR}/wpe 21 DEPENDS ${WEBKIT 2_DIR}/UIProcess/API/wpe22 COMMAND ln -n -s -f ${WEBKIT 2_DIR}/UIProcess/API/wpe ${FORWARDING_HEADERS_WPE_DIR}/wpe21 DEPENDS ${WEBKIT_DIR}/UIProcess/API/wpe 22 COMMAND ln -n -s -f ${WEBKIT_DIR}/UIProcess/API/wpe ${FORWARDING_HEADERS_WPE_DIR}/wpe 23 23 ) 24 24 25 25 add_custom_command( 26 26 OUTPUT ${FORWARDING_HEADERS_WPE_EXTENSION_DIR}/wpe 27 DEPENDS ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/wpe28 COMMAND ln -n -s -f ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/wpe ${FORWARDING_HEADERS_WPE_EXTENSION_DIR}/wpe29 ) 30 31 add_custom_target(webkit 2wpe-fake-api-headers27 DEPENDS ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/wpe 28 COMMAND ln -n -s -f ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/wpe ${FORWARDING_HEADERS_WPE_EXTENSION_DIR}/wpe 29 ) 30 31 add_custom_target(webkitwpe-fake-api-headers 32 32 DEPENDS ${FORWARDING_HEADERS_WPE_DIR}/wpe 33 33 ${FORWARDING_HEADERS_WPE_EXTENSION_DIR}/wpe 34 34 ) 35 35 36 set(WEBKIT 2_EXTRA_DEPENDENCIES37 webkit 2wpe-fake-api-headers38 webkit 2wpe-forwarding-headers36 set(WEBKIT_EXTRA_DEPENDENCIES 37 webkitwpe-fake-api-headers 38 webkitwpe-forwarding-headers 39 39 ) 40 40 … … 51 51 ) 52 52 53 list(APPEND WebKit 2_SOURCES53 list(APPEND WebKit_SOURCES 54 54 NetworkProcess/CustomProtocols/soup/LegacyCustomProtocolManagerSoup.cpp 55 55 … … 268 268 ) 269 269 270 list(APPEND WebKit 2_MESSAGES_IN_FILES270 list(APPEND WebKit_MESSAGES_IN_FILES 271 271 UIProcess/API/wpe/CompositingManagerProxy.messages.in 272 272 ) 273 273 274 list(APPEND WebKit 2_DERIVED_SOURCES275 ${DERIVED_SOURCES_WEBKIT 2_DIR}/WebKit2ResourcesGResourceBundle.c274 list(APPEND WebKit_DERIVED_SOURCES 275 ${DERIVED_SOURCES_WEBKIT_DIR}/WebKitResourcesGResourceBundle.c 276 276 277 277 ${DERIVED_SOURCES_WPE_API_DIR}/WebKitEnumTypes.cpp … … 280 280 set(WPE_API_INSTALLED_HEADERS 281 281 ${DERIVED_SOURCES_WPE_API_DIR}/WebKitEnumTypes.h 282 ${WEBKIT 2_DIR}/UIProcess/API/wpe/WebKitApplicationInfo.h283 ${WEBKIT 2_DIR}/UIProcess/API/wpe/WebKitAuthenticationRequest.h284 ${WEBKIT 2_DIR}/UIProcess/API/wpe/WebKitAutomationSession.h285 ${WEBKIT 2_DIR}/UIProcess/API/wpe/WebKitBackForwardList.h286 ${WEBKIT 2_DIR}/UIProcess/API/wpe/WebKitBackForwardListItem.h287 ${WEBKIT 2_DIR}/UIProcess/API/wpe/WebKitCredential.h288 ${WEBKIT 2_DIR}/UIProcess/API/wpe/WebKitContextMenu.h289 ${WEBKIT 2_DIR}/UIProcess/API/wpe/WebKitContextMenuActions.h290 ${WEBKIT 2_DIR}/UIProcess/API/wpe/WebKitContextMenuItem.h291 ${WEBKIT 2_DIR}/UIProcess/API/wpe/WebKitCookieManager.h292 ${WEBKIT 2_DIR}/UIProcess/API/wpe/WebKitDefines.h293 ${WEBKIT 2_DIR}/UIProcess/API/wpe/WebKitDownload.h294 ${WEBKIT 2_DIR}/UIProcess/API/wpe/WebKitEditingCommands.h295 ${WEBKIT 2_DIR}/UIProcess/API/wpe/WebKitEditorState.h296 ${WEBKIT 2_DIR}/UIProcess/API/wpe/WebKitError.h297 ${WEBKIT 2_DIR}/UIProcess/API/wpe/WebKitFaviconDatabase.h298 ${WEBKIT 2_DIR}/UIProcess/API/wpe/WebKitFindController.h299 ${WEBKIT 2_DIR}/UIProcess/API/wpe/WebKitFormSubmissionRequest.h300 ${WEBKIT 2_DIR}/UIProcess/API/wpe/WebKitGeolocationPermissionRequest.h301 ${WEBKIT 2_DIR}/UIProcess/API/wpe/WebKitHitTestResult.h302 ${WEBKIT 2_DIR}/UIProcess/API/wpe/WebKitInstallMissingMediaPluginsPermissionRequest.h303 ${WEBKIT 2_DIR}/UIProcess/API/wpe/WebKitJavascriptResult.h304 ${WEBKIT 2_DIR}/UIProcess/API/wpe/WebKitMimeInfo.h305 ${WEBKIT 2_DIR}/UIProcess/API/wpe/WebKitNavigationAction.h306 ${WEBKIT 2_DIR}/UIProcess/API/wpe/WebKitNavigationPolicyDecision.h307 ${WEBKIT 2_DIR}/UIProcess/API/wpe/WebKitNetworkProxySettings.h308 ${WEBKIT 2_DIR}/UIProcess/API/wpe/WebKitNotificationPermissionRequest.h309 ${WEBKIT 2_DIR}/UIProcess/API/wpe/WebKitNotification.h310 ${WEBKIT 2_DIR}/UIProcess/API/wpe/WebKitPermissionRequest.h311 ${WEBKIT 2_DIR}/UIProcess/API/wpe/WebKitPlugin.h312 ${WEBKIT 2_DIR}/UIProcess/API/wpe/WebKitPolicyDecision.h313 ${WEBKIT 2_DIR}/UIProcess/API/wpe/WebKitResponsePolicyDecision.h314 ${WEBKIT 2_DIR}/UIProcess/API/wpe/WebKitSecurityManager.h315 ${WEBKIT 2_DIR}/UIProcess/API/wpe/WebKitSecurityOrigin.h316 ${WEBKIT 2_DIR}/UIProcess/API/wpe/WebKitSettings.h317 ${WEBKIT 2_DIR}/UIProcess/API/wpe/WebKitURIRequest.h318 ${WEBKIT 2_DIR}/UIProcess/API/wpe/WebKitURIResponse.h319 ${WEBKIT 2_DIR}/UIProcess/API/wpe/WebKitURISchemeRequest.h320 ${WEBKIT 2_DIR}/UIProcess/API/wpe/WebKitUserContent.h321 ${WEBKIT 2_DIR}/UIProcess/API/wpe/WebKitUserContentManager.h322 ${WEBKIT 2_DIR}/UIProcess/API/wpe/WebKitUserMediaPermissionRequest.h323 ${WEBKIT 2_DIR}/UIProcess/API/wpe/WebKitWebContext.h324 ${WEBKIT 2_DIR}/UIProcess/API/wpe/WebKitWebResource.h325 ${WEBKIT 2_DIR}/UIProcess/API/wpe/WebKitWebView.h326 ${WEBKIT 2_DIR}/UIProcess/API/wpe/WebKitWebViewSessionState.h327 ${WEBKIT 2_DIR}/UIProcess/API/wpe/WebKitWebsiteData.h328 ${WEBKIT 2_DIR}/UIProcess/API/wpe/WebKitWebsiteDataManager.h329 ${WEBKIT 2_DIR}/UIProcess/API/wpe/WebKitWindowProperties.h330 ${WEBKIT 2_DIR}/UIProcess/API/wpe/webkit.h282 ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitApplicationInfo.h 283 ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitAuthenticationRequest.h 284 ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitAutomationSession.h 285 ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitBackForwardList.h 286 ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitBackForwardListItem.h 287 ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitCredential.h 288 ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitContextMenu.h 289 ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitContextMenuActions.h 290 ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitContextMenuItem.h 291 ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitCookieManager.h 292 ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitDefines.h 293 ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitDownload.h 294 ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitEditingCommands.h 295 ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitEditorState.h 296 ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitError.h 297 ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitFaviconDatabase.h 298 ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitFindController.h 299 ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitFormSubmissionRequest.h 300 ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitGeolocationPermissionRequest.h 301 ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitHitTestResult.h 302 ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitInstallMissingMediaPluginsPermissionRequest.h 303 ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitJavascriptResult.h 304 ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitMimeInfo.h 305 ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitNavigationAction.h 306 ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitNavigationPolicyDecision.h 307 ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitNetworkProxySettings.h 308 ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitNotificationPermissionRequest.h 309 ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitNotification.h 310 ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitPermissionRequest.h 311 ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitPlugin.h 312 ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitPolicyDecision.h 313 ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitResponsePolicyDecision.h 314 ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitSecurityManager.h 315 ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitSecurityOrigin.h 316 ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitSettings.h 317 ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitURIRequest.h 318 ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitURIResponse.h 319 ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitURISchemeRequest.h 320 ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitUserContent.h 321 ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitUserContentManager.h 322 ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitUserMediaPermissionRequest.h 323 ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitWebContext.h 324 ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitWebResource.h 325 ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitWebView.h 326 ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitWebViewSessionState.h 327 ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitWebsiteData.h 328 ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitWebsiteDataManager.h 329 ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitWindowProperties.h 330 ${WEBKIT_DIR}/UIProcess/API/wpe/webkit.h 331 331 ) 332 332 … … 339 339 DEPENDS ${WPE_ENUM_GENERATION_HEADERS} 340 340 341 COMMAND glib-mkenums --template ${WEBKIT 2_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.h342 343 COMMAND glib-mkenums --template ${WEBKIT 2_DIR}/UIProcess/API/wpe/WebKitEnumTypes.cpp.template ${WPE_ENUM_GENERATION_HEADERS} | sed s/web_kit/webkit/ > ${DERIVED_SOURCES_WPE_API_DIR}/WebKitEnumTypes.cpp341 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 342 343 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 344 344 VERBATIM 345 345 ) 346 346 347 set(WebKit 2Resources347 set(WebKitResources 348 348 ) 349 349 350 350 if (ENABLE_WEB_AUDIO) 351 list(APPEND WebKit 2Resources351 list(APPEND WebKitResources 352 352 " <file alias=\"audio/Composite\">Composite.wav</file>\n" 353 353 ) 354 354 endif () 355 355 356 file(WRITE ${DERIVED_SOURCES_WEBKIT 2_DIR}/WebKit2ResourcesGResourceBundle.xml356 file(WRITE ${DERIVED_SOURCES_WEBKIT_DIR}/WebKitResourcesGResourceBundle.xml 357 357 "<?xml version=1.0 encoding=UTF-8?>\n" 358 358 "<gresources>\n" 359 359 " <gresource prefix=\"/org/webkitwpe/resources\">\n" 360 ${WebKit 2Resources}360 ${WebKitResources} 361 361 " </gresource>\n" 362 362 "</gresources>\n" … … 364 364 365 365 add_custom_command( 366 OUTPUT ${DERIVED_SOURCES_WEBKIT 2_DIR}/WebKit2ResourcesGResourceBundle.c367 DEPENDS ${DERIVED_SOURCES_WEBKIT 2_DIR}/WebKit2ResourcesGResourceBundle.xml368 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 2_DIR}/WebKit2ResourcesGResourceBundle.c ${DERIVED_SOURCES_WEBKIT2_DIR}/WebKit2ResourcesGResourceBundle.xml366 OUTPUT ${DERIVED_SOURCES_WEBKIT_DIR}/WebKitResourcesGResourceBundle.c 367 DEPENDS ${DERIVED_SOURCES_WEBKIT_DIR}/WebKitResourcesGResourceBundle.xml 368 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 369 369 VERBATIM 370 370 ) 371 371 372 list(APPEND WebKit 2_INCLUDE_DIRECTORIES372 list(APPEND WebKit_INCLUDE_DIRECTORIES 373 373 "${FORWARDING_HEADERS_DIR}" 374 374 "${FORWARDING_HEADERS_WPE_DIR}" … … 381 381 "${WEBCORE_DIR}/platform/graphics/texmap/coordinated" 382 382 "${WEBCORE_DIR}/platform/network/soup" 383 "${WEBKIT 2_DIR}/NetworkProcess/CustomProtocols/soup"384 "${WEBKIT 2_DIR}/NetworkProcess/Downloads/soup"385 "${WEBKIT 2_DIR}/NetworkProcess/soup"386 "${WEBKIT 2_DIR}/NetworkProcess/unix"387 "${WEBKIT 2_DIR}/Platform/IPC/glib"388 "${WEBKIT 2_DIR}/Platform/IPC/unix"389 "${WEBKIT 2_DIR}/Platform/classifier"390 "${WEBKIT 2_DIR}/Shared/API/c/wpe"391 "${WEBKIT 2_DIR}/Shared/API/glib"392 "${WEBKIT 2_DIR}/Shared/CoordinatedGraphics"393 "${WEBKIT 2_DIR}/Shared/CoordinatedGraphics/threadedcompositor"394 "${WEBKIT 2_DIR}/Shared/glib"395 "${WEBKIT 2_DIR}/Shared/soup"396 "${WEBKIT 2_DIR}/Shared/unix"397 "${WEBKIT 2_DIR}/Shared/wpe"398 "${WEBKIT 2_DIR}/StorageProcess/unix"399 "${WEBKIT 2_DIR}/UIProcess/API/C/cairo"400 "${WEBKIT 2_DIR}/UIProcess/API/C/wpe"401 "${WEBKIT 2_DIR}/UIProcess/API/glib"402 "${WEBKIT 2_DIR}/UIProcess/API/wpe"403 "${WEBKIT 2_DIR}/UIProcess/Network/CustomProtocols/soup"404 "${WEBKIT 2_DIR}/UIProcess/gstreamer"405 "${WEBKIT 2_DIR}/UIProcess/linux"406 "${WEBKIT 2_DIR}/UIProcess/soup"407 "${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/glib"408 "${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/wpe"409 "${WEBKIT 2_DIR}/WebProcess/soup"410 "${WEBKIT 2_DIR}/WebProcess/unix"411 "${WEBKIT 2_DIR}/WebProcess/WebCoreSupport/soup"412 "${WEBKIT 2_DIR}/WebProcess/WebPage/CoordinatedGraphics"413 "${WEBKIT 2_DIR}/WebProcess/WebPage/wpe"383 "${WEBKIT_DIR}/NetworkProcess/CustomProtocols/soup" 384 "${WEBKIT_DIR}/NetworkProcess/Downloads/soup" 385 "${WEBKIT_DIR}/NetworkProcess/soup" 386 "${WEBKIT_DIR}/NetworkProcess/unix" 387 "${WEBKIT_DIR}/Platform/IPC/glib" 388 "${WEBKIT_DIR}/Platform/IPC/unix" 389 "${WEBKIT_DIR}/Platform/classifier" 390 "${WEBKIT_DIR}/Shared/API/c/wpe" 391 "${WEBKIT_DIR}/Shared/API/glib" 392 "${WEBKIT_DIR}/Shared/CoordinatedGraphics" 393 "${WEBKIT_DIR}/Shared/CoordinatedGraphics/threadedcompositor" 394 "${WEBKIT_DIR}/Shared/glib" 395 "${WEBKIT_DIR}/Shared/soup" 396 "${WEBKIT_DIR}/Shared/unix" 397 "${WEBKIT_DIR}/Shared/wpe" 398 "${WEBKIT_DIR}/StorageProcess/unix" 399 "${WEBKIT_DIR}/UIProcess/API/C/cairo" 400 "${WEBKIT_DIR}/UIProcess/API/C/wpe" 401 "${WEBKIT_DIR}/UIProcess/API/glib" 402 "${WEBKIT_DIR}/UIProcess/API/wpe" 403 "${WEBKIT_DIR}/UIProcess/Network/CustomProtocols/soup" 404 "${WEBKIT_DIR}/UIProcess/gstreamer" 405 "${WEBKIT_DIR}/UIProcess/linux" 406 "${WEBKIT_DIR}/UIProcess/soup" 407 "${WEBKIT_DIR}/WebProcess/InjectedBundle/API/glib" 408 "${WEBKIT_DIR}/WebProcess/InjectedBundle/API/wpe" 409 "${WEBKIT_DIR}/WebProcess/soup" 410 "${WEBKIT_DIR}/WebProcess/unix" 411 "${WEBKIT_DIR}/WebProcess/WebCoreSupport/soup" 412 "${WEBKIT_DIR}/WebProcess/WebPage/CoordinatedGraphics" 413 "${WEBKIT_DIR}/WebProcess/WebPage/wpe" 414 414 "${WTF_DIR}/wtf/gtk/" 415 415 "${WTF_DIR}/wtf/gobject" … … 424 424 ) 425 425 426 list(APPEND WebKit 2_LIBRARIES426 list(APPEND WebKit_LIBRARIES 427 427 WebCorePlatformWPE 428 428 ${CAIRO_LIBRARIES} … … 500 500 501 501 add_library(WPEWebInspectorResources SHARED ${WPEWebInspectorResources_DERIVED_SOURCES}) 502 add_dependencies(WPEWebInspectorResources WebKit 2)502 add_dependencies(WPEWebInspectorResources WebKit) 503 503 target_link_libraries(WPEWebInspectorResources ${WPEWebInspectorResources_LIBRARIES}) 504 504 target_include_directories(WPEWebInspectorResources PUBLIC ${WPEWebInspectorResources_INCLUDE_DIRECTORIES}) 505 505 install(TARGETS WPEWebInspectorResources DESTINATION "${LIB_INSTALL_DIR}") 506 506 507 add_library(WPEInjectedBundle MODULE "${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/glib/WebKitInjectedBundleMain.cpp")508 add_webkit2_prefix_header(WPEInjectedBundle)509 target_link_libraries(WPEInjectedBundle WebKit 2)507 add_library(WPEInjectedBundle MODULE "${WEBKIT_DIR}/WebProcess/InjectedBundle/API/glib/WebKitInjectedBundleMain.cpp") 508 ADD_WEBKIT_PREFIX_HEADER(WPEInjectedBundle) 509 target_link_libraries(WPEInjectedBundle WebKit) 510 510 511 511 if (EXPORT_DEPRECATED_WEBKIT2_C_API) 512 512 set(WPE_INSTALLED_WEBKIT_HEADERS 513 ${WEBKIT 2_DIR}/Shared/API/c/WKArray.h514 ${WEBKIT 2_DIR}/Shared/API/c/WKBase.h515 ${WEBKIT 2_DIR}/Shared/API/c/WKData.h516 ${WEBKIT 2_DIR}/Shared/API/c/WKDeclarationSpecifiers.h517 ${WEBKIT 2_DIR}/Shared/API/c/WKDiagnosticLoggingResultType.h518 ${WEBKIT 2_DIR}/Shared/API/c/WKDictionary.h519 ${WEBKIT 2_DIR}/Shared/API/c/WKErrorRef.h520 ${WEBKIT 2_DIR}/Shared/API/c/WKEvent.h521 ${WEBKIT 2_DIR}/Shared/API/c/WKFindOptions.h522 ${WEBKIT 2_DIR}/Shared/API/c/WKGeometry.h523 ${WEBKIT 2_DIR}/Shared/API/c/WKImage.h524 ${WEBKIT 2_DIR}/Shared/API/c/WKMutableArray.h525 ${WEBKIT 2_DIR}/Shared/API/c/WKMutableDictionary.h526 ${WEBKIT 2_DIR}/Shared/API/c/WKNumber.h527 ${WEBKIT 2_DIR}/Shared/API/c/WKPageLoadTypes.h528 ${WEBKIT 2_DIR}/Shared/API/c/WKPageVisibilityTypes.h529 ${WEBKIT 2_DIR}/Shared/API/c/WKSecurityOriginRef.h530 ${WEBKIT 2_DIR}/Shared/API/c/WKSerializedScriptValue.h531 ${WEBKIT 2_DIR}/Shared/API/c/WKString.h532 ${WEBKIT 2_DIR}/Shared/API/c/WKType.h533 ${WEBKIT 2_DIR}/Shared/API/c/WKURL.h534 ${WEBKIT 2_DIR}/Shared/API/c/WKURLRequest.h535 ${WEBKIT 2_DIR}/Shared/API/c/WKURLResponse.h536 ${WEBKIT 2_DIR}/Shared/API/c/WKUserContentInjectedFrames.h537 ${WEBKIT 2_DIR}/Shared/API/c/WKUserContentURLPattern.h538 ${WEBKIT 2_DIR}/Shared/API/c/WKUserScriptInjectionTime.h539 540 ${WEBKIT 2_DIR}/Shared/API/c/wpe/WKBaseWPE.h541 542 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/c/WKBundle.h543 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/c/WKBundleBackForwardList.h544 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/c/WKBundleBackForwardListItem.h545 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/c/WKBundleDOMWindowExtension.h546 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/c/WKBundleFileHandleRef.h547 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/c/WKBundleFrame.h548 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/c/WKBundleHitTestResult.h549 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/c/WKBundleInitialize.h550 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/c/WKBundleInspector.h551 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/c/WKBundleNavigationAction.h552 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/c/WKBundleNodeHandle.h553 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/c/WKBundlePage.h554 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/c/WKBundlePageBanner.h555 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/c/WKBundlePageContextMenuClient.h556 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/c/WKBundlePageEditorClient.h557 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/c/WKBundlePageFormClient.h558 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/c/WKBundlePageFullScreenClient.h559 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/c/WKBundlePageGroup.h560 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/c/WKBundlePageLoaderClient.h561 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/c/WKBundlePageOverlay.h562 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/c/WKBundlePagePolicyClient.h563 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/c/WKBundlePageResourceLoadClient.h564 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/c/WKBundlePageUIClient.h565 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/c/WKBundleRangeHandle.h566 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/c/WKBundleScriptWorld.h567 568 ${WEBKIT 2_DIR}/UIProcess/API/C/WKBackForwardListItemRef.h569 ${WEBKIT 2_DIR}/UIProcess/API/C/WKBackForwardListRef.h570 ${WEBKIT 2_DIR}/UIProcess/API/C/WKContextConfigurationRef.h571 ${WEBKIT 2_DIR}/UIProcess/API/C/WKContextConnectionClient.h572 ${WEBKIT 2_DIR}/UIProcess/API/C/WKContextDownloadClient.h573 ${WEBKIT 2_DIR}/UIProcess/API/C/WKContextHistoryClient.h574 ${WEBKIT 2_DIR}/UIProcess/API/C/WKContextInjectedBundleClient.h575 ${WEBKIT 2_DIR}/UIProcess/API/C/WKContext.h576 ${WEBKIT 2_DIR}/UIProcess/API/C/WKCookieManager.h577 ${WEBKIT 2_DIR}/UIProcess/API/C/WKCredential.h578 ${WEBKIT 2_DIR}/UIProcess/API/C/WKCredentialTypes.h579 ${WEBKIT 2_DIR}/UIProcess/API/C/WKFrame.h580 ${WEBKIT 2_DIR}/UIProcess/API/C/WKFrameInfoRef.h581 ${WEBKIT 2_DIR}/UIProcess/API/C/WKFramePolicyListener.h582 ${WEBKIT 2_DIR}/UIProcess/API/C/WKHitTestResult.h583 ${WEBKIT 2_DIR}/UIProcess/API/C/WKNativeEvent.h584 ${WEBKIT 2_DIR}/UIProcess/API/C/WKNavigationActionRef.h585 ${WEBKIT 2_DIR}/UIProcess/API/C/WKNavigationDataRef.h586 ${WEBKIT 2_DIR}/UIProcess/API/C/WKNavigationRef.h587 ${WEBKIT 2_DIR}/UIProcess/API/C/WKNavigationResponseRef.h588 ${WEBKIT 2_DIR}/UIProcess/API/C/WKPage.h589 ${WEBKIT 2_DIR}/UIProcess/API/C/WKPageConfigurationRef.h590 ${WEBKIT 2_DIR}/UIProcess/API/C/WKPageContextMenuClient.h591 ${WEBKIT 2_DIR}/UIProcess/API/C/WKPageDiagnosticLoggingClient.h592 ${WEBKIT 2_DIR}/UIProcess/API/C/WKPageFindClient.h593 ${WEBKIT 2_DIR}/UIProcess/API/C/WKPageFindMatchesClient.h594 ${WEBKIT 2_DIR}/UIProcess/API/C/WKPageFormClient.h595 ${WEBKIT 2_DIR}/UIProcess/API/C/WKPageGroup.h596 ${WEBKIT 2_DIR}/UIProcess/API/C/WKPageInjectedBundleClient.h597 ${WEBKIT 2_DIR}/UIProcess/API/C/WKPageLoaderClient.h598 ${WEBKIT 2_DIR}/UIProcess/API/C/WKPageNavigationClient.h599 ${WEBKIT 2_DIR}/UIProcess/API/C/WKPagePolicyClient.h600 ${WEBKIT 2_DIR}/UIProcess/API/C/WKPageRenderingProgressEvents.h601 ${WEBKIT 2_DIR}/UIProcess/API/C/WKPageUIClient.h602 ${WEBKIT 2_DIR}/UIProcess/API/C/WKPluginLoadPolicy.h603 ${WEBKIT 2_DIR}/UIProcess/API/C/WKPreferencesRef.h604 ${WEBKIT 2_DIR}/UIProcess/API/C/WKSessionStateRef.h605 ${WEBKIT 2_DIR}/UIProcess/API/C/WKUserContentControllerRef.h606 ${WEBKIT 2_DIR}/UIProcess/API/C/WKUserScriptRef.h607 ${WEBKIT 2_DIR}/UIProcess/API/C/WKViewportAttributes.h608 ${WEBKIT 2_DIR}/UIProcess/API/C/WKWindowFeaturesRef.h609 610 ${WEBKIT 2_DIR}/UIProcess/API/C/wpe/WKView.h513 ${WEBKIT_DIR}/Shared/API/c/WKArray.h 514 ${WEBKIT_DIR}/Shared/API/c/WKBase.h 515 ${WEBKIT_DIR}/Shared/API/c/WKData.h 516 ${WEBKIT_DIR}/Shared/API/c/WKDeclarationSpecifiers.h 517 ${WEBKIT_DIR}/Shared/API/c/WKDiagnosticLoggingResultType.h 518 ${WEBKIT_DIR}/Shared/API/c/WKDictionary.h 519 ${WEBKIT_DIR}/Shared/API/c/WKErrorRef.h 520 ${WEBKIT_DIR}/Shared/API/c/WKEvent.h 521 ${WEBKIT_DIR}/Shared/API/c/WKFindOptions.h 522 ${WEBKIT_DIR}/Shared/API/c/WKGeometry.h 523 ${WEBKIT_DIR}/Shared/API/c/WKImage.h 524 ${WEBKIT_DIR}/Shared/API/c/WKMutableArray.h 525 ${WEBKIT_DIR}/Shared/API/c/WKMutableDictionary.h 526 ${WEBKIT_DIR}/Shared/API/c/WKNumber.h 527 ${WEBKIT_DIR}/Shared/API/c/WKPageLoadTypes.h 528 ${WEBKIT_DIR}/Shared/API/c/WKPageVisibilityTypes.h 529 ${WEBKIT_DIR}/Shared/API/c/WKSecurityOriginRef.h 530 ${WEBKIT_DIR}/Shared/API/c/WKSerializedScriptValue.h 531 ${WEBKIT_DIR}/Shared/API/c/WKString.h 532 ${WEBKIT_DIR}/Shared/API/c/WKType.h 533 ${WEBKIT_DIR}/Shared/API/c/WKURL.h 534 ${WEBKIT_DIR}/Shared/API/c/WKURLRequest.h 535 ${WEBKIT_DIR}/Shared/API/c/WKURLResponse.h 536 ${WEBKIT_DIR}/Shared/API/c/WKUserContentInjectedFrames.h 537 ${WEBKIT_DIR}/Shared/API/c/WKUserContentURLPattern.h 538 ${WEBKIT_DIR}/Shared/API/c/WKUserScriptInjectionTime.h 539 540 ${WEBKIT_DIR}/Shared/API/c/wpe/WKBaseWPE.h 541 542 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/c/WKBundle.h 543 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/c/WKBundleBackForwardList.h 544 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/c/WKBundleBackForwardListItem.h 545 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/c/WKBundleDOMWindowExtension.h 546 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/c/WKBundleFileHandleRef.h 547 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/c/WKBundleFrame.h 548 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/c/WKBundleHitTestResult.h 549 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/c/WKBundleInitialize.h 550 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/c/WKBundleInspector.h 551 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/c/WKBundleNavigationAction.h 552 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/c/WKBundleNodeHandle.h 553 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/c/WKBundlePage.h 554 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/c/WKBundlePageBanner.h 555 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/c/WKBundlePageContextMenuClient.h 556 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/c/WKBundlePageEditorClient.h 557 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/c/WKBundlePageFormClient.h 558 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/c/WKBundlePageFullScreenClient.h 559 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/c/WKBundlePageGroup.h 560 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/c/WKBundlePageLoaderClient.h 561 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/c/WKBundlePageOverlay.h 562 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/c/WKBundlePagePolicyClient.h 563 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/c/WKBundlePageResourceLoadClient.h 564 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/c/WKBundlePageUIClient.h 565 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/c/WKBundleRangeHandle.h 566 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/c/WKBundleScriptWorld.h 567 568 ${WEBKIT_DIR}/UIProcess/API/C/WKBackForwardListItemRef.h 569 ${WEBKIT_DIR}/UIProcess/API/C/WKBackForwardListRef.h 570 ${WEBKIT_DIR}/UIProcess/API/C/WKContextConfigurationRef.h 571 ${WEBKIT_DIR}/UIProcess/API/C/WKContextConnectionClient.h 572 ${WEBKIT_DIR}/UIProcess/API/C/WKContextDownloadClient.h 573 ${WEBKIT_DIR}/UIProcess/API/C/WKContextHistoryClient.h 574 ${WEBKIT_DIR}/UIProcess/API/C/WKContextInjectedBundleClient.h 575 ${WEBKIT_DIR}/UIProcess/API/C/WKContext.h 576 ${WEBKIT_DIR}/UIProcess/API/C/WKCookieManager.h 577 ${WEBKIT_DIR}/UIProcess/API/C/WKCredential.h 578 ${WEBKIT_DIR}/UIProcess/API/C/WKCredentialTypes.h 579 ${WEBKIT_DIR}/UIProcess/API/C/WKFrame.h 580 ${WEBKIT_DIR}/UIProcess/API/C/WKFrameInfoRef.h 581 ${WEBKIT_DIR}/UIProcess/API/C/WKFramePolicyListener.h 582 ${WEBKIT_DIR}/UIProcess/API/C/WKHitTestResult.h 583 ${WEBKIT_DIR}/UIProcess/API/C/WKNativeEvent.h 584 ${WEBKIT_DIR}/UIProcess/API/C/WKNavigationActionRef.h 585 ${WEBKIT_DIR}/UIProcess/API/C/WKNavigationDataRef.h 586 ${WEBKIT_DIR}/UIProcess/API/C/WKNavigationRef.h 587 ${WEBKIT_DIR}/UIProcess/API/C/WKNavigationResponseRef.h 588 ${WEBKIT_DIR}/UIProcess/API/C/WKPage.h 589 ${WEBKIT_DIR}/UIProcess/API/C/WKPageConfigurationRef.h 590 ${WEBKIT_DIR}/UIProcess/API/C/WKPageContextMenuClient.h 591 ${WEBKIT_DIR}/UIProcess/API/C/WKPageDiagnosticLoggingClient.h 592 ${WEBKIT_DIR}/UIProcess/API/C/WKPageFindClient.h 593 ${WEBKIT_DIR}/UIProcess/API/C/WKPageFindMatchesClient.h 594 ${WEBKIT_DIR}/UIProcess/API/C/WKPageFormClient.h 595 ${WEBKIT_DIR}/UIProcess/API/C/WKPageGroup.h 596 ${WEBKIT_DIR}/UIProcess/API/C/WKPageInjectedBundleClient.h 597 ${WEBKIT_DIR}/UIProcess/API/C/WKPageLoaderClient.h 598 ${WEBKIT_DIR}/UIProcess/API/C/WKPageNavigationClient.h 599 ${WEBKIT_DIR}/UIProcess/API/C/WKPagePolicyClient.h 600 ${WEBKIT_DIR}/UIProcess/API/C/WKPageRenderingProgressEvents.h 601 ${WEBKIT_DIR}/UIProcess/API/C/WKPageUIClient.h 602 ${WEBKIT_DIR}/UIProcess/API/C/WKPluginLoadPolicy.h 603 ${WEBKIT_DIR}/UIProcess/API/C/WKPreferencesRef.h 604 ${WEBKIT_DIR}/UIProcess/API/C/WKSessionStateRef.h 605 ${WEBKIT_DIR}/UIProcess/API/C/WKUserContentControllerRef.h 606 ${WEBKIT_DIR}/UIProcess/API/C/WKUserScriptRef.h 607 ${WEBKIT_DIR}/UIProcess/API/C/WKViewportAttributes.h 608 ${WEBKIT_DIR}/UIProcess/API/C/WKWindowFeaturesRef.h 609 610 ${WEBKIT_DIR}/UIProcess/API/C/wpe/WKView.h 611 611 ) 612 612 … … 617 617 618 618 set(WPE_INSTALLED_HEADERS 619 ${WEBKIT 2_DIR}/Shared/API/c/wpe/WebKit.h619 ${WEBKIT_DIR}/Shared/API/c/wpe/WebKit.h 620 620 ) 621 621 -
trunk/Source/WebKit/PlatformWin.cmake
r221874 r222194 1 set(WebKit 2_OUTPUT_NAME WebKit2)2 set(WebKit 2_WebProcess_OUTPUT_NAME WebKitWebProcess)3 set(WebKit 2_NetworkProcess_OUTPUT_NAME WebKitNetworkProcess)4 set(WebKit 2_PluginProcess_OUTPUT_NAME WebKitPluginProcess)5 set(WebKit 2_StorageProcess_OUTPUT_NAME WebKitStorageProcess)1 set(WebKit_OUTPUT_NAME WebKit) 2 set(WebKit_WebProcess_OUTPUT_NAME WebKitWebProcess) 3 set(WebKit_NetworkProcess_OUTPUT_NAME WebKitNetworkProcess) 4 set(WebKit_PluginProcess_OUTPUT_NAME WebKitPluginProcess) 5 set(WebKit_StorageProcess_OUTPUT_NAME WebKitStorageProcess) 6 6 7 file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKIT 2_DIR})7 file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKIT_DIR}) 8 8 9 9 add_definitions(-DBUILDING_WEBKIT) 10 10 11 list(APPEND WebKit 2_SOURCES11 list(APPEND WebKit_SOURCES 12 12 NetworkProcess/Downloads/curl/DownloadCurl.cpp 13 13 … … 31 31 ) 32 32 33 list(APPEND WebKit 2_INCLUDE_DIRECTORIES34 "${WEBKIT 2_DIR}/NetworkProcess/win"35 "${WEBKIT 2_DIR}/Platform/classifier"36 "${WEBKIT 2_DIR}/PluginProcess/win"37 "${WEBKIT 2_DIR}/Shared/API/c/win"38 "${WEBKIT 2_DIR}/Shared/CoordinatedGraphics"39 "${WEBKIT 2_DIR}/Shared/CoordinatedGraphics/threadedcompositor"40 "${WEBKIT 2_DIR}/Shared/Plugins/win"41 "${WEBKIT 2_DIR}/Shared/unix"42 "${WEBKIT 2_DIR}/Shared/win"43 "${WEBKIT 2_DIR}/StorageProcess/win"44 "${WEBKIT 2_DIR}/UIProcess/API/C/cairo"45 "${WEBKIT 2_DIR}/UIProcess/API/C/win"46 "${WEBKIT 2_DIR}/UIProcess/API/cpp/win"47 "${WEBKIT 2_DIR}/UIProcess/API/win"48 "${WEBKIT 2_DIR}/UIProcess/Plugins/win"49 "${WEBKIT 2_DIR}/UIProcess/win"50 "${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/win"51 "${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/win/DOM"52 "${WEBKIT 2_DIR}/WebProcess/win"53 "${WEBKIT 2_DIR}/WebProcess/WebCoreSupport/win"54 "${WEBKIT 2_DIR}/WebProcess/WebPage/CoordinatedGraphics"55 "${WEBKIT 2_DIR}/WebProcess/WebPage/win"56 "${WEBKIT 2_DIR}/win"33 list(APPEND WebKit_INCLUDE_DIRECTORIES 34 "${WEBKIT_DIR}/NetworkProcess/win" 35 "${WEBKIT_DIR}/Platform/classifier" 36 "${WEBKIT_DIR}/PluginProcess/win" 37 "${WEBKIT_DIR}/Shared/API/c/win" 38 "${WEBKIT_DIR}/Shared/CoordinatedGraphics" 39 "${WEBKIT_DIR}/Shared/CoordinatedGraphics/threadedcompositor" 40 "${WEBKIT_DIR}/Shared/Plugins/win" 41 "${WEBKIT_DIR}/Shared/unix" 42 "${WEBKIT_DIR}/Shared/win" 43 "${WEBKIT_DIR}/StorageProcess/win" 44 "${WEBKIT_DIR}/UIProcess/API/C/cairo" 45 "${WEBKIT_DIR}/UIProcess/API/C/win" 46 "${WEBKIT_DIR}/UIProcess/API/cpp/win" 47 "${WEBKIT_DIR}/UIProcess/API/win" 48 "${WEBKIT_DIR}/UIProcess/Plugins/win" 49 "${WEBKIT_DIR}/UIProcess/win" 50 "${WEBKIT_DIR}/WebProcess/InjectedBundle/API/win" 51 "${WEBKIT_DIR}/WebProcess/InjectedBundle/API/win/DOM" 52 "${WEBKIT_DIR}/WebProcess/win" 53 "${WEBKIT_DIR}/WebProcess/WebCoreSupport/win" 54 "${WEBKIT_DIR}/WebProcess/WebPage/CoordinatedGraphics" 55 "${WEBKIT_DIR}/WebProcess/WebPage/win" 56 "${WEBKIT_DIR}/win" 57 57 ) 58 58 59 list(APPEND WebKit 2_SYSTEM_INCLUDE_DIRECTORIES59 list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES 60 60 ${CAIRO_INCLUDE_DIRS} 61 61 ) 62 62 63 set(WebKit 2CommonIncludeDirectories ${WebKit2_INCLUDE_DIRECTORIES})64 set(WebKit 2CommonSystemIncludeDirectories ${WebKit2_SYSTEM_INCLUDE_DIRECTORIES})63 set(WebKitCommonIncludeDirectories ${WebKit_INCLUDE_DIRECTORIES}) 64 set(WebKitCommonSystemIncludeDirectories ${WebKit_SYSTEM_INCLUDE_DIRECTORIES}) 65 65 66 66 list(APPEND WebProcess_SOURCES … … 84 84 add_definitions(-DUSE_CAIRO=1 -DUSE_CURL=1) 85 85 86 list(APPEND WebKit 2_LIBRARIES86 list(APPEND WebKit_LIBRARIES 87 87 libeay32.lib 88 88 mfuuid.lib … … 92 92 endif () 93 93 94 list(APPEND WebKit 2_LIBRARIES94 list(APPEND WebKit_LIBRARIES 95 95 WebCoreDerivedSources${DEBUG_SUFFIX} 96 96 ) 97 97 98 set(SharedWebKit 2Libraries99 ${WebKit 2_LIBRARIES}98 set(SharedWebKitLibraries 99 ${WebKit_LIBRARIES} 100 100 ) 101 101 102 add_custom_target(WebKit 2-forwarding-headers102 add_custom_target(WebKit-forwarding-headers 103 103 COMMAND ${PERL_EXECUTABLE} 104 ${WEBKIT 2_DIR}/Scripts/generate-forwarding-headers.pl105 --include-path ${WEBKIT 2_DIR}104 ${WEBKIT_DIR}/Scripts/generate-forwarding-headers.pl 105 --include-path ${WEBKIT_DIR} 106 106 --output ${FORWARDING_HEADERS_DIR} 107 107 --platform win … … 109 109 ) 110 110 111 set(WEBKIT 2_EXTRA_DEPENDENCIES112 WebKit 2-forwarding-headers111 set(WEBKIT_EXTRA_DEPENDENCIES 112 WebKit-forwarding-headers 113 113 ) 114 114 115 WEBKIT_WRAP_SOURCELIST(${WebKit 2_SOURCES})115 WEBKIT_WRAP_SOURCELIST(${WebKit_SOURCES}) -
trunk/Source/WebKit/UIProcess/gtk/WaylandCompositor.cpp
r221514 r222194 29 29 #if PLATFORM(WAYLAND) && USE(EGL) 30 30 31 #include "WebKit 2WaylandServerProtocol.h"31 #include "WebKitWaylandServerProtocol.h" 32 32 #include <EGL/egl.h> 33 33 #include <EGL/eglext.h> -
trunk/Source/WebKit/WebProcess/gtk/WaylandCompositorDisplay.cpp
r219866 r222194 29 29 #if PLATFORM(WAYLAND) 30 30 31 #include "WebKit 2WaylandClientProtocol.h"31 #include "WebKitWaylandClientProtocol.h" 32 32 #include "WebPage.h" 33 33 -
trunk/Source/WebKitLegacy/CMakeLists.txt
r219578 r222194 1 1 cmake_minimum_required(VERSION 2.8.12) 2 2 include(WebKitCommon) 3 set_property(DIRECTORY . PROPERTY FOLDER "WebKit ")3 set_property(DIRECTORY . PROPERTY FOLDER "WebKitLegacy") 4 4 5 set(WebKit _SOURCES5 set(WebKitLegacy_SOURCES 6 6 Storage/StorageAreaImpl.cpp 7 7 Storage/StorageAreaSync.cpp … … 17 17 ) 18 18 19 set(WebKit _INCLUDE_DIRECTORIES19 set(WebKitLegacy_INCLUDE_DIRECTORIES 20 20 "${CMAKE_BINARY_DIR}" 21 "${WEBKIT _DIR}/Storage"22 "${WEBKIT _DIR}/WebCoreSupport"21 "${WEBKITLEGACY_DIR}/Storage" 22 "${WEBKITLEGACY_DIR}/WebCoreSupport" 23 23 "${FORWARDING_HEADERS_DIR}/JavaScriptCore" 24 24 "${FORWARDING_HEADERS_DIR}/WebCore" … … 26 26 ) 27 27 28 set(WebKit _SYSTEM_INCLUDE_DIRECTORIES28 set(WebKitLegacy_SYSTEM_INCLUDE_DIRECTORIES 29 29 "${ICU_INCLUDE_DIRS}" 30 30 ) 31 31 32 set(WebKit _LIBRARIES32 set(WebKitLegacy_LIBRARIES 33 33 PRIVATE JavaScriptCore${DEBUG_SUFFIX} 34 34 PRIVATE WebCore${DEBUG_SUFFIX} … … 36 36 ) 37 37 38 WEBKIT_FRAMEWORK_DECLARE(WebKit )38 WEBKIT_FRAMEWORK_DECLARE(WebKitLegacy) 39 39 WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS() 40 40 41 41 if (MSVC) 42 WEBKIT_ADD_PRECOMPILED_HEADER("WebKitPrefix.h" "win/WebKitPrefix.cpp" WebKit _SOURCES)43 list(APPEND WebKit _SOURCES win/WebKit.resources/WebKit.rc)44 add_definitions(/DWEBKIT_EXPORTS /DFRAMEWORK_NAME=WebKit )42 WEBKIT_ADD_PRECOMPILED_HEADER("WebKitPrefix.h" "win/WebKitPrefix.cpp" WebKitLegacy_SOURCES) 43 list(APPEND WebKitLegacy_SOURCES win/WebKit.resources/WebKit.rc) 44 add_definitions(/DWEBKIT_EXPORTS /DFRAMEWORK_NAME=WebKitLegacy) 45 45 endif () 46 46 47 WEBKIT_FRAMEWORK(WebKit )47 WEBKIT_FRAMEWORK(WebKitLegacy) 48 48 49 add_dependencies(WebKit WebCore)50 if (TARGET WebKit GUID)51 add_dependencies(WebKit WebKitGUID)49 add_dependencies(WebKitLegacy WebCore) 50 if (TARGET WebKitLegacyGUID) 51 add_dependencies(WebKitLegacy WebKitLegacyGUID) 52 52 endif () 53 53 54 54 if (APPLE) 55 set_target_properties(WebKit PROPERTIES LINK_FLAGS "-umbrella WebKit")55 set_target_properties(WebKitLegacy PROPERTIES LINK_FLAGS "-umbrella WebKitLegacy") 56 56 endif () 57 57 58 58 if (MSVC) 59 59 add_custom_command( 60 TARGET WebKit 60 TARGET WebKitLegacy 61 61 POST_BUILD 62 COMMAND ${PERL_EXECUTABLE} ${WEBKIT_LIBRARIES_DIR}/tools/scripts/version-stamp.pl ${DERIVED_SOURCES_WEBKIT _DIR} $<TARGET_FILE:WebKit>62 COMMAND ${PERL_EXECUTABLE} ${WEBKIT_LIBRARIES_DIR}/tools/scripts/version-stamp.pl ${DERIVED_SOURCES_WEBKITLEGACY_DIR} $<TARGET_FILE:WebKitLegacy> 63 63 VERBATIM) 64 64 endif () -
trunk/Source/WebKitLegacy/ChangeLog
r222131 r222194 1 2017-09-18 Michael Catanzaro <mcatanzaro@igalia.com> 2 3 [CMake] Rename WebKit target to WebKitLegacy and rename WebKit2 target to WebKit 4 https://bugs.webkit.org/show_bug.cgi?id=174558 5 6 Reviewed by Alex Christensen. 7 8 With help from Stephan Szabo, thanks! 9 10 * CMakeLists.txt: 11 * PlatformMac.cmake: 12 * PlatformWin.cmake: 13 1 14 2017-09-16 Tim Horton <timothy_horton@apple.com> 2 15 -
trunk/Source/WebKitLegacy/PlatformMac.cmake
r222131 r222194 4 4 add_definitions(-iframework ${APPLICATIONSERVICES_LIBRARY}/Versions/Current/Frameworks) 5 5 6 list(APPEND WebKit _INCLUDE_DIRECTORIES6 list(APPEND WebKitLegacy_INCLUDE_DIRECTORIES 7 7 "${DERIVED_SOURCES_WEBKITLEGACY_DIR}" 8 8 "${CMAKE_SOURCE_DIR}/WebKitLibraries" 9 9 ) 10 10 11 list(APPEND WebKit _SYSTEM_INCLUDE_DIRECTORIES11 list(APPEND WebKitLegacy_SYSTEM_INCLUDE_DIRECTORIES 12 12 mac 13 13 mac/Carbon … … 26 26 ) 27 27 28 list(APPEND WebKit _SOURCES28 list(APPEND WebKitLegacy_SOURCES 29 29 cf/WebCoreSupport/WebInspectorClientCF.cpp 30 30 … … 359 359 360 360 set(C99_FILES 361 ${WEBKIT _DIR}/mac/Carbon/CarbonUtils.m362 ${WEBKIT _DIR}/mac/Carbon/CarbonWindowContentView.m363 ${WEBKIT _DIR}/mac/Carbon/CarbonWindowFrame.m364 ${WEBKIT _DIR}/mac/Carbon/HIViewAdapter.m361 ${WEBKITLEGACY_DIR}/mac/Carbon/CarbonUtils.m 362 ${WEBKITLEGACY_DIR}/mac/Carbon/CarbonWindowContentView.m 363 ${WEBKITLEGACY_DIR}/mac/Carbon/CarbonWindowFrame.m 364 ${WEBKITLEGACY_DIR}/mac/Carbon/HIViewAdapter.m 365 365 366 366 mac/DefaultDelegates/WebDefaultEditingDelegate.m … … 396 396 ) 397 397 398 foreach (_file ${WebKit _SOURCES})398 foreach (_file ${WebKitLegacy_SOURCES}) 399 399 list(FIND C99_FILES ${_file} _c99_index) 400 400 if (${_c99_index} EQUAL -1) … … 441 441 442 442 WEBKIT_CREATE_FORWARDING_HEADERS(WebKitLegacy DIRECTORIES ${WebKitLegacy_FORWARDING_HEADERS_DIRECTORIES} FILES ${WebKitLegacy_FORWARDING_HEADERS_FILES}) 443 WEBKIT_CREATE_FORWARDING_HEADERS(WebKit DIRECTORIES ${FORWARDING_HEADERS_DIR}/WebKitLegacy)444 443 445 444 # FIXME: Forwarding headers should be copies of actual headers. … … 456 455 endforeach () 457 456 458 set(WebKit _OUTPUT_NAME WebKitLegacy)457 set(WebKitLegacy_OUTPUT_NAME WebKitLegacy) 459 458 460 459 set(CMAKE_SHARED_LINKER_FLAGS ${CMAKE_SHARED_LINKER_FLAGS} "-compatibility_version 1 -current_version ${WEBKIT_MAC_VERSION}") -
trunk/Source/WebKitLegacy/PlatformWin.cmake
r221956 r222194 1 1 if (${WTF_PLATFORM_WIN_CAIRO}) 2 2 add_definitions(-DUSE_CAIRO=1 -DUSE_CURL=1 -DWEBKIT_EXPORTS=1) 3 list(APPEND WebKit _INCLUDE_DIRECTORIES3 list(APPEND WebKitLegacy_INCLUDE_DIRECTORIES 4 4 ${CAIRO_INCLUDE_DIRS} 5 5 "${WEBKIT_LIBRARIES_DIR}/include" 6 6 "${WEBCORE_DIR}/platform/graphics/cairo" 7 7 ) 8 list(APPEND WebKit _SOURCES_Classes8 list(APPEND WebKitLegacy_SOURCES_Classes 9 9 win/WebDownloadCURL.cpp 10 10 win/WebURLAuthenticationChallengeSenderCURL.cpp 11 11 ) 12 list(APPEND WebKit _LIBRARIES12 list(APPEND WebKitLegacy_LIBRARIES 13 13 ${OPENSSL_LIBRARIES} 14 14 PRIVATE mfuuid.lib … … 16 16 ) 17 17 else () 18 list(APPEND WebKit _SOURCES_Classes18 list(APPEND WebKitLegacy_SOURCES_Classes 19 19 win/WebDownloadCFNet.cpp 20 20 win/WebURLAuthenticationChallengeSenderCFNet.cpp 21 21 ) 22 list(APPEND WebKit _LIBRARIES22 list(APPEND WebKitLegacy_LIBRARIES 23 23 PRIVATE CFNetwork${DEBUG_SUFFIX} 24 24 PRIVATE CoreGraphics${DEBUG_SUFFIX} … … 36 36 endif () 37 37 38 list(APPEND WebKit _LIBRARIES PRIVATE WTF${DEBUG_SUFFIX})38 list(APPEND WebKitLegacy_LIBRARIES PRIVATE WTF${DEBUG_SUFFIX}) 39 39 40 40 add_custom_command( 41 OUTPUT ${DERIVED_SOURCES_WEBKIT _DIR}/WebKitVersion.h42 MAIN_DEPENDENCY ${WEBKIT _DIR}/scripts/generate-webkitversion.pl43 DEPENDS ${WEBKIT _DIR}/mac/Configurations/Version.xcconfig44 COMMAND ${PERL_EXECUTABLE} ${WEBKIT _DIR}/scripts/generate-webkitversion.pl --config ${WEBKIT_DIR}/mac/Configurations/Version.xcconfig --outputDir ${DERIVED_SOURCES_WEBKIT_DIR}41 OUTPUT ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/WebKitVersion.h 42 MAIN_DEPENDENCY ${WEBKITLEGACY_DIR}/scripts/generate-webkitversion.pl 43 DEPENDS ${WEBKITLEGACY_DIR}/mac/Configurations/Version.xcconfig 44 COMMAND ${PERL_EXECUTABLE} ${WEBKITLEGACY_DIR}/scripts/generate-webkitversion.pl --config ${WEBKITLEGACY_DIR}/mac/Configurations/Version.xcconfig --outputDir ${DERIVED_SOURCES_WEBKITLEGACY_DIR} 45 45 VERBATIM) 46 list(APPEND WebKit _SOURCES ${DERIVED_SOURCES_WEBKIT_DIR}/WebKitVersion.h)47 48 list(APPEND WebKit _INCLUDE_DIRECTORIES46 list(APPEND WebKitLegacy_SOURCES ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/WebKitVersion.h) 47 48 list(APPEND WebKitLegacy_INCLUDE_DIRECTORIES 49 49 "${CMAKE_BINARY_DIR}/../include/private" 50 50 "${CMAKE_BINARY_DIR}/../include/private/JavaScriptCore" 51 51 "${CMAKE_BINARY_DIR}/../include/private/WebCore" 52 "${WEBKIT _DIR}/win"53 "${WEBKIT _DIR}/win/plugins"54 "${WEBKIT _DIR}/win/WebCoreSupport"55 "${DERIVED_SOURCES_WEBKIT _DIR}/include"56 "${DERIVED_SOURCES_WEBKIT _DIR}/Interfaces"52 "${WEBKITLEGACY_DIR}/win" 53 "${WEBKITLEGACY_DIR}/win/plugins" 54 "${WEBKITLEGACY_DIR}/win/WebCoreSupport" 55 "${DERIVED_SOURCES_WEBKITLEGACY_DIR}/include" 56 "${DERIVED_SOURCES_WEBKITLEGACY_DIR}/Interfaces" 57 57 "${FORWARDING_HEADERS_DIR}/ANGLE" 58 58 "${FORWARDING_HEADERS_DIR}/ANGLE/include" 59 59 "${FORWARDING_HEADERS_DIR}/ANGLE/include/egl" 60 60 "${FORWARDING_HEADERS_DIR}/ANGLE/include/khr" 61 "${DERIVED_SOURCES_DIR}/WebKit "62 ) 63 64 list(APPEND WebKit _INCLUDES61 "${DERIVED_SOURCES_DIR}/WebKitLegacy" 62 ) 63 64 list(APPEND WebKitLegacy_INCLUDES 65 65 win/CFDictionaryPropertyBag.h 66 66 win/COMEnumVariant.h … … 132 132 ) 133 133 134 list(APPEND WebKit _SOURCES_Classes134 list(APPEND WebKitLegacy_SOURCES_Classes 135 135 win/AccessibleBase.cpp 136 136 win/AccessibleDocument.cpp … … 215 215 ) 216 216 217 list(APPEND WebKit _SOURCES_WebCoreSupport217 list(APPEND WebKitLegacy_SOURCES_WebCoreSupport 218 218 win/WebCoreSupport/AcceleratedCompositingContext.cpp 219 219 win/WebCoreSupport/EmbeddedWidget.cpp … … 248 248 249 249 if (USE_CF) 250 list(APPEND WebKit _SOURCES_Classes250 list(APPEND WebKitLegacy_SOURCES_Classes 251 251 cf/WebCoreSupport/WebInspectorClientCF.cpp 252 252 ) 253 253 254 list(APPEND WebKit _LIBRARIES254 list(APPEND WebKitLegacy_LIBRARIES 255 255 ${COREFOUNDATION_LIBRARY} 256 256 ) … … 263 263 set(MASM_FLAGS /c /Fo) 264 264 add_custom_command( 265 OUTPUT ${DERIVED_SOURCES_WEBKIT _DIR}/PaintHooks.obj265 OUTPUT ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/PaintHooks.obj 266 266 MAIN_DEPENDENCY win/plugins/PaintHooks.asm 267 267 COMMAND ${MASM_EXECUTABLE} ${MASM_FLAGS} 268 ${DERIVED_SOURCES_WEBKIT _DIR}/PaintHooks.obj268 ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/PaintHooks.obj 269 269 ${CMAKE_CURRENT_SOURCE_DIR}/win/plugins/PaintHooks.asm 270 270 VERBATIM) 271 list(APPEND WebKit _SOURCES272 ${DERIVED_SOURCES_WEBKIT _DIR}/PaintHooks.obj271 list(APPEND WebKitLegacy_SOURCES 272 ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/PaintHooks.obj 273 273 ) 274 274 else () 275 list(APPEND WebKit _SOURCES275 list(APPEND WebKitLegacy_SOURCES 276 276 win/plugins/PaintHooks.asm 277 277 ) … … 279 279 endif () 280 280 281 list(APPEND WebKit _SOURCES ${WebKit_INCLUDES} ${WebKit_SOURCES_Classes} ${WebKit_SOURCES_WebCoreSupport})282 283 source_group(Includes FILES ${WebKit _INCLUDES})284 source_group(Classes FILES ${WebKit _SOURCES_Classes})285 source_group(WebCoreSupport FILES ${WebKit _SOURCES_WebCoreSupport})281 list(APPEND WebKitLegacy_SOURCES ${WebKitLegacy_INCLUDES} ${WebKitLegacy_SOURCES_Classes} ${WebKitLegacy_SOURCES_WebCoreSupport}) 282 283 source_group(Includes FILES ${WebKitLegacy_INCLUDES}) 284 source_group(Classes FILES ${WebKitLegacy_SOURCES_Classes}) 285 source_group(WebCoreSupport FILES ${WebKitLegacy_SOURCES_WebCoreSupport}) 286 286 287 287 # Build the COM interface: … … 289 289 get_filename_component(_filewe ${_infile} NAME_WE) 290 290 add_custom_command( 291 OUTPUT ${DERIVED_SOURCES_WEBKIT _DIR}/Interfaces/${_filewe}.h291 OUTPUT ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/Interfaces/${_filewe}.h 292 292 MAIN_DEPENDENCY ${_infile} 293 293 DEPENDS ${_depends} 294 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}"294 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}" 295 295 VERBATIM) 296 set_source_files_properties(${DERIVED_SOURCES_WEBKIT _DIR}/Interfaces/${_filewe}.h PROPERTIES GENERATED TRUE)297 set_source_files_properties(${DERIVED_SOURCES_WEBKIT _DIR}/Interfaces/${_filewe}_i.c PROPERTIES GENERATED TRUE)296 set_source_files_properties(${DERIVED_SOURCES_WEBKITLEGACY_DIR}/Interfaces/${_filewe}.h PROPERTIES GENERATED TRUE) 297 set_source_files_properties(${DERIVED_SOURCES_WEBKITLEGACY_DIR}/Interfaces/${_filewe}_i.c PROPERTIES GENERATED TRUE) 298 298 endmacro() 299 299 300 300 set(MIDL_DEFINES /D\ \"__PRODUCTION__=01\") 301 301 302 set(WEBKIT _IDL_DEPENDENCIES302 set(WEBKITLEGACY_IDL_DEPENDENCIES 303 303 win/Interfaces/AccessibleComparable.idl 304 304 win/Interfaces/DOMCSS.idl … … 392 392 win/Interfaces/Accessible2/AccessibleText2.idl 393 393 win/Interfaces/Accessible2/IA2CommonTypes.idl 394 "${DERIVED_SOURCES_WEBKIT _DIR}/include/autoversion.h"394 "${DERIVED_SOURCES_WEBKITLEGACY_DIR}/include/autoversion.h" 395 395 ) 396 396 397 397 add_custom_command( 398 OUTPUT ${DERIVED_SOURCES_WEBKIT _DIR}/include/autoversion.h398 OUTPUT ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/include/autoversion.h 399 399 WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} 400 COMMAND ${PERL_EXECUTABLE} ${WEBKIT_LIBRARIES_DIR}/tools/scripts/auto-version.pl ${DERIVED_SOURCES_WEBKIT _DIR}400 COMMAND ${PERL_EXECUTABLE} ${WEBKIT_LIBRARIES_DIR}/tools/scripts/auto-version.pl ${DERIVED_SOURCES_WEBKITLEGACY_DIR} 401 401 VERBATIM) 402 402 403 GENERATE_INTERFACE(win/Interfaces/WebKit.idl ${MIDL_DEFINES} "${WEBKIT _IDL_DEPENDENCIES}")404 GENERATE_INTERFACE(win/Interfaces/Accessible2/AccessibleApplication.idl ${MIDL_DEFINES} "${WEBKIT _IDL_DEPENDENCIES}")405 GENERATE_INTERFACE(win/Interfaces/Accessible2/Accessible2.idl ${MIDL_DEFINES} "${WEBKIT _IDL_DEPENDENCIES}")406 GENERATE_INTERFACE(win/Interfaces/Accessible2/Accessible2_2.idl ${MIDL_DEFINES} "${WEBKIT _IDL_DEPENDENCIES}")407 GENERATE_INTERFACE(win/Interfaces/Accessible2/AccessibleRelation.idl ${MIDL_DEFINES} "${WEBKIT _IDL_DEPENDENCIES}")408 GENERATE_INTERFACE(win/Interfaces/Accessible2/AccessibleStates.idl ${MIDL_DEFINES} "${WEBKIT _IDL_DEPENDENCIES}")409 GENERATE_INTERFACE(win/Interfaces/Accessible2/IA2CommonTypes.idl ${MIDL_DEFINES} "${WEBKIT _IDL_DEPENDENCIES}")410 GENERATE_INTERFACE(win/Interfaces/Accessible2/AccessibleEditableText.idl ${MIDL_DEFINES} "${WEBKIT _IDL_DEPENDENCIES}")411 GENERATE_INTERFACE(win/Interfaces/Accessible2/AccessibleText.idl ${MIDL_DEFINES} "${WEBKIT _IDL_DEPENDENCIES}")412 GENERATE_INTERFACE(win/Interfaces/Accessible2/AccessibleText2.idl ${MIDL_DEFINES} "${WEBKIT _IDL_DEPENDENCIES}")413 414 add_library(WebKit GUID STATIC415 "${DERIVED_SOURCES_WEBKIT _DIR}/Interfaces/WebKit.h"416 "${DERIVED_SOURCES_WEBKIT _DIR}/Interfaces/AccessibleApplication.h"417 "${DERIVED_SOURCES_WEBKIT _DIR}/Interfaces/Accessible2.h"418 "${DERIVED_SOURCES_WEBKIT _DIR}/Interfaces/Accessible2_2.h"419 "${DERIVED_SOURCES_WEBKIT _DIR}/Interfaces/AccessibleRelation.h"420 "${DERIVED_SOURCES_WEBKIT _DIR}/Interfaces/AccessibleStates.h"421 "${DERIVED_SOURCES_WEBKIT _DIR}/Interfaces/IA2CommonTypes.h"422 "${DERIVED_SOURCES_WEBKIT _DIR}/Interfaces/AccessibleEditableText.h"423 "${DERIVED_SOURCES_WEBKIT _DIR}/Interfaces/AccessibleText.h"424 "${DERIVED_SOURCES_WEBKIT _DIR}/Interfaces/AccessibleText2.h"425 "${DERIVED_SOURCES_WEBKIT _DIR}/Interfaces/WebKit_i.c"426 "${DERIVED_SOURCES_WEBKIT _DIR}/Interfaces/AccessibleApplication_i.c"427 "${DERIVED_SOURCES_WEBKIT _DIR}/Interfaces/Accessible2_i.c"428 "${DERIVED_SOURCES_WEBKIT _DIR}/Interfaces/Accessible2_2_i.c"429 "${DERIVED_SOURCES_WEBKIT _DIR}/Interfaces/AccessibleRelation_i.c"430 "${DERIVED_SOURCES_WEBKIT _DIR}/Interfaces/AccessibleEditableText_i.c"431 "${DERIVED_SOURCES_WEBKIT _DIR}/Interfaces/AccessibleText_i.c"432 "${DERIVED_SOURCES_WEBKIT _DIR}/Interfaces/AccessibleText2_i.c"433 ) 434 set_target_properties(WebKit GUID PROPERTIES OUTPUT_NAME WebKitGUID${DEBUG_SUFFIX})435 436 list(APPEND WebKit _LIBRARIES403 GENERATE_INTERFACE(win/Interfaces/WebKit.idl ${MIDL_DEFINES} "${WEBKITLEGACY_IDL_DEPENDENCIES}") 404 GENERATE_INTERFACE(win/Interfaces/Accessible2/AccessibleApplication.idl ${MIDL_DEFINES} "${WEBKITLEGACY_IDL_DEPENDENCIES}") 405 GENERATE_INTERFACE(win/Interfaces/Accessible2/Accessible2.idl ${MIDL_DEFINES} "${WEBKITLEGACY_IDL_DEPENDENCIES}") 406 GENERATE_INTERFACE(win/Interfaces/Accessible2/Accessible2_2.idl ${MIDL_DEFINES} "${WEBKITLEGACY_IDL_DEPENDENCIES}") 407 GENERATE_INTERFACE(win/Interfaces/Accessible2/AccessibleRelation.idl ${MIDL_DEFINES} "${WEBKITLEGACY_IDL_DEPENDENCIES}") 408 GENERATE_INTERFACE(win/Interfaces/Accessible2/AccessibleStates.idl ${MIDL_DEFINES} "${WEBKITLEGACY_IDL_DEPENDENCIES}") 409 GENERATE_INTERFACE(win/Interfaces/Accessible2/IA2CommonTypes.idl ${MIDL_DEFINES} "${WEBKITLEGACY_IDL_DEPENDENCIES}") 410 GENERATE_INTERFACE(win/Interfaces/Accessible2/AccessibleEditableText.idl ${MIDL_DEFINES} "${WEBKITLEGACY_IDL_DEPENDENCIES}") 411 GENERATE_INTERFACE(win/Interfaces/Accessible2/AccessibleText.idl ${MIDL_DEFINES} "${WEBKITLEGACY_IDL_DEPENDENCIES}") 412 GENERATE_INTERFACE(win/Interfaces/Accessible2/AccessibleText2.idl ${MIDL_DEFINES} "${WEBKITLEGACY_IDL_DEPENDENCIES}") 413 414 add_library(WebKitLegacyGUID STATIC 415 "${DERIVED_SOURCES_WEBKITLEGACY_DIR}/Interfaces/WebKit.h" 416 "${DERIVED_SOURCES_WEBKITLEGACY_DIR}/Interfaces/AccessibleApplication.h" 417 "${DERIVED_SOURCES_WEBKITLEGACY_DIR}/Interfaces/Accessible2.h" 418 "${DERIVED_SOURCES_WEBKITLEGACY_DIR}/Interfaces/Accessible2_2.h" 419 "${DERIVED_SOURCES_WEBKITLEGACY_DIR}/Interfaces/AccessibleRelation.h" 420 "${DERIVED_SOURCES_WEBKITLEGACY_DIR}/Interfaces/AccessibleStates.h" 421 "${DERIVED_SOURCES_WEBKITLEGACY_DIR}/Interfaces/IA2CommonTypes.h" 422 "${DERIVED_SOURCES_WEBKITLEGACY_DIR}/Interfaces/AccessibleEditableText.h" 423 "${DERIVED_SOURCES_WEBKITLEGACY_DIR}/Interfaces/AccessibleText.h" 424 "${DERIVED_SOURCES_WEBKITLEGACY_DIR}/Interfaces/AccessibleText2.h" 425 "${DERIVED_SOURCES_WEBKITLEGACY_DIR}/Interfaces/WebKit_i.c" 426 "${DERIVED_SOURCES_WEBKITLEGACY_DIR}/Interfaces/AccessibleApplication_i.c" 427 "${DERIVED_SOURCES_WEBKITLEGACY_DIR}/Interfaces/Accessible2_i.c" 428 "${DERIVED_SOURCES_WEBKITLEGACY_DIR}/Interfaces/Accessible2_2_i.c" 429 "${DERIVED_SOURCES_WEBKITLEGACY_DIR}/Interfaces/AccessibleRelation_i.c" 430 "${DERIVED_SOURCES_WEBKITLEGACY_DIR}/Interfaces/AccessibleEditableText_i.c" 431 "${DERIVED_SOURCES_WEBKITLEGACY_DIR}/Interfaces/AccessibleText_i.c" 432 "${DERIVED_SOURCES_WEBKITLEGACY_DIR}/Interfaces/AccessibleText2_i.c" 433 ) 434 set_target_properties(WebKitLegacyGUID PROPERTIES OUTPUT_NAME WebKitLegacyGUID${DEBUG_SUFFIX}) 435 436 list(APPEND WebKitLegacy_LIBRARIES 437 437 PRIVATE Comctl32 438 438 PRIVATE Comsupp … … 448 448 PRIVATE Version 449 449 PRIVATE Winmm 450 PRIVATE WebKit GUID${DEBUG_SUFFIX}450 PRIVATE WebKitLegacyGUID${DEBUG_SUFFIX} 451 451 PRIVATE WebCoreDerivedSources${DEBUG_SUFFIX} 452 452 PRIVATE WindowsCodecs … … 454 454 455 455 if (ENABLE_GRAPHICS_CONTEXT_3D) 456 list(APPEND WebKit _LIBRARIES456 list(APPEND WebKitLegacy_LIBRARIES 457 457 libANGLE${DEBUG_SUFFIX} 458 458 libEGL${DEBUG_SUFFIX} … … 467 467 # To do this we add system default libs as webkit libs and zero out system default libs. 468 468 string(REPLACE " " "\;" CXX_LIBS ${CMAKE_CXX_STANDARD_LIBRARIES}) 469 list(APPEND WebKit _LIBRARIES ${CXX_LIBS})469 list(APPEND WebKitLegacy_LIBRARIES ${CXX_LIBS}) 470 470 set(CMAKE_CXX_STANDARD_LIBRARIES "") 471 471 … … 475 475 # It fails with an unusual error - midl failed - failed to save all changes 476 476 file(MAKE_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) 477 file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKIT _DIR}/Interfaces)478 479 set(WebKit GUID_PRE_BUILD_COMMAND "${CMAKE_BINARY_DIR}/DerivedSources/WebKit/preBuild.cmd")480 file(WRITE "${WebKit GUID_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")481 file(MAKE_DIRECTORY ${FORWARDING_HEADERS_DIR}/WebKit )482 add_custom_command(TARGET WebKit GUID PRE_BUILD COMMAND ${WebKitGUID_PRE_BUILD_COMMAND} VERBATIM)483 484 set(WebKit GUID_POST_BUILD_COMMAND "${CMAKE_BINARY_DIR}/DerivedSources/WebKit/postBuild.cmd")485 file(WRITE "${WebKit GUID_POST_BUILD_COMMAND}" "@xcopy /y /d /f \"${DERIVED_SOURCES_WEBKIT_DIR}/Interfaces/*.h\" \"${FORWARDING_HEADERS_DIR}/WebKit\" >nul 2>nul")486 add_custom_command(TARGET WebKit GUID POST_BUILD COMMAND ${WebKitGUID_POST_BUILD_COMMAND} VERBATIM)487 488 set(WebKit _OUTPUT_NAME477 file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/Interfaces) 478 479 set(WebKitLegacyGUID_PRE_BUILD_COMMAND "${CMAKE_BINARY_DIR}/DerivedSources/WebKitLegacy/preBuild.cmd") 480 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") 481 file(MAKE_DIRECTORY ${FORWARDING_HEADERS_DIR}/WebKitLegacy) 482 add_custom_command(TARGET WebKitLegacyGUID PRE_BUILD COMMAND ${WebKitLegacyGUID_PRE_BUILD_COMMAND} VERBATIM) 483 484 set(WebKitLegacyGUID_POST_BUILD_COMMAND "${CMAKE_BINARY_DIR}/DerivedSources/WebKitLegacy/postBuild.cmd") 485 file(WRITE "${WebKitLegacyGUID_POST_BUILD_COMMAND}" "@xcopy /y /d /f \"${DERIVED_SOURCES_WEBKITLEGACY_DIR}/Interfaces/*.h\" \"${FORWARDING_HEADERS_DIR}/WebKitLegacy\" >nul 2>nul") 486 add_custom_command(TARGET WebKitLegacyGUID POST_BUILD COMMAND ${WebKitLegacyGUID_POST_BUILD_COMMAND} VERBATIM) 487 488 set(WebKitLegacy_OUTPUT_NAME 489 489 WebKit${DEBUG_SUFFIX} 490 490 ) -
trunk/Source/cmake/OptionsGTK.cmake
r221609 r222194 119 119 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_API_TESTS PRIVATE OFF) 120 120 if (NOT CMAKE_SYSTEM_NAME MATCHES "Darwin") 121 set(WebKit 2_VERSION_SCRIPT "-Wl,--version-script,${CMAKE_MODULE_PATH}/gtksymbols.filter")121 set(WebKit_VERSION_SCRIPT "-Wl,--version-script,${CMAKE_MODULE_PATH}/gtksymbols.filter") 122 122 endif () 123 123 endif () -
trunk/Source/cmake/OptionsWPE.cmake
r221372 r222194 130 130 set(FORWARDING_HEADERS_WPE_DIR ${FORWARDING_HEADERS_DIR}/wpe) 131 131 set(FORWARDING_HEADERS_WPE_EXTENSION_DIR ${FORWARDING_HEADERS_DIR}/wpe-webextension) 132 set(DERIVED_SOURCES_WPE_API_DIR ${DERIVED_SOURCES_WEBKIT 2_DIR}/wpe)132 set(DERIVED_SOURCES_WPE_API_DIR ${DERIVED_SOURCES_WEBKIT_DIR}/wpe) 133 133 134 134 # Build with -fvisibility=hidden to reduce the size of the shared library. -
trunk/Source/cmake/WebKitCommon.cmake
r222148 r222194 69 69 70 70 if (ENABLE_WEBKIT) 71 file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKIT 2_DIR})71 file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKIT_DIR}) 72 72 endif () 73 73 74 74 if (ENABLE_WEBKIT_LEGACY) 75 75 file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKITLEGACY_DIR}) 76 file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKIT_DIR})77 76 endif () 78 77 -
trunk/Source/cmake/WebKitFS.cmake
r222148 r222194 14 14 set(PAL_DIR "${CMAKE_SOURCE_DIR}/Source/WebCore/PAL") 15 15 endif () 16 if (NOT WEBKITLEGACY_DIR) 17 set(WEBKITLEGACY_DIR "${CMAKE_SOURCE_DIR}/Source/WebKitLegacy") 18 endif () 16 19 if (NOT WEBKIT_DIR) 17 set(WEBKIT_DIR "${CMAKE_SOURCE_DIR}/Source/WebKitLegacy") 18 endif () 19 if (NOT WEBKIT2_DIR) 20 set(WEBKIT2_DIR "${CMAKE_SOURCE_DIR}/Source/WebKit") 20 set(WEBKIT_DIR "${CMAKE_SOURCE_DIR}/Source/WebKit") 21 21 endif () 22 22 if (NOT THIRDPARTY_DIR) … … 37 37 set(DERIVED_SOURCES_WEBKITLEGACY_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebKitLegacy") 38 38 set(DERIVED_SOURCES_WEBKIT_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebKit") 39 set(DERIVED_SOURCES_WEBKIT2_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebKit2")40 39 set(DERIVED_SOURCES_WEBINSPECTORUI_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebInspectorUI") 41 40 set(DERIVED_SOURCES_WTF_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WTF") -
trunk/Tools/ChangeLog
r222191 r222194 1 2017-09-18 Michael Catanzaro <mcatanzaro@igalia.com> 2 3 [CMake] Rename WebKit target to WebKitLegacy and rename WebKit2 target to WebKit 4 https://bugs.webkit.org/show_bug.cgi?id=174558 5 6 Reviewed by Alex Christensen. 7 8 With help from Stephan Szabo, thanks! 9 10 * DumpRenderTree/PlatformMac.cmake: 11 * DumpRenderTree/PlatformWin.cmake: 12 * DumpRenderTree/win/AccessibilityControllerWin.cpp: 13 * DumpRenderTree/win/DRTDesktopNotificationPresenter.h: 14 * DumpRenderTree/win/DumpRenderTree.cpp: 15 * DumpRenderTree/win/EditingDelegate.h: 16 * DumpRenderTree/win/EventSender.cpp: 17 * DumpRenderTree/win/FrameLoadDelegate.cpp: 18 * DumpRenderTree/win/FrameLoadDelegate.h: 19 * DumpRenderTree/win/GCControllerWin.cpp: 20 * DumpRenderTree/win/HistoryDelegate.cpp: 21 * DumpRenderTree/win/HistoryDelegate.h: 22 * DumpRenderTree/win/PolicyDelegate.h: 23 * DumpRenderTree/win/ResourceLoadDelegate.cpp: 24 * DumpRenderTree/win/ResourceLoadDelegate.h: 25 * DumpRenderTree/win/TestRunnerWin.cpp: 26 * DumpRenderTree/win/TextInputControllerWin.cpp: 27 * DumpRenderTree/win/UIDelegate.cpp: 28 * DumpRenderTree/win/UIDelegate.h: 29 * DumpRenderTree/win/WorkQueueItemWin.cpp: 30 * MiniBrowser/gtk/CMakeLists.txt: 31 * MiniBrowser/mac/CMakeLists.txt: 32 * MiniBrowser/win/AccessibilityDelegate.cpp: 33 * MiniBrowser/win/AccessibilityDelegate.h: 34 * MiniBrowser/win/CMakeLists.txt: 35 * MiniBrowser/win/Common.cpp: 36 * MiniBrowser/win/DOMDefaultImpl.h: 37 * MiniBrowser/win/MiniBrowser.cpp: 38 * MiniBrowser/win/MiniBrowser.h: 39 * MiniBrowser/win/MiniBrowserWebHost.cpp: 40 * MiniBrowser/win/MiniBrowserWebHost.h: 41 * MiniBrowser/win/PageLoadTestClient.h: 42 * MiniBrowser/win/PrintWebUIDelegate.cpp: 43 * MiniBrowser/win/PrintWebUIDelegate.h: 44 * MiniBrowser/win/ResourceLoadDelegate.cpp: 45 * MiniBrowser/win/ResourceLoadDelegate.h: 46 * MiniBrowser/win/WebDownloadDelegate.h: 47 * TestWebKitAPI/CMakeLists.txt: 48 * TestWebKitAPI/PlatformGTK.cmake: 49 * TestWebKitAPI/PlatformWPE.cmake: 50 * TestWebKitAPI/PlatformWin.cmake: 51 * TestWebKitAPI/Tests/WebKitLegacy/win/ScaleWebView.cpp: 52 * TestWebKitAPI/Tests/WebKitLegacy/win/WebViewDestruction.cpp: 53 * TestWebKitAPI/glib/CMakeLists.txt: 54 * WebKitTestRunner/CMakeLists.txt: 55 * WebKitTestRunner/PlatformGTK.cmake: 56 * WebKitTestRunner/PlatformWPE.cmake: 57 1 58 2017-09-18 Myles C. Maxfield <mmaxfield@apple.com> 2 59 -
trunk/Tools/DumpRenderTree/PlatformMac.cmake
r215606 r222194 17 17 list(APPEND TestNetscapePlugIn_LIBRARIES 18 18 ${QUARTZ_LIBRARY} 19 WebKit 219 WebKitLegacy 20 20 ) 21 21 … … 24 24 ${QUARTZ_LIBRARY} 25 25 ${WEBKITSYSTEMINTERFACE_LIBRARY} 26 WebKit 226 WebKitLegacy 27 27 ) 28 28 -
trunk/Tools/DumpRenderTree/PlatformWin.cmake
r219578 r222194 25 25 26 26 list(APPEND TestNetscapePlugIn_LIBRARIES 27 WebKit 27 WebKitLegacy 28 28 ) 29 29 … … 56 56 Msimg32 57 57 Shlwapi 58 WebKit 58 WebKitLegacy 59 59 ) 60 60 … … 66 66 TestNetscapePlugIn/win 67 67 TestNetscapePlugIn/Tests/win 68 ${WEBKIT _DIR}/win69 ${DERIVED_SOURCES_DIR}/WebKit /Interfaces68 ${WEBKITLegacy_DIR}/win 69 ${DERIVED_SOURCES_DIR}/WebKitLegacy/Interfaces 70 70 ) 71 71 72 72 list(APPEND DumpRenderTree_LIBRARIES 73 73 WTF 74 WebKit 74 WebKitLegacy 75 75 shlwapi 76 76 ) … … 80 80 Comsuppw 81 81 Oleacc 82 WebKit GUID82 WebKitLegacyGUID 83 83 ) 84 84 -
trunk/Tools/DumpRenderTree/win/AccessibilityControllerWin.cpp
r210628 r222194 36 36 #include <WebCore/AccessibilityObjectWrapperWin.h> 37 37 #include <WebCore/COMPtr.h> 38 #include <WebKit /WebKit.h>38 #include <WebKitLegacy/WebKit.h> 39 39 #include <comutil.h> 40 40 #include <oleacc.h> -
trunk/Tools/DumpRenderTree/win/DRTDesktopNotificationPresenter.h
r188709 r222194 30 30 #define DRTDesktopNotificationPresenter_h 31 31 32 #include <WebKit /WebKit.h>32 #include <WebKitLegacy/WebKit.h> 33 33 #include <windef.h> 34 34 -
trunk/Tools/DumpRenderTree/win/DumpRenderTree.cpp
r221975 r222194 47 47 #include <JavaScriptCore/TestRunnerUtils.h> 48 48 #include <WebCore/FileSystem.h> 49 #include <WebKit /WebKit.h>50 #include <WebKit /WebKitCOMAPI.h>49 #include <WebKitLegacy/WebKit.h> 50 #include <WebKitLegacy/WebKitCOMAPI.h> 51 51 #include <comutil.h> 52 52 #include <cstdio> -
trunk/Tools/DumpRenderTree/win/EditingDelegate.h
r188709 r222194 30 30 #define EditingDelegate_h 31 31 32 #include <WebKit /WebKit.h>32 #include <WebKitLegacy/WebKit.h> 33 33 34 34 class __declspec(uuid("265DCD4B-79C3-44a2-84BC-511C3EDABD6F")) EditingDelegate : public IWebEditingDelegate2, public IWebNotificationObserver { -
trunk/Tools/DumpRenderTree/win/EventSender.cpp
r203403 r222194 40 40 #include <JavaScriptCore/JavaScriptCore.h> 41 41 #include <WebCore/COMPtr.h> 42 #include <WebKit /WebKit.h>42 #include <WebKitLegacy/WebKit.h> 43 43 #include <windows.h> 44 44 #include <wtf/ASCIICType.h> -
trunk/Tools/DumpRenderTree/win/FrameLoadDelegate.cpp
r210503 r222194 43 43 #include <WebCore/COMPtr.h> 44 44 #include <JavaScriptCore/JavaScriptCore.h> 45 #include <WebKit /WebKit.h>45 #include <WebKitLegacy/WebKit.h> 46 46 #include <stdio.h> 47 47 #include <string> -
trunk/Tools/DumpRenderTree/win/FrameLoadDelegate.h
r188709 r222194 30 30 #define FrameLoadDelegate_h 31 31 32 #include <WebKit /WebKit.h>32 #include <WebKitLegacy/WebKit.h> 33 33 34 34 class AccessibilityController; -
trunk/Tools/DumpRenderTree/win/GCControllerWin.cpp
r165676 r222194 32 32 #include "DumpRenderTree.h" 33 33 #include <WebCore/COMPtr.h> 34 #include <WebKit /WebKit.h>35 #include <WebKit /WebKitCOMAPI.h>34 #include <WebKitLegacy/WebKit.h> 35 #include <WebKitLegacy/WebKitCOMAPI.h> 36 36 37 37 void GCController::collect() const -
trunk/Tools/DumpRenderTree/win/HistoryDelegate.cpp
r210503 r222194 30 30 #include "DumpRenderTreeWin.h" 31 31 #include "TestRunner.h" 32 #include <WebKitLegacy/WebKit.h> 32 33 #include <comutil.h> 33 34 #include <string> 34 #include <WebKit/WebKit.h>35 35 36 36 using std::wstring; -
trunk/Tools/DumpRenderTree/win/HistoryDelegate.h
r188709 r222194 27 27 #define HistoryDelegate_h 28 28 29 #include <WebKit /WebKit.h>29 #include <WebKitLegacy/WebKit.h> 30 30 31 31 class HistoryDelegate : public IWebHistoryDelegate { -
trunk/Tools/DumpRenderTree/win/PolicyDelegate.h
r188709 r222194 30 30 #define PolicyDelegate_h 31 31 32 #include <WebKit /WebKit.h>32 #include <WebKitLegacy/WebKit.h> 33 33 34 34 class TestRunner; -
trunk/Tools/DumpRenderTree/win/ResourceLoadDelegate.cpp
r210503 r222194 32 32 #include "DumpRenderTree.h" 33 33 #include "TestRunner.h" 34 #include <WebKit /WebKitCOMAPI.h>34 #include <WebKitLegacy/WebKitCOMAPI.h> 35 35 #include <comutil.h> 36 36 #include <sstream> -
trunk/Tools/DumpRenderTree/win/ResourceLoadDelegate.h
r188709 r222194 30 30 #define ResourceLoadDelegate_h 31 31 32 #include <WebKit /WebKit.h>32 #include <WebKitLegacy/WebKit.h> 33 33 #include <string> 34 34 #include <wtf/HashMap.h> -
trunk/Tools/DumpRenderTree/win/TestRunnerWin.cpp
r222097 r222194 40 40 #include <JavaScriptCore/JavaScriptCore.h> 41 41 #include <WebCore/COMPtr.h> 42 #include <WebKit /WebKit.h>43 #include <WebKit /WebKitCOMAPI.h>42 #include <WebKitLegacy/WebKit.h> 43 #include <WebKitLegacy/WebKitCOMAPI.h> 44 44 #include <comutil.h> 45 45 #include <shlguid.h> -
trunk/Tools/DumpRenderTree/win/TextInputControllerWin.cpp
r186881 r222194 33 33 #include <JavaScriptCore/JSStringRefBSTR.h> 34 34 #include <WebCore/COMPtr.h> 35 #include <WebKit /WebKit.h>35 #include <WebKitLegacy/WebKit.h> 36 36 #include <comutil.h> 37 37 #include <string> -
trunk/Tools/DumpRenderTree/win/UIDelegate.cpp
r218494 r222194 40 40 #include <wtf/Vector.h> 41 41 #include <JavaScriptCore/JavaScriptCore.h> 42 #include <WebKit /WebKit.h>43 #include <WebKit /WebKitCOMAPI.h>42 #include <WebKitLegacy/WebKit.h> 43 #include <WebKitLegacy/WebKitCOMAPI.h> 44 44 #include <comutil.h> 45 45 #include <stdio.h> -
trunk/Tools/DumpRenderTree/win/UIDelegate.h
r202326 r222194 31 31 32 32 #include <WebCore/COMPtr.h> 33 #include <WebKit /WebKit.h>33 #include <WebKitLegacy/WebKit.h> 34 34 #include <windef.h> 35 35 -
trunk/Tools/DumpRenderTree/win/WorkQueueItemWin.cpp
r167030 r222194 32 32 #include <comutil.h> 33 33 #include "DumpRenderTree.h" 34 #include <WebCore/COMPtr.h>35 #include <WebKit/WebKit.h>36 #include <WebKit/WebKitCOMAPI.h>37 34 #include <JavaScriptCore/JSStringRef.h> 38 35 #include <JavaScriptCore/JSStringRefBSTR.h> 39 36 #include <JavaScriptCore/JSStringRefCF.h> 37 #include <WebCore/COMPtr.h> 38 #include <WebKitLegacy/WebKit.h> 39 #include <WebKitLegacy/WebKitCOMAPI.h> 40 40 #include <wtf/RetainPtr.h> 41 41 #include <wtf/Vector.h> -
trunk/Tools/MiniBrowser/gtk/CMakeLists.txt
r220403 r222194 37 37 set(MiniBrowser_LIBRARIES 38 38 ${JavaScriptCore_LIBRARY_NAME} 39 WebKit 239 WebKit 40 40 ${GTK3_LIBRARIES} 41 41 ${GLIB_LIBRARIES} -
trunk/Tools/MiniBrowser/mac/CMakeLists.txt
r215606 r222194 23 23 24 24 set(MiniBrowser_LIBRARIES 25 WebKit 225 WebKit 26 26 ) 27 27 -
trunk/Tools/MiniBrowser/win/AccessibilityDelegate.cpp
r188709 r222194 27 27 #include "AccessibilityDelegate.h" 28 28 29 #include <WebKit /WebKitCOMAPI.h>29 #include <WebKitLegacy/WebKitCOMAPI.h> 30 30 #include <commctrl.h> 31 31 #include <commdlg.h> -
trunk/Tools/MiniBrowser/win/AccessibilityDelegate.h
r188709 r222194 27 27 #define AccessibilityDelegate_h 28 28 29 #include <WebKit /WebKit.h>29 #include <WebKitLegacy/WebKit.h> 30 30 31 31 class AccessibilityDelegate : public IAccessibilityDelegate { -
trunk/Tools/MiniBrowser/win/CMakeLists.txt
r221463 r222194 1 1 set(MiniBrowser_INCLUDE_DIRECTORIES 2 2 "${FORWARDING_HEADERS_DIR}" 3 "${FORWARDING_HEADERS_DIR}/WebKit "3 "${FORWARDING_HEADERS_DIR}/WebKitLegacy" 4 4 "${CMAKE_SOURCE_DIR}" 5 5 "${CMAKE_SOURCE_DIR}/Source" … … 23 23 DbgHelp 24 24 WTF 25 WebKit 26 WebKit GUID25 WebKitLegacy 26 WebKitLegacyGUID 27 27 comctl32 28 28 comsupp -
trunk/Tools/MiniBrowser/win/Common.cpp
r219830 r222194 34 34 #include "MiniBrowser.h" 35 35 #include "MiniBrowserReplace.h" 36 #include <WebKit /WebKitCOMAPI.h>36 #include <WebKitLegacy/WebKitCOMAPI.h> 37 37 #include <wtf/ExportMacros.h> 38 38 #include <wtf/Platform.h> … … 42 42 #if USE(CF) 43 43 #include <CoreFoundation/CFRunLoop.h> 44 #include <WebKit /CFDictionaryPropertyBag.h>44 #include <WebKitLegacy/CFDictionaryPropertyBag.h> 45 45 #endif 46 46 -
trunk/Tools/MiniBrowser/win/DOMDefaultImpl.h
r188709 r222194 29 29 #define DOMDefaultImpl_h 30 30 31 #include <WebKit /WebKit.h>31 #include <WebKitLegacy/WebKit.h> 32 32 33 33 class WebScriptObject : public IWebScriptObject { -
trunk/Tools/MiniBrowser/win/MiniBrowser.cpp
r189833 r222194 33 33 #include "MiniBrowserLibResource.h" 34 34 #include "MiniBrowserReplace.h" 35 #include <WebKit /WebKitCOMAPI.h>35 #include <WebKitLegacy/WebKitCOMAPI.h> 36 36 #include <wtf/ExportMacros.h> 37 37 #include <wtf/Platform.h> -
trunk/Tools/MiniBrowser/win/MiniBrowser.h
r191970 r222194 25 25 26 26 #include "PageLoadTestClient.h" 27 #include <WebKit /WebKit.h>27 #include <WebKitLegacy/WebKit.h> 28 28 #include <comip.h> 29 29 #include <memory> -
trunk/Tools/MiniBrowser/win/MiniBrowserWebHost.cpp
r188982 r222194 33 33 #include "PageLoadTestClient.h" 34 34 #include "MiniBrowser.h" 35 #include <WebKit /WebKit.h>35 #include <WebKitLegacy/WebKit.h> 36 36 37 37 class SimpleEventListener : public DOMEventListener { -
trunk/Tools/MiniBrowser/win/MiniBrowserWebHost.h
r191970 r222194 27 27 28 28 #include "resource.h" 29 #include <WebKitLegacy/WebKit.h> 29 30 #include <comutil.h> 30 #include <WebKit/WebKit.h>31 31 32 32 class MiniBrowser; -
trunk/Tools/MiniBrowser/win/PageLoadTestClient.h
r188982 r222194 28 28 29 29 #include <CoreFoundation/CFDate.h> 30 #include <WebKit /WebKit.h>30 #include <WebKitLegacy/WebKit.h> 31 31 #include <wtf/Assertions.h> 32 32 #include <wtf/HashSet.h> -
trunk/Tools/MiniBrowser/win/PrintWebUIDelegate.cpp
r202369 r222194 32 32 #endif 33 33 #include <WebCore/COMPtr.h> 34 #include <WebKit /WebKitCOMAPI.h>34 #include <WebKitLegacy/WebKitCOMAPI.h> 35 35 #include <comip.h> 36 36 #include <commctrl.h> -
trunk/Tools/MiniBrowser/win/PrintWebUIDelegate.h
r202327 r222194 28 28 #define PrintWebUIDelegate_h 29 29 30 #include <WebKit /WebKit.h>30 #include <WebKitLegacy/WebKit.h> 31 31 32 32 class PrintWebUIDelegate : public IWebUIDelegate { -
trunk/Tools/MiniBrowser/win/ResourceLoadDelegate.cpp
r219830 r222194 29 29 #include "PageLoadTestClient.h" 30 30 #include <COMPtr.h> 31 #include <WebKit /WebKitCOMAPI.h>31 #include <WebKitLegacy/WebKitCOMAPI.h> 32 32 #include <comip.h> 33 33 #include <commctrl.h> -
trunk/Tools/MiniBrowser/win/ResourceLoadDelegate.h
r188982 r222194 27 27 #define ResourceLoadDelegate_h 28 28 29 #include <WebKit /WebKit.h>29 #include <WebKitLegacy/WebKit.h> 30 30 31 31 class MiniBrowser; -
trunk/Tools/MiniBrowser/win/WebDownloadDelegate.h
r188709 r222194 27 27 #define WebDownloadDelegate_h 28 28 29 #include <WebKit /WebKit.h>30 #include <WebKit /WebKitCOMAPI.h>29 #include <WebKitLegacy/WebKit.h> 30 #include <WebKitLegacy/WebKitCOMAPI.h> 31 31 32 32 class WebDownloadDelegate : public IWebDownloadDelegate { -
trunk/Tools/TestWebKitAPI/CMakeLists.txt
r222131 r222194 16 16 17 17 if (ENABLE_WEBKIT) 18 set(test_webkit 2_api_LIBRARIES18 set(test_webkit_api_LIBRARIES 19 19 JavaScriptCore 20 20 TestWebKitAPIBase 21 21 WTF 22 WebKit 222 WebKit 23 23 gtest 24 24 ) 25 25 list(APPEND TestWebKitAPI_LIBRARIES 26 WebKit 226 WebKit 27 27 ) 28 28 else () 29 29 list(APPEND TestWebKitAPI_LIBRARIES 30 WebKit ${DEBUG_SUFFIX}30 WebKitLegacy${DEBUG_SUFFIX} 31 31 ) 32 32 endif () … … 112 112 ${PAL_DIR} 113 113 ${THIRDPARTY_DIR}/gtest/include 114 ${WEBKIT 2_DIR}/Platform/IPC115 ${WEBKIT 2_DIR}/Shared116 ${WEBKIT 2_DIR}/Shared/API117 ${WEBKIT 2_DIR}/Shared/API/c118 ${WEBKIT 2_DIR}/Shared/Plugins119 ${WEBKIT 2_DIR}/UIProcess120 ${WEBKIT 2_DIR}/UIProcess/API121 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle122 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/c114 ${WEBKIT_DIR}/Platform/IPC 115 ${WEBKIT_DIR}/Shared 116 ${WEBKIT_DIR}/Shared/API 117 ${WEBKIT_DIR}/Shared/API/c 118 ${WEBKIT_DIR}/Shared/Plugins 119 ${WEBKIT_DIR}/UIProcess 120 ${WEBKIT_DIR}/UIProcess/API 121 ${WEBKIT_DIR}/WebProcess/InjectedBundle 122 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/c 123 123 ) 124 124 … … 215 215 add_library(TestWebKitAPIBase 216 216 ${test_main_SOURCES} 217 ${webkit 2_api_harness_SOURCES}217 ${webkit_api_harness_SOURCES} 218 218 ${TESTWEBKITAPI_DIR}/JavaScriptTest.cpp 219 219 ${TESTWEBKITAPI_DIR}/PlatformUtilities.cpp … … 221 221 ) 222 222 223 target_link_libraries(TestWebKitAPIBase JavaScriptCore WTF WebKit 2gtest)224 225 add_dependencies(TestWebKitAPIBase WebKit 2${ForwardingHeadersForTestWebKitAPI_NAME} ${ForwardingNetworkHeadersForTestWebKitAPI_NAME})223 target_link_libraries(TestWebKitAPIBase JavaScriptCore WTF WebKit gtest) 224 225 add_dependencies(TestWebKitAPIBase WebKit ${ForwardingHeadersForTestWebKitAPI_NAME} ${ForwardingNetworkHeadersForTestWebKitAPI_NAME}) 226 226 227 227 if (COMPILER_IS_GCC_OR_CLANG) -
trunk/Tools/TestWebKitAPI/PlatformGTK.cmake
r221778 r222194 7 7 8 8 add_custom_target(TestWebKitAPI-forwarding-headers 9 COMMAND ${PERL_EXECUTABLE} ${WEBKIT 2_DIR}/Scripts/generate-forwarding-headers.pl --include-path ${TESTWEBKITAPI_DIR} --output ${FORWARDING_HEADERS_DIR} --platform gtk --platform soup10 DEPENDS WebKit 2-forwarding-headers9 COMMAND ${PERL_EXECUTABLE} ${WEBKIT_DIR}/Scripts/generate-forwarding-headers.pl --include-path ${TESTWEBKITAPI_DIR} --output ${FORWARDING_HEADERS_DIR} --platform gtk --platform soup 10 DEPENDS WebKit-forwarding-headers 11 11 ) 12 12 … … 16 16 ${FORWARDING_HEADERS_DIR} 17 17 ${FORWARDING_HEADERS_DIR}/JavaScriptCore 18 ${WEBKIT 2_DIR}/UIProcess/API/C/soup19 ${WEBKIT 2_DIR}/UIProcess/API/C/gtk20 ${WEBKIT 2_DIR}/UIProcess/API/gtk18 ${WEBKIT_DIR}/UIProcess/API/C/soup 19 ${WEBKIT_DIR}/UIProcess/API/C/gtk 20 ${WEBKIT_DIR}/UIProcess/API/gtk 21 21 ) 22 22 … … 37 37 ) 38 38 39 set(webkit 2_api_harness_SOURCES39 set(webkit_api_harness_SOURCES 40 40 ${TESTWEBKITAPI_DIR}/gtk/PlatformUtilitiesGtk.cpp 41 41 ${TESTWEBKITAPI_DIR}/gtk/PlatformWebViewGtk.cpp … … 47 47 ) 48 48 49 list(APPEND test_webkit 2_api_LIBRARIES49 list(APPEND test_webkit_api_LIBRARIES 50 50 ${GDK3_LIBRARIES} 51 51 ${GTK3_LIBRARIES} … … 69 69 ) 70 70 71 add_executable(TestWebKit 271 add_executable(TestWebKit 72 72 ${TESTWEBKITAPI_DIR}/Tests/WebKit/AboutBlankLoad.cpp 73 73 ${TESTWEBKITAPI_DIR}/Tests/WebKit/CanHandleRequest.cpp … … 123 123 ) 124 124 125 target_link_libraries(TestWebKit 2 ${test_webkit2_api_LIBRARIES})126 add_test(TestWebKit 2 ${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY}/WebKit2/TestWebKit2)127 set_tests_properties(TestWebKit 2PROPERTIES TIMEOUT 60)128 set_target_properties(TestWebKit 2 PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY}/WebKit2)125 target_link_libraries(TestWebKit ${test_webkit_api_LIBRARIES}) 126 add_test(TestWebKit ${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY}/WebKit/TestWebKit) 127 set_tests_properties(TestWebKit PROPERTIES TIMEOUT 60) 128 set_target_properties(TestWebKit PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY}/WebKit) 129 129 130 130 add_executable(TestWebCore … … 160 160 161 161 if (COMPILER_IS_GCC_OR_CLANG) 162 WEBKIT_ADD_TARGET_CXX_FLAGS(TestWebKit 2-Wno-sign-compare163 164 162 WEBKIT_ADD_TARGET_CXX_FLAGS(TestWebKit -Wno-sign-compare 163 -Wno-undef 164 -Wno-unused-parameter) 165 165 166 166 WEBKIT_ADD_TARGET_CXX_FLAGS(TestWebCore -Wno-sign-compare -
trunk/Tools/TestWebKitAPI/PlatformWPE.cmake
r221814 r222194 7 7 8 8 add_custom_target(TestWebKitAPI-forwarding-headers 9 COMMAND ${PERL_EXECUTABLE} ${WEBKIT 2_DIR}/Scripts/generate-forwarding-headers.pl --include-path ${TESTWEBKITAPI_DIR} --output ${FORWARDING_HEADERS_DIR} --platform wpe --platform soup10 DEPENDS webkit 2wpe-forwarding-headers9 COMMAND ${PERL_EXECUTABLE} ${WEBKIT_DIR}/Scripts/generate-forwarding-headers.pl --include-path ${TESTWEBKITAPI_DIR} --output ${FORWARDING_HEADERS_DIR} --platform wpe --platform soup 10 DEPENDS webkitwpe-forwarding-headers 11 11 ) 12 12 -
trunk/Tools/TestWebKitAPI/PlatformWin.cmake
r221778 r222194 143 143 endif () 144 144 145 set(test_webkit _LIBRARIES145 set(test_webkitlegacy_LIBRARIES 146 146 WebCoreTestSupport 147 WebKit ${DEBUG_SUFFIX}147 WebKitLegacy${DEBUG_SUFFIX} 148 148 gtest 149 149 ) 150 add_library(TestWebKitL ib SHARED150 add_library(TestWebKitLegacyLib SHARED 151 151 ${test_main_SOURCES} 152 152 ${TESTWEBKITAPI_DIR}/TestsController.cpp … … 156 156 ) 157 157 158 target_link_libraries(TestWebKitL ib ${test_webkit_LIBRARIES})158 target_link_libraries(TestWebKitLegacyLib ${test_webkitlegacy_LIBRARIES}) 159 159 160 add_executable(TestWebKit 160 add_executable(TestWebKitLegacy 161 161 ${TOOLS_DIR}/win/DLLLauncher/DLLLauncherMain.cpp 162 162 ) 163 target_link_libraries(TestWebKit shlwapi)164 add_dependencies(TestWebKit ${ForwardingHeadersForTestWebKitAPI_NAME})163 target_link_libraries(TestWebKitLegacy shlwapi) 164 add_dependencies(TestWebKitLegacy ${ForwardingHeadersForTestWebKitAPI_NAME}) 165 165 166 add_test(TestWebKit ${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY}/TestWebKit)167 set_tests_properties(TestWebKit PROPERTIES TIMEOUT 60)166 add_test(TestWebKitLegacy ${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY}/TestWebKitLegacy) 167 set_tests_properties(TestWebKitLegacy PROPERTIES TIMEOUT 60) 168 168 169 169 set(test_main_SOURCES … … 172 172 173 173 add_dependencies(TestWebCore TestWebCoreLib) 174 add_dependencies(TestWebKit TestWebKitLib)174 add_dependencies(TestWebKitLegacy TestWebKitLegacyLib) -
trunk/Tools/TestWebKitAPI/Tests/WebKitLegacy/win/ScaleWebView.cpp
r217563 r222194 28 28 #include "Test.h" 29 29 #include <WebCore/COMPtr.h> 30 #include <WebKit /WebKit.h>31 #include <WebKit /WebKitCOMAPI.h>30 #include <WebKitLegacy/WebKit.h> 31 #include <WebKitLegacy/WebKitCOMAPI.h> 32 32 33 33 namespace TestWebKitAPI { -
trunk/Tools/TestWebKitAPI/Tests/WebKitLegacy/win/WebViewDestruction.cpp
r217563 r222194 28 28 #include "Test.h" 29 29 #include <WebCore/COMPtr.h> 30 #include <WebKit /WebKit.h>31 #include <WebKit /WebKitCOMAPI.h>30 #include <WebKitLegacy/WebKit.h> 31 #include <WebKitLegacy/WebKitCOMAPI.h> 32 32 33 33 namespace TestWebKitAPI { -
trunk/Tools/TestWebKitAPI/glib/CMakeLists.txt
r220403 r222194 23 23 set(WebKitGLibAPITest_LIBRARIES 24 24 JavaScriptCore 25 WebKit 225 WebKit 26 26 WebKitGLibAPITestsCore 27 27 ${GLIB_LIBRARIES} … … 31 31 set(WebKitGLibAPITestExtension_LIBRARIES 32 32 JavaScriptCore 33 WebKit 233 WebKit 34 34 ${GLIB_LIBRARIES} 35 35 ) … … 42 42 macro(ADD_WK2_TEST_WEB_EXTENSION extension_name) 43 43 add_library(${extension_name} MODULE ${ARGN}) 44 add_dependencies(${extension_name} WebKit 2)44 add_dependencies(${extension_name} WebKit) 45 45 set_property( 46 46 TARGET ${extension_name} … … 92 92 93 93 add_library(WebKitGLibAPITestsCore STATIC ${WebKitGLibAPITests_SOURCES}) 94 target_link_libraries(WebKitGLibAPITestsCore WebKit 2)94 target_link_libraries(WebKitGLibAPITestsCore WebKit) 95 95 96 96 if (COMPILER_IS_GCC_OR_CLANG) -
trunk/Tools/WebKitTestRunner/CMakeLists.txt
r220403 r222194 26 26 JavaScriptCore 27 27 WebCoreTestSupport 28 WebKit 228 WebKit 29 29 ) 30 30 … … 37 37 ${WEBKIT_TESTRUNNER_BINDINGS_DIR} 38 38 ${WEBCORE_DIR}/testing/js 39 ${WEBKIT 2_DIR}/Platform/IPC40 ${WEBKIT 2_DIR}/Shared41 ${WEBKIT 2_DIR}/Shared/API/c42 ${WEBKIT 2_DIR}/Shared/Plugins43 ${WEBKIT 2_DIR}/UIProcess44 ${WEBKIT 2_DIR}/UIProcess/API/C/soup45 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle46 ${WEBKIT 2_DIR}/WebProcess/InjectedBundle/API/c39 ${WEBKIT_DIR}/Platform/IPC 40 ${WEBKIT_DIR}/Shared 41 ${WEBKIT_DIR}/Shared/API/c 42 ${WEBKIT_DIR}/Shared/Plugins 43 ${WEBKIT_DIR}/UIProcess 44 ${WEBKIT_DIR}/UIProcess/API/C/soup 45 ${WEBKIT_DIR}/WebProcess/InjectedBundle 46 ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/c 47 47 ${DERIVED_SOURCES_DIR}/InjectedBundle 48 48 ${DERIVED_SOURCES_DIR}/UIScriptContext … … 123 123 124 124 if (NOT APPLE) 125 add_dependencies(WebKit 2${ForwardingHeadersForWebKitTestRunner_NAME})125 add_dependencies(WebKit ${ForwardingHeadersForWebKitTestRunner_NAME}) 126 126 endif () -
trunk/Tools/WebKitTestRunner/PlatformGTK.cmake
r209665 r222194 1 1 add_custom_target(WebKitTestRunner-forwarding-headers 2 COMMAND ${PERL_EXECUTABLE} ${WEBKIT 2_DIR}/Scripts/generate-forwarding-headers.pl --include-path ${WEBKIT_TESTRUNNER_DIR} --include-path ${WEBKIT_TESTRUNNER_SHARED_DIR} --output ${FORWARDING_HEADERS_DIR} --platform gtk --platform soup2 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 3 3 ) 4 4 … … 41 41 ${GTK3_LIBRARIES} 42 42 WebCoreTestSupport 43 WebKit 243 WebKit 44 44 ) 45 45 -
trunk/Tools/WebKitTestRunner/PlatformWPE.cmake
r220000 r222194 4 4 5 5 add_custom_target(WebKitTestRunner-forwarding-headers 6 COMMAND ${PERL_EXECUTABLE} ${WEBKIT 2_DIR}/Scripts/generate-forwarding-headers.pl --include-path ${WEBKIT_TESTRUNNER_DIR} --output ${FORWARDING_HEADERS_DIR} --platform wpe6 COMMAND ${PERL_EXECUTABLE} ${WEBKIT_DIR}/Scripts/generate-forwarding-headers.pl --include-path ${WEBKIT_TESTRUNNER_DIR} --output ${FORWARDING_HEADERS_DIR} --platform wpe 7 7 ) 8 8
Note: See TracChangeset
for help on using the changeset viewer.
