Diff
Modified: trunk/ChangeLog (276644 => 276645)
--- trunk/ChangeLog 2021-04-27 17:08:25 UTC (rev 276644)
+++ trunk/ChangeLog 2021-04-27 17:18:16 UTC (rev 276645)
@@ -1,3 +1,16 @@
+2021-04-27 Don Olmstead <[email protected]>
+
+ [CMake] Don't use FORWARDING_HEADERS_DIR for GTK WebKit headers
+ https://bugs.webkit.org/show_bug.cgi?id=225006
+
+ Reviewed by Michael Catanzaro.
+
+ Create CMake variables WebKit2Gtk_FRAMEWORK_HEADERS_DIR and WebKit2Gtk_DERIVED_SOURCES_DIR
+ to represent where the WebKit2 GTK headers and derived sources will reside. The names and
+ locations set then follow along with the conventions used for the other frameworks.
+
+ * Source/cmake/OptionsGTK.cmake:
+
2021-04-26 Alex Christensen <[email protected]>
Update Mac-specific CMake files
Modified: trunk/Source/WebInspectorUI/ChangeLog (276644 => 276645)
--- trunk/Source/WebInspectorUI/ChangeLog 2021-04-27 17:08:25 UTC (rev 276644)
+++ trunk/Source/WebInspectorUI/ChangeLog 2021-04-27 17:18:16 UTC (rev 276645)
@@ -1,3 +1,15 @@
+2021-04-27 Don Olmstead <[email protected]>
+
+ [CMake] Don't use FORWARDING_HEADERS_DIR for GTK WebKit headers
+ https://bugs.webkit.org/show_bug.cgi?id=225006
+
+ Reviewed by Michael Catanzaro.
+
+ Use WebKit2Gtk_FRAMEWORK_HEADERS_DIR and WebKit2Gtk_DERIVED_SOURCES_DIR for WebKit2 GTK
+ headers instead of FORWARDING_HEADERS_DIR and DERIVED_SOURCES_DIR.
+
+ * PlatformGTK.cmake:
+
2021-04-26 Nikita Vasilyev <[email protected]>
Web Inspector: Audit Tab: Edits are not committed when leaving edit mode unless you first click into another text field
Modified: trunk/Source/WebInspectorUI/PlatformGTK.cmake (276644 => 276645)
--- trunk/Source/WebInspectorUI/PlatformGTK.cmake 2021-04-27 17:08:25 UTC (rev 276644)
+++ trunk/Source/WebInspectorUI/PlatformGTK.cmake 2021-04-27 17:18:16 UTC (rev 276645)
@@ -1,3 +1,3 @@
-set(WebInspectorUI_RESOURCES_DIR "${DERIVED_SOURCES_WEBKIT2GTK_DIR}/InspectorResources")
+set(WebInspectorUI_RESOURCES_DIR "${WebKit2Gtk_DERIVED_SOURCES_DIR}/InspectorResources")
set(WebInspectorUI_LOCALIZED_STRINGS_DIR "${WebInspectorUI_RESOURCES_DIR}/WebInspectorUI/Localizations/en.lproj")
Modified: trunk/Source/WebKit/ChangeLog (276644 => 276645)
--- trunk/Source/WebKit/ChangeLog 2021-04-27 17:08:25 UTC (rev 276644)
+++ trunk/Source/WebKit/ChangeLog 2021-04-27 17:18:16 UTC (rev 276645)
@@ -1,3 +1,15 @@
+2021-04-27 Don Olmstead <[email protected]>
+
+ [CMake] Don't use FORWARDING_HEADERS_DIR for GTK WebKit headers
+ https://bugs.webkit.org/show_bug.cgi?id=225006
+
+ Reviewed by Michael Catanzaro.
+
+ Use WebKit2Gtk_FRAMEWORK_HEADERS_DIR and WebKit2Gtk_DERIVED_SOURCES_DIR for WebKit2 GTK
+ headers instead of FORWARDING_HEADERS_DIR and DERIVED_SOURCES_DIR.
+
+ * PlatformGTK.cmake:
+
2021-04-27 Brent Fulgham <[email protected]>
[iOS] [GPU] The UI process should issue the mach sandbox extension to 'com.apple.AGXCompilerService'
Modified: trunk/Source/WebKit/PlatformGTK.cmake (276644 => 276645)
--- trunk/Source/WebKit/PlatformGTK.cmake 2021-04-27 17:08:25 UTC (rev 276644)
+++ trunk/Source/WebKit/PlatformGTK.cmake 2021-04-27 17:18:16 UTC (rev 276645)
@@ -5,12 +5,12 @@
set(NetworkProcess_OUTPUT_NAME WebKitNetworkProcess)
set(GPUProcess_OUTPUT_NAME WebKitGPUProcess)
-file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKIT2GTK_API_DIR})
-file(MAKE_DIRECTORY ${FORWARDING_HEADERS_WEBKIT2GTK_DIR})
-file(MAKE_DIRECTORY ${FORWARDING_HEADERS_WEBKIT2GTK_VERSIONED_DIR})
-file(MAKE_DIRECTORY ${FORWARDING_HEADERS_WEBKIT2GTK_EXTENSION_DIR})
+file(MAKE_DIRECTORY ${WebKit2Gtk_DERIVED_SOURCES_DIR}/webkit2)
+file(MAKE_DIRECTORY ${WebKit2Gtk_FRAMEWORK_HEADERS_DIR})
+file(MAKE_DIRECTORY ${WebKit2Gtk_FRAMEWORK_HEADERS_DIR}/webkit2gtk-${WEBKITGTK_API_VERSION})
+file(MAKE_DIRECTORY ${WebKit2Gtk_FRAMEWORK_HEADERS_DIR}/webkit2gtk-webextension)
-configure_file(UIProcess/API/gtk/WebKitVersion.h.in ${DERIVED_SOURCES_WEBKIT2GTK_API_DIR}/WebKitVersion.h)
+configure_file(UIProcess/API/gtk/WebKitVersion.h.in ${WebKit2Gtk_DERIVED_SOURCES_DIR}/webkit2/WebKitVersion.h)
configure_file(gtk/webkit2gtk.pc.in ${WebKit2_PKGCONFIG_FILE} @ONLY)
configure_file(gtk/webkit2gtk-web-extension.pc.in ${WebKit2WebExtension_PKGCONFIG_FILE} @ONLY)
@@ -49,19 +49,19 @@
endif ()
list(APPEND WebKit_DERIVED_SOURCES
- ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/InspectorGResourceBundle.c
- ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/WebKitDirectoryInputStreamData.cpp
- ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/WebKitResourcesGResourceBundle.c
+ ${WebKit2Gtk_DERIVED_SOURCES_DIR}/InspectorGResourceBundle.c
+ ${WebKit2Gtk_DERIVED_SOURCES_DIR}/WebKitDirectoryInputStreamData.cpp
+ ${WebKit2Gtk_DERIVED_SOURCES_DIR}/WebKitResourcesGResourceBundle.c
- ${DERIVED_SOURCES_WEBKIT2GTK_API_DIR}/WebKitEnumTypes.cpp
- ${DERIVED_SOURCES_WEBKIT2GTK_API_DIR}/WebKitWebProcessEnumTypes.cpp
+ ${WebKit2Gtk_DERIVED_SOURCES_DIR}/webkit2/WebKitEnumTypes.cpp
+ ${WebKit2Gtk_DERIVED_SOURCES_DIR}/webkit2/WebKitWebProcessEnumTypes.cpp
)
if (ENABLE_WAYLAND_TARGET)
list(APPEND WebKit_DERIVED_SOURCES
- ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/WebKitWaylandClientProtocol.c
- ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/pointer-constraints-unstable-v1-protocol.c
- ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/relative-pointer-unstable-v1-protocol.c
+ ${WebKit2Gtk_DERIVED_SOURCES_DIR}/WebKitWaylandClientProtocol.c
+ ${WebKit2Gtk_DERIVED_SOURCES_DIR}/pointer-constraints-unstable-v1-protocol.c
+ ${WebKit2Gtk_DERIVED_SOURCES_DIR}/relative-pointer-unstable-v1-protocol.c
)
endif ()
@@ -71,10 +71,10 @@
)
add_custom_command(
- OUTPUT ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/WebKitDirectoryInputStreamData.cpp ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/WebKitDirectoryInputStreamData.h
+ OUTPUT ${WebKit2Gtk_DERIVED_SOURCES_DIR}/WebKitDirectoryInputStreamData.cpp ${WebKit2Gtk_DERIVED_SOURCES_DIR}/WebKitDirectoryInputStreamData.h
MAIN_DEPENDENCY ${WEBCORE_DIR}/css/make-css-file-arrays.pl
DEPENDS ${WebKit_DirectoryInputStream_DATA}
- COMMAND ${PERL_EXECUTABLE} ${WEBCORE_DIR}/css/make-css-file-arrays.pl --defines "${FEATURE_DEFINES_WITH_SPACE_SEPARATOR}" --preprocessor "${CODE_GENERATOR_PREPROCESSOR}" ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/WebKitDirectoryInputStreamData.h ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/WebKitDirectoryInputStreamData.cpp ${WebKit_DirectoryInputStream_DATA}
+ COMMAND ${PERL_EXECUTABLE} ${WEBCORE_DIR}/css/make-css-file-arrays.pl --defines "${FEATURE_DEFINES_WITH_SPACE_SEPARATOR}" --preprocessor "${CODE_GENERATOR_PREPROCESSOR}" ${WebKit2Gtk_DERIVED_SOURCES_DIR}/WebKitDirectoryInputStreamData.h ${WebKit2Gtk_DERIVED_SOURCES_DIR}/WebKitDirectoryInputStreamData.cpp ${WebKit_DirectoryInputStream_DATA}
VERBATIM
)
@@ -87,8 +87,8 @@
endif ()
set(WebKit2GTK_INSTALLED_HEADERS
- ${DERIVED_SOURCES_WEBKIT2GTK_API_DIR}/WebKitEnumTypes.h
- ${DERIVED_SOURCES_WEBKIT2GTK_API_DIR}/WebKitVersion.h
+ ${WebKit2Gtk_DERIVED_SOURCES_DIR}/webkit2/WebKitEnumTypes.h
+ ${WebKit2Gtk_DERIVED_SOURCES_DIR}/webkit2/WebKitVersion.h
${WEBKIT_DIR}/UIProcess/API/gtk${GTK_API_VERSION}/WebKitContextMenuItem.h
${WEBKIT_DIR}/UIProcess/API/gtk${GTK_API_VERSION}/WebKitInputMethodContext.h
${WEBKIT_DIR}/UIProcess/API/gtk${GTK_API_VERSION}/WebKitWebViewBase.h
@@ -162,7 +162,7 @@
)
set(WebKit2WebExtension_INSTALLED_HEADERS
- ${DERIVED_SOURCES_WEBKIT2GTK_API_DIR}/WebKitWebProcessEnumTypes.h
+ ${WebKit2Gtk_DERIVED_SOURCES_DIR}/webkit2/WebKitWebProcessEnumTypes.h
${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/WebKitConsoleMessage.h
${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/WebKitFrame.h
${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/WebKitScriptWorld.h
@@ -398,11 +398,11 @@
# This is necessary because of a conflict between the GTK+ API WebKitVersion.h and one generated by WebCore.
list(INSERT WebKit_INCLUDE_DIRECTORIES 0
- "${FORWARDING_HEADERS_WEBKIT2GTK_DIR}"
- "${FORWARDING_HEADERS_WEBKIT2GTK_VERSIONED_DIR}"
- "${FORWARDING_HEADERS_WEBKIT2GTK_EXTENSION_DIR}"
- "${DERIVED_SOURCES_WEBKIT2GTK_API_DIR}"
- "${DERIVED_SOURCES_WEBKIT2GTK_DIR}"
+ "${WebKit2Gtk_FRAMEWORK_HEADERS_DIR}"
+ "${WebKit2Gtk_FRAMEWORK_HEADERS_DIR}/webkit2gtk-${WEBKITGTK_API_VERSION}"
+ "${WebKit2Gtk_FRAMEWORK_HEADERS_DIR}/webkit2gtk-webextension"
+ "${WebKit2Gtk_DERIVED_SOURCES_DIR}/webkit2"
+ "${WebKit2Gtk_DERIVED_SOURCES_DIR}"
)
list(APPEND WebKit_INCLUDE_DIRECTORIES
@@ -528,32 +528,32 @@
# To generate WebKitEnumTypes.h we want to use all installed headers, except WebKitEnumTypes.h itself.
set(WebKit2GTK_ENUM_GENERATION_HEADERS ${WebKit2GTK_INSTALLED_HEADERS})
-list(REMOVE_ITEM WebKit2GTK_ENUM_GENERATION_HEADERS ${DERIVED_SOURCES_WEBKIT2GTK_API_DIR}/WebKitEnumTypes.h)
+list(REMOVE_ITEM WebKit2GTK_ENUM_GENERATION_HEADERS ${WebKit2Gtk_DERIVED_SOURCES_DIR}/webkit2/WebKitEnumTypes.h)
add_custom_command(
- OUTPUT ${DERIVED_SOURCES_WEBKIT2GTK_API_DIR}/WebKitEnumTypes.h
- ${DERIVED_SOURCES_WEBKIT2GTK_API_DIR}/WebKitEnumTypes.cpp
+ OUTPUT ${WebKit2Gtk_DERIVED_SOURCES_DIR}/webkit2/WebKitEnumTypes.h
+ ${WebKit2Gtk_DERIVED_SOURCES_DIR}/webkit2/WebKitEnumTypes.cpp
DEPENDS ${WebKit2GTK_ENUM_GENERATION_HEADERS}
- COMMAND glib-mkenums --template ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitEnumTypes.h.template ${WebKit2GTK_ENUM_GENERATION_HEADERS} | sed s/web_kit/webkit/ | sed s/WEBKIT_TYPE_KIT/WEBKIT_TYPE/ > ${DERIVED_SOURCES_WEBKIT2GTK_API_DIR}/WebKitEnumTypes.h
+ COMMAND glib-mkenums --template ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitEnumTypes.h.template ${WebKit2GTK_ENUM_GENERATION_HEADERS} | sed s/web_kit/webkit/ | sed s/WEBKIT_TYPE_KIT/WEBKIT_TYPE/ > ${WebKit2Gtk_DERIVED_SOURCES_DIR}/webkit2/WebKitEnumTypes.h
- 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
+ COMMAND glib-mkenums --template ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitEnumTypes.cpp.template ${WebKit2GTK_ENUM_GENERATION_HEADERS} | sed s/web_kit/webkit/ > ${WebKit2Gtk_DERIVED_SOURCES_DIR}/webkit2/WebKitEnumTypes.cpp
VERBATIM
)
set(WebKit2GTK_WEB_PROCESS_ENUM_GENERATION_HEADERS ${WebKit2WebExtension_INSTALLED_HEADERS})
-list(REMOVE_ITEM WebKit2GTK_WEB_PROCESS_ENUM_GENERATION_HEADERS ${DERIVED_SOURCES_WEBKIT2GTK_API_DIR}/WebKitWebProcessEnumTypes.h)
+list(REMOVE_ITEM WebKit2GTK_WEB_PROCESS_ENUM_GENERATION_HEADERS ${WebKit2Gtk_DERIVED_SOURCES_DIR}/webkit2/WebKitWebProcessEnumTypes.h)
add_custom_command(
- OUTPUT ${DERIVED_SOURCES_WEBKIT2GTK_API_DIR}/WebKitWebProcessEnumTypes.h
- ${DERIVED_SOURCES_WEBKIT2GTK_API_DIR}/WebKitWebProcessEnumTypes.cpp
+ OUTPUT ${WebKit2Gtk_DERIVED_SOURCES_DIR}/webkit2/WebKitWebProcessEnumTypes.h
+ ${WebKit2Gtk_DERIVED_SOURCES_DIR}/webkit2/WebKitWebProcessEnumTypes.cpp
DEPENDS ${WebKit2GTK_WEB_PROCESS_ENUM_GENERATION_HEADERS}
- COMMAND glib-mkenums --template ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/WebKitWebProcessEnumTypes.h.template ${WebKit2GTK_WEB_PROCESS_ENUM_GENERATION_HEADERS} | sed s/web_kit/webkit/ | sed s/WEBKIT_TYPE_KIT/WEBKIT_TYPE/ > ${DERIVED_SOURCES_WEBKIT2GTK_API_DIR}/WebKitWebProcessEnumTypes.h
+ COMMAND glib-mkenums --template ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/WebKitWebProcessEnumTypes.h.template ${WebKit2GTK_WEB_PROCESS_ENUM_GENERATION_HEADERS} | sed s/web_kit/webkit/ | sed s/WEBKIT_TYPE_KIT/WEBKIT_TYPE/ > ${WebKit2Gtk_DERIVED_SOURCES_DIR}/webkit2/WebKitWebProcessEnumTypes.h
- COMMAND glib-mkenums --template ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/WebKitWebProcessEnumTypes.cpp.template ${WebKit2GTK_WEB_PROCESS_ENUM_GENERATION_HEADERS} | sed s/web_kit/webkit/ > ${DERIVED_SOURCES_WEBKIT2GTK_API_DIR}/WebKitWebProcessEnumTypes.cpp
+ COMMAND glib-mkenums --template ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/WebKitWebProcessEnumTypes.cpp.template ${WebKit2GTK_WEB_PROCESS_ENUM_GENERATION_HEADERS} | sed s/web_kit/webkit/ > ${WebKit2Gtk_DERIVED_SOURCES_DIR}/webkit2/WebKitWebProcessEnumTypes.cpp
VERBATIM
)
-WEBKIT_BUILD_INSPECTOR_GRESOURCES(${DERIVED_SOURCES_WEBKIT2GTK_DIR})
+WEBKIT_BUILD_INSPECTOR_GRESOURCES(${WebKit2Gtk_DERIVED_SOURCES_DIR})
set(WebKitResources
" <file alias=\"css/gtk-theme.css\">gtk-theme.css</file>\n"
@@ -570,7 +570,7 @@
)
endif ()
-file(WRITE ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/WebKitResourcesGResourceBundle.xml
+file(WRITE ${WebKit2Gtk_DERIVED_SOURCES_DIR}/WebKitResourcesGResourceBundle.xml
"<?xml version=1.0 encoding=UTF-8?>\n"
"<gresources>\n"
" <gresource prefix=\"/org/webkitgtk/resources\">\n"
@@ -580,9 +580,9 @@
)
add_custom_command(
- OUTPUT ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/WebKitResourcesGResourceBundle.c
- DEPENDS ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/WebKitResourcesGResourceBundle.xml
- COMMAND glib-compile-resources --generate --sourcedir=${CMAKE_SOURCE_DIR}/Source/WebCore/Resources --sourcedir=${CMAKE_SOURCE_DIR}/Source/WebCore/platform/audio/resources --sourcedir=${CMAKE_SOURCE_DIR}/Source/WebKit/Resources/gtk --target=${DERIVED_SOURCES_WEBKIT2GTK_DIR}/WebKitResourcesGResourceBundle.c ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/WebKitResourcesGResourceBundle.xml
+ OUTPUT ${WebKit2Gtk_DERIVED_SOURCES_DIR}/WebKitResourcesGResourceBundle.c
+ DEPENDS ${WebKit2Gtk_DERIVED_SOURCES_DIR}/WebKitResourcesGResourceBundle.xml
+ COMMAND glib-compile-resources --generate --sourcedir=${CMAKE_SOURCE_DIR}/Source/WebCore/Resources --sourcedir=${CMAKE_SOURCE_DIR}/Source/WebCore/platform/audio/resources --sourcedir=${CMAKE_SOURCE_DIR}/Source/WebKit/Resources/gtk --target=${WebKit2Gtk_DERIVED_SOURCES_DIR}/WebKitResourcesGResourceBundle.c ${WebKit2Gtk_DERIVED_SOURCES_DIR}/WebKitResourcesGResourceBundle.xml
VERBATIM
)
@@ -589,27 +589,27 @@
if (ENABLE_WAYLAND_TARGET)
# Wayland protocol extension.
add_custom_command(
- OUTPUT ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/WebKitWaylandClientProtocol.c
+ OUTPUT ${WebKit2Gtk_DERIVED_SOURCES_DIR}/WebKitWaylandClientProtocol.c
DEPENDS ${WEBKIT_DIR}/Shared/gtk/WebKitWaylandProtocol.xml
- COMMAND ${WAYLAND_SCANNER} server-header ${WEBKIT_DIR}/Shared/gtk/WebKitWaylandProtocol.xml ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/WebKitWaylandServerProtocol.h
- COMMAND ${WAYLAND_SCANNER} client-header ${WEBKIT_DIR}/Shared/gtk/WebKitWaylandProtocol.xml ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/WebKitWaylandClientProtocol.h
- COMMAND ${WAYLAND_SCANNER} private-code ${WEBKIT_DIR}/Shared/gtk/WebKitWaylandProtocol.xml ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/WebKitWaylandClientProtocol.c
+ COMMAND ${WAYLAND_SCANNER} server-header ${WEBKIT_DIR}/Shared/gtk/WebKitWaylandProtocol.xml ${WebKit2Gtk_DERIVED_SOURCES_DIR}/WebKitWaylandServerProtocol.h
+ COMMAND ${WAYLAND_SCANNER} client-header ${WEBKIT_DIR}/Shared/gtk/WebKitWaylandProtocol.xml ${WebKit2Gtk_DERIVED_SOURCES_DIR}/WebKitWaylandClientProtocol.h
+ COMMAND ${WAYLAND_SCANNER} private-code ${WEBKIT_DIR}/Shared/gtk/WebKitWaylandProtocol.xml ${WebKit2Gtk_DERIVED_SOURCES_DIR}/WebKitWaylandClientProtocol.c
VERBATIM
)
add_custom_command(
- OUTPUT ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/pointer-constraints-unstable-v1-protocol.c
+ OUTPUT ${WebKit2Gtk_DERIVED_SOURCES_DIR}/pointer-constraints-unstable-v1-protocol.c
DEPENDS ${WAYLAND_PROTOCOLS_DATADIR}/unstable/pointer-constraints/pointer-constraints-unstable-v1.xml
- COMMAND ${WAYLAND_SCANNER} private-code ${WAYLAND_PROTOCOLS_DATADIR}/unstable/pointer-constraints/pointer-constraints-unstable-v1.xml ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/pointer-constraints-unstable-v1-protocol.c
- COMMAND ${WAYLAND_SCANNER} client-header ${WAYLAND_PROTOCOLS_DATADIR}/unstable/pointer-constraints/pointer-constraints-unstable-v1.xml ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/pointer-constraints-unstable-v1-client-protocol.h
+ COMMAND ${WAYLAND_SCANNER} private-code ${WAYLAND_PROTOCOLS_DATADIR}/unstable/pointer-constraints/pointer-constraints-unstable-v1.xml ${WebKit2Gtk_DERIVED_SOURCES_DIR}/pointer-constraints-unstable-v1-protocol.c
+ COMMAND ${WAYLAND_SCANNER} client-header ${WAYLAND_PROTOCOLS_DATADIR}/unstable/pointer-constraints/pointer-constraints-unstable-v1.xml ${WebKit2Gtk_DERIVED_SOURCES_DIR}/pointer-constraints-unstable-v1-client-protocol.h
VERBATIM
)
add_custom_command(
- OUTPUT ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/relative-pointer-unstable-v1-protocol.c
+ OUTPUT ${WebKit2Gtk_DERIVED_SOURCES_DIR}/relative-pointer-unstable-v1-protocol.c
DEPENDS ${WAYLAND_PROTOCOLS_DATADIR}/unstable/relative-pointer/relative-pointer-unstable-v1.xml
- COMMAND ${WAYLAND_SCANNER} private-code ${WAYLAND_PROTOCOLS_DATADIR}/unstable/relative-pointer/relative-pointer-unstable-v1.xml ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/relative-pointer-unstable-v1-protocol.c
- COMMAND ${WAYLAND_SCANNER} client-header ${WAYLAND_PROTOCOLS_DATADIR}/unstable/relative-pointer/relative-pointer-unstable-v1.xml ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/relative-pointer-unstable-v1-client-protocol.h
+ COMMAND ${WAYLAND_SCANNER} private-code ${WAYLAND_PROTOCOLS_DATADIR}/unstable/relative-pointer/relative-pointer-unstable-v1.xml ${WebKit2Gtk_DERIVED_SOURCES_DIR}/relative-pointer-unstable-v1-protocol.c
+ COMMAND ${WAYLAND_SCANNER} client-header ${WAYLAND_PROTOCOLS_DATADIR}/unstable/relative-pointer/relative-pointer-unstable-v1.xml ${WebKit2Gtk_DERIVED_SOURCES_DIR}/relative-pointer-unstable-v1-client-protocol.h
VERBATIM
)
endif ()
@@ -622,9 +622,9 @@
target_include_directories(webkit2gtkinjectedbundle PRIVATE
$<TARGET_PROPERTY:WebKit,INCLUDE_DIRECTORIES>
"${DERIVED_SOURCES_DIR}/InjectedBundle"
- "${FORWARDING_HEADERS_WEBKIT2GTK_DIR}"
- "${FORWARDING_HEADERS_WEBKIT2GTK_VERSIONED_DIR}"
- "${DERIVED_SOURCES_WEBKIT2GTK_API_DIR}"
+ "${WebKit2Gtk_FRAMEWORK_HEADERS_DIR}"
+ "${WebKit2Gtk_FRAMEWORK_HEADERS_DIR}/webkit2gtk-${WEBKITGTK_API_VERSION}"
+ "${WebKit2Gtk_DERIVED_SOURCES_DIR}/webkit2"
)
target_include_directories(webkit2gtkinjectedbundle SYSTEM PRIVATE
@@ -697,9 +697,9 @@
-DWEBKIT2_COMPILATION
-I${CMAKE_SOURCE_DIR}/Source
-I${WEBKIT_DIR}
- -I${DERIVED_SOURCES_WEBKIT2GTK_DIR}
- -I${FORWARDING_HEADERS_WEBKIT2GTK_DIR}
- -I${FORWARDING_HEADERS_WEBKIT2GTK_VERSIONED_DIR}
+ -I${WebKit2Gtk_DERIVED_SOURCES_DIR}
+ -I${WebKit2Gtk_FRAMEWORK_HEADERS_DIR}
+ -I${WebKit2Gtk_FRAMEWORK_HEADERS_DIR}/webkit2gtk-${WEBKITGTK_API_VERSION}
-I${_javascript_Core_FRAMEWORK_HEADERS_DIR}
-I${_javascript_CoreGLib_FRAMEWORK_HEADERS_DIR}
-I${_javascript_CoreGLib_DERIVED_SOURCES_DIR}
@@ -744,10 +744,10 @@
-DWEBKIT2_COMPILATION
-I${CMAKE_SOURCE_DIR}/Source
-I${WEBKIT_DIR}
- -I${DERIVED_SOURCES_WEBKIT2GTK_DIR}
- -I${FORWARDING_HEADERS_WEBKIT2GTK_DIR}
- -I${FORWARDING_HEADERS_WEBKIT2GTK_VERSIONED_DIR}
- -I${FORWARDING_HEADERS_WEBKIT2GTK_EXTENSION_DIR}
+ -I${WebKit2Gtk_DERIVED_SOURCES_DIR}
+ -I${WebKit2Gtk_FRAMEWORK_HEADERS_DIR}
+ -I${WebKit2Gtk_FRAMEWORK_HEADERS_DIR}/webkit2gtk-${WEBKITGTK_API_VERSION}
+ -I${WebKit2Gtk_FRAMEWORK_HEADERS_DIR}/webkit2gtk-webextension
-I${_javascript_Core_FRAMEWORK_HEADERS_DIR}
-I${_javascript_CoreGLib_FRAMEWORK_HEADERS_DIR}
-I${_javascript_CoreGLib_DERIVED_SOURCES_DIR}
@@ -823,9 +823,9 @@
" -I${WEBKIT_DIR}/Shared/API/glib\n"
" -I${WEBKIT_DIR}/UIProcess/API/glib\n"
" -I${WEBKIT_DIR}/UIProcess/API/gtk\n"
- " -I${DERIVED_SOURCES_WEBKIT2GTK_DIR}\n"
- " -I${FORWARDING_HEADERS_WEBKIT2GTK_DIR}\n"
- " -I${FORWARDING_HEADERS_WEBKIT2GTK_VERSIONED_DIR}\n"
+ " -I${WebKit2Gtk_DERIVED_SOURCES_DIR}\n"
+ " -I${WebKit2Gtk_FRAMEWORK_HEADERS_DIR}\n"
+ " -I${WebKit2Gtk_FRAMEWORK_HEADERS_DIR}/webkit2gtk-${WEBKITGTK_API_VERSION}\n"
"doc_dir=${WEBKIT_DIR}/UIProcess/API/gtk/docs\n"
"source_dirs=${WEBKIT_DIR}/Shared/API/glib\n"
" ${WEBKIT_DIR}/UIProcess/API/glib\n"
@@ -833,7 +833,7 @@
" ${WEBKIT_DIR}/UIProcess/API/gtk\n"
" ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/glib\n"
" ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk\n"
- " ${DERIVED_SOURCES_WEBKIT2GTK_API_DIR}\n"
+ " ${WebKit2Gtk_DERIVED_SOURCES_DIR}/webkit2\n"
"headers=${WebKit2GTK_ENUM_GENERATION_HEADERS} ${WebKit2WebExtension_INSTALLED_HEADERS}\n"
"main_sgml_file=webkit2gtk-docs.sgml\n"
)
@@ -846,9 +846,9 @@
"namespace=webkit_dom\n"
"cflags=-I${CMAKE_SOURCE_DIR}/Source\n"
" -I${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM\n"
- " -I${DERIVED_SOURCES_WEBKIT2GTK_DIR}\n"
- " -I${FORWARDING_HEADERS_WEBKIT2GTK_DIR}\n"
- " -I${FORWARDING_HEADERS_WEBKIT2GTK_VERSIONED_DIR}\n"
+ " -I${WebKit2Gtk_DERIVED_SOURCES_DIR}\n"
+ " -I${WebKit2Gtk_FRAMEWORK_HEADERS_DIR}\n"
+ " -I${WebKit2Gtk_FRAMEWORK_HEADERS_DIR}/webkit2gtk-${WEBKITGTK_API_VERSION}\n"
"doc_dir=${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/docs\n"
"source_dirs=${WEBKIT_DIR}/WebProcess/InjectedBundle/API/glib/DOM\n"
" ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM\n"
@@ -862,30 +862,30 @@
# These symbolic link allows includes like #include <webkit2/WebkitWebView.h> which simulates installed headers.
add_custom_command(
- OUTPUT ${FORWARDING_HEADERS_WEBKIT2GTK_DIR}/webkit2
+ OUTPUT ${WebKit2Gtk_FRAMEWORK_HEADERS_DIR}/webkit2
DEPENDS ${WEBKIT_DIR}/UIProcess/API/gtk
- COMMAND ln -n -s -f ${WEBKIT_DIR}/UIProcess/API/gtk ${FORWARDING_HEADERS_WEBKIT2GTK_DIR}/webkit2
+ COMMAND ln -n -s -f ${WEBKIT_DIR}/UIProcess/API/gtk ${WebKit2Gtk_FRAMEWORK_HEADERS_DIR}/webkit2
)
add_custom_command(
- OUTPUT ${FORWARDING_HEADERS_WEBKIT2GTK_VERSIONED_DIR}/webkit2
+ OUTPUT ${WebKit2Gtk_FRAMEWORK_HEADERS_DIR}/webkit2gtk-${WEBKITGTK_API_VERSION}/webkit2
DEPENDS ${WEBKIT_DIR}/UIProcess/API/gtk${GTK_API_VERSION}
- COMMAND ln -n -s -f ${WEBKIT_DIR}/UIProcess/API/gtk${GTK_API_VERSION} ${FORWARDING_HEADERS_WEBKIT2GTK_VERSIONED_DIR}/webkit2
+ COMMAND ln -n -s -f ${WEBKIT_DIR}/UIProcess/API/gtk${GTK_API_VERSION} ${WebKit2Gtk_FRAMEWORK_HEADERS_DIR}/webkit2gtk-${WEBKITGTK_API_VERSION}/webkit2
)
add_custom_command(
- OUTPUT ${FORWARDING_HEADERS_WEBKIT2GTK_EXTENSION_DIR}/webkit2
+ OUTPUT ${WebKit2Gtk_FRAMEWORK_HEADERS_DIR}/webkit2gtk-webextension/webkit2
DEPENDS ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk
- COMMAND ln -n -s -f ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk ${FORWARDING_HEADERS_WEBKIT2GTK_EXTENSION_DIR}/webkit2
+ COMMAND ln -n -s -f ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk ${WebKit2Gtk_FRAMEWORK_HEADERS_DIR}/webkit2gtk-webextension/webkit2
)
add_custom_command(
- OUTPUT ${FORWARDING_HEADERS_WEBKIT2GTK_EXTENSION_DIR}/webkitdom
+ OUTPUT ${WebKit2Gtk_FRAMEWORK_HEADERS_DIR}/webkit2gtk-webextension/webkitdom
DEPENDS ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM
- COMMAND ln -n -s -f ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM ${FORWARDING_HEADERS_WEBKIT2GTK_EXTENSION_DIR}/webkitdom
+ COMMAND ln -n -s -f ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM ${WebKit2Gtk_FRAMEWORK_HEADERS_DIR}/webkit2gtk-webextension/webkitdom
)
add_custom_target(WebKit-fake-api-headers
- DEPENDS ${FORWARDING_HEADERS_WEBKIT2GTK_DIR}/webkit2
- ${FORWARDING_HEADERS_WEBKIT2GTK_VERSIONED_DIR}/webkit2
- ${FORWARDING_HEADERS_WEBKIT2GTK_EXTENSION_DIR}/webkit2
- ${FORWARDING_HEADERS_WEBKIT2GTK_EXTENSION_DIR}/webkitdom
+ DEPENDS ${WebKit2Gtk_FRAMEWORK_HEADERS_DIR}/webkit2
+ ${WebKit2Gtk_FRAMEWORK_HEADERS_DIR}/webkit2gtk-${WEBKITGTK_API_VERSION}/webkit2
+ ${WebKit2Gtk_FRAMEWORK_HEADERS_DIR}/webkit2gtk-webextension/webkit2
+ ${WebKit2Gtk_FRAMEWORK_HEADERS_DIR}/webkit2gtk-webextension/webkitdom
)
list(APPEND WebKit_DEPENDENCIES
Modified: trunk/Source/cmake/OptionsGTK.cmake (276644 => 276645)
--- trunk/Source/cmake/OptionsGTK.cmake 2021-04-27 17:08:25 UTC (rev 276644)
+++ trunk/Source/cmake/OptionsGTK.cmake 2021-04-27 17:18:16 UTC (rev 276645)
@@ -483,17 +483,10 @@
# Using DERIVED_SOURCES_DIR is deprecated
set(DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/DerivedSources")
-set(DERIVED_SOURCES_WEBKITGTK_DIR ${DERIVED_SOURCES_DIR}/webkitgtk)
-set(DERIVED_SOURCES_WEBKITGTK_API_DIR ${DERIVED_SOURCES_WEBKITGTK_DIR}/webkit)
-set(DERIVED_SOURCES_WEBKIT2GTK_DIR ${DERIVED_SOURCES_DIR}/webkit2gtk)
-set(DERIVED_SOURCES_WEBKIT2GTK_API_DIR ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/webkit2)
set(DERIVED_SOURCES_WPETOOLINGBACKENDS_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WPEToolingBackends")
# Using FORWARDING_HEADERS_DIR is deprecated
set(FORWARDING_HEADERS_DIR ${DERIVED_SOURCES_DIR}/ForwardingHeaders)
-set(FORWARDING_HEADERS_WEBKIT2GTK_DIR ${FORWARDING_HEADERS_DIR}/webkit2gtk)
-set(FORWARDING_HEADERS_WEBKIT2GTK_VERSIONED_DIR ${FORWARDING_HEADERS_DIR}/webkit2gtk-${WEBKITGTK_API_VERSION})
-set(FORWARDING_HEADERS_WEBKIT2GTK_EXTENSION_DIR ${FORWARDING_HEADERS_DIR}/webkit2gtk-webextension)
# FIXME: Remove in https://bugs.webkit.org/show_bug.cgi?id=210891
set(WebKit_FRAMEWORK_HEADERS_DIR ${FORWARDING_HEADERS_DIR})
@@ -503,6 +496,9 @@
set(_javascript_CoreGLib_FRAMEWORK_HEADERS_DIR "${CMAKE_BINARY_DIR}/_javascript_CoreGLib/Headers")
set(_javascript_CoreGLib_DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/_javascript_CoreGLib/DerivedSources")
+set(WebKit2Gtk_FRAMEWORK_HEADERS_DIR "${CMAKE_BINARY_DIR}/WebKit2Gtk/Headers")
+set(WebKit2Gtk_DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/WebKit2Gtk/DerivedSources")
+
set(_javascript_Core_PKGCONFIG_FILE ${CMAKE_BINARY_DIR}/Source/_javascript_Core/_javascript_coregtk-${WEBKITGTK_API_VERSION}.pc)
set(WebKit2_PKGCONFIG_FILE ${CMAKE_BINARY_DIR}/Source/WebKit/webkit2gtk-${WEBKITGTK_API_VERSION}.pc)
set(WebKit2WebExtension_PKGCONFIG_FILE ${CMAKE_BINARY_DIR}/Source/WebKit/webkit2gtk-web-extension-${WEBKITGTK_API_VERSION}.pc)
Modified: trunk/Tools/ChangeLog (276644 => 276645)
--- trunk/Tools/ChangeLog 2021-04-27 17:08:25 UTC (rev 276644)
+++ trunk/Tools/ChangeLog 2021-04-27 17:18:16 UTC (rev 276645)
@@ -1,3 +1,16 @@
+2021-04-27 Don Olmstead <[email protected]>
+
+ [CMake] Don't use FORWARDING_HEADERS_DIR for GTK WebKit headers
+ https://bugs.webkit.org/show_bug.cgi?id=225006
+
+ Reviewed by Michael Catanzaro.
+
+ Use WebKit2Gtk_FRAMEWORK_HEADERS_DIR and WebKit2Gtk_DERIVED_SOURCES_DIR for WebKit2 GTK
+ headers instead of FORWARDING_HEADERS_DIR and DERIVED_SOURCES_DIR.
+
+ * MiniBrowser/gtk/CMakeLists.txt:
+ * TestWebKitAPI/glib/PlatformGTK.cmake:
+
2021-04-27 Aakash Jain <[email protected]>
Rename slave to worker in TestFailures
Modified: trunk/Tools/MiniBrowser/gtk/CMakeLists.txt (276644 => 276645)
--- trunk/Tools/MiniBrowser/gtk/CMakeLists.txt 2021-04-27 17:08:25 UTC (rev 276644)
+++ trunk/Tools/MiniBrowser/gtk/CMakeLists.txt 2021-04-27 17:18:16 UTC (rev 276645)
@@ -22,9 +22,9 @@
set(MiniBrowser_PRIVATE_INCLUDE_DIRECTORIES
${CMAKE_BINARY_DIR}
${MiniBrowser_DERIVED_SOURCES_DIR}
- ${DERIVED_SOURCES_WEBKIT2GTK_DIR}
- ${FORWARDING_HEADERS_WEBKIT2GTK_DIR}
- ${FORWARDING_HEADERS_WEBKIT2GTK_VERSIONED_DIR}
+ ${WebKit2Gtk_DERIVED_SOURCES_DIR}
+ ${WebKit2Gtk_FRAMEWORK_HEADERS_DIR}
+ ${WebKit2Gtk_FRAMEWORK_HEADERS_DIR}/webkit2gtk-${WEBKITGTK_API_VERSION}
${CMAKE_SOURCE_DIR}/Source
)
Modified: trunk/Tools/TestWebKitAPI/glib/PlatformGTK.cmake (276644 => 276645)
--- trunk/Tools/TestWebKitAPI/glib/PlatformGTK.cmake 2021-04-27 17:08:25 UTC (rev 276644)
+++ trunk/Tools/TestWebKitAPI/glib/PlatformGTK.cmake 2021-04-27 17:18:16 UTC (rev 276645)
@@ -6,10 +6,10 @@
)
list(APPEND WebKitGLibAPITests_INCLUDE_DIRECTORIES
- ${DERIVED_SOURCES_WEBKIT2GTK_DIR}
- ${FORWARDING_HEADERS_WEBKIT2GTK_DIR}
- ${FORWARDING_HEADERS_WEBKIT2GTK_VERSIONED_DIR}
- ${FORWARDING_HEADERS_WEBKIT2GTK_EXTENSION_DIR}
+ ${WebKit2Gtk_DERIVED_SOURCES_DIR}
+ ${WebKit2Gtk_FRAMEWORK_HEADERS_DIR}
+ ${WebKit2Gtk_FRAMEWORK_HEADERS_DIR}/webkit2gtk-${WEBKITGTK_API_VERSION}
+ ${WebKit2Gtk_FRAMEWORK_HEADERS_DIR}/webkit2gtk-webextension
)
list(APPEND WebKitGLibAPITests_SYSTEM_INCLUDE_DIRECTORIES
