Diff
Modified: trunk/ChangeLog (273813 => 273814)
--- trunk/ChangeLog 2021-03-03 12:20:00 UTC (rev 273813)
+++ trunk/ChangeLog 2021-03-03 16:02:09 UTC (rev 273814)
@@ -1,3 +1,15 @@
+2021-03-03 Don Olmstead <[email protected]>
+
+ [CMake] _javascript_Core GLib headers should be copies
+ https://bugs.webkit.org/show_bug.cgi?id=222625
+
+ Reviewed by Michael Catanzaro.
+
+ Specify the directories for _javascript_Core GLib headers and derived sources.
+
+ * Source/cmake/OptionsGTK.cmake:
+ * Source/cmake/OptionsWPE.cmake:
+
2021-03-01 Per Arne <[email protected]>
[Win] Fix build failure
Modified: trunk/Source/_javascript_Core/API/glib/JSCClassPrivate.h (273813 => 273814)
--- trunk/Source/_javascript_Core/API/glib/JSCClassPrivate.h 2021-03-03 12:20:00 UTC (rev 273813)
+++ trunk/Source/_javascript_Core/API/glib/JSCClassPrivate.h 2021-03-03 16:02:09 UTC (rev 273814)
@@ -19,12 +19,18 @@
#pragma once
-#include "APICast.h"
-#include "JSCClass.h"
-#include "JSCContext.h"
-#include "JSCValue.h"
+#include <jsc/JSCClass.h>
+#include <jsc/JSCContext.h>
+#include <jsc/JSCValue.h>
#include <wtf/glib/GRefPtr.h>
+namespace JSC {
+class JSObject;
+}
+
+typedef struct OpaqueJSClass* JSClassRef;
+typedef struct OpaqueJSContext* JSGlobalContextRef;
+
GRefPtr<JSCClass> jscClassCreate(JSCContext*, const char*, JSCClass*, JSCClassVTable*, GDestroyNotify);
JSClassRef jscClassGetJSClass(JSCClass*);
JSC::JSObject* jscClassGetOrCreateJSWrapper(JSCClass*, JSCContext*, gpointer);
Modified: trunk/Source/_javascript_Core/API/glib/JSCContext.cpp (273813 => 273814)
--- trunk/Source/_javascript_Core/API/glib/JSCContext.cpp 2021-03-03 12:20:00 UTC (rev 273813)
+++ trunk/Source/_javascript_Core/API/glib/JSCContext.cpp 2021-03-03 16:02:09 UTC (rev 273814)
@@ -20,6 +20,7 @@
#include "config.h"
#include "JSCContext.h"
+#include "APICast.h"
#include "JSCClassPrivate.h"
#include "JSCContextPrivate.h"
#include "JSCExceptionPrivate.h"
Modified: trunk/Source/_javascript_Core/API/glib/JSCContextPrivate.h (273813 => 273814)
--- trunk/Source/_javascript_Core/API/glib/JSCContextPrivate.h 2021-03-03 12:20:00 UTC (rev 273813)
+++ trunk/Source/_javascript_Core/API/glib/JSCContextPrivate.h 2021-03-03 16:02:09 UTC (rev 273814)
@@ -19,12 +19,19 @@
#pragma once
-#include "APICast.h"
-#include "JSCContext.h"
-#include "JSCValue.h"
-#include "JSContextRef.h"
+#include <jsc/JSCContext.h>
+#include <jsc/JSCValue.h>
#include <wtf/glib/GRefPtr.h>
+namespace JSC {
+class JSObject;
+}
+
+typedef struct OpaqueJSClass* JSClassRef;
+typedef struct OpaqueJSContext* JSGlobalContextRef;
+typedef const struct OpaqueJSValue* JSValueRef;
+typedef struct OpaqueJSValue* JSObjectRef;
+
JS_EXPORT_PRIVATE GRefPtr<JSCContext> jscContextGetOrCreate(JSGlobalContextRef);
JS_EXPORT_PRIVATE JSGlobalContextRef jscContextGetJSContext(JSCContext*);
JS_EXPORT_PRIVATE GRefPtr<JSCValue> jscContextGetOrCreateValue(JSCContext*, JSValueRef);
Modified: trunk/Source/_javascript_Core/API/glib/JSCExceptionPrivate.h (273813 => 273814)
--- trunk/Source/_javascript_Core/API/glib/JSCExceptionPrivate.h 2021-03-03 12:20:00 UTC (rev 273813)
+++ trunk/Source/_javascript_Core/API/glib/JSCExceptionPrivate.h 2021-03-03 16:02:09 UTC (rev 273814)
@@ -19,8 +19,8 @@
#pragma once
-#include "JSCContext.h"
-#include "JSCException.h"
+#include <jsc/JSCContext.h>
+#include <jsc/JSCException.h>
#include <wtf/glib/GRefPtr.h>
GRefPtr<JSCException> jscExceptionCreate(JSCContext*, JSValueRef);
Modified: trunk/Source/_javascript_Core/API/glib/JSCValuePrivate.h (273813 => 273814)
--- trunk/Source/_javascript_Core/API/glib/JSCValuePrivate.h 2021-03-03 12:20:00 UTC (rev 273813)
+++ trunk/Source/_javascript_Core/API/glib/JSCValuePrivate.h 2021-03-03 16:02:09 UTC (rev 273814)
@@ -19,7 +19,7 @@
#pragma once
-#include "JSCValue.h"
+#include <jsc/JSCValue.h>
JS_EXPORT_PRIVATE JSValueRef jscValueGetJSValue(JSCValue*);
JSCValue* jscValueCreate(JSCContext*, JSValueRef);
Modified: trunk/Source/_javascript_Core/API/glib/JSCVirtualMachine.cpp (273813 => 273814)
--- trunk/Source/_javascript_Core/API/glib/JSCVirtualMachine.cpp 2021-03-03 12:20:00 UTC (rev 273813)
+++ trunk/Source/_javascript_Core/API/glib/JSCVirtualMachine.cpp 2021-03-03 16:02:09 UTC (rev 273814)
@@ -22,6 +22,7 @@
#include "JSCContextPrivate.h"
#include "JSCVirtualMachinePrivate.h"
+#include "JSContextRef.h"
#include <wtf/HashMap.h>
#include <wtf/NeverDestroyed.h>
#include <wtf/glib/WTFGType.h>
Modified: trunk/Source/_javascript_Core/API/glib/JSCVirtualMachinePrivate.h (273813 => 273814)
--- trunk/Source/_javascript_Core/API/glib/JSCVirtualMachinePrivate.h 2021-03-03 12:20:00 UTC (rev 273813)
+++ trunk/Source/_javascript_Core/API/glib/JSCVirtualMachinePrivate.h 2021-03-03 16:02:09 UTC (rev 273814)
@@ -19,10 +19,12 @@
#pragma once
-#include "JSCContext.h"
-#include "JSCVirtualMachine.h"
+#include <jsc/JSCContext.h>
+#include <jsc/JSCVirtualMachine.h>
#include <wtf/glib/GRefPtr.h>
+typedef const struct OpaqueJSContextGroup* JSContextGroupRef;
+
GRefPtr<JSCVirtualMachine> jscVirtualMachineGetOrCreate(JSContextGroupRef);
JSContextGroupRef jscVirtualMachineGetContextGroup(JSCVirtualMachine*);
void jscVirtualMachineAddContext(JSCVirtualMachine*, JSCContext*);
Modified: trunk/Source/_javascript_Core/API/glib/JSCWrapperMap.cpp (273813 => 273814)
--- trunk/Source/_javascript_Core/API/glib/JSCWrapperMap.cpp 2021-03-03 12:20:00 UTC (rev 273813)
+++ trunk/Source/_javascript_Core/API/glib/JSCWrapperMap.cpp 2021-03-03 16:02:09 UTC (rev 273814)
@@ -29,6 +29,7 @@
#include "JSCInlines.h"
#include "JSCValuePrivate.h"
#include "JSCallbackObject.h"
+#include "JSContextRef.h"
namespace JSC {
Modified: trunk/Source/_javascript_Core/ChangeLog (273813 => 273814)
--- trunk/Source/_javascript_Core/ChangeLog 2021-03-03 12:20:00 UTC (rev 273813)
+++ trunk/Source/_javascript_Core/ChangeLog 2021-03-03 16:02:09 UTC (rev 273814)
@@ -1,3 +1,34 @@
+2021-03-03 Don Olmstead <[email protected]>
+
+ [CMake] _javascript_Core GLib headers should be copies
+ https://bugs.webkit.org/show_bug.cgi?id=222625
+
+ Reviewed by Michael Catanzaro.
+
+ Copy the headers rather than creating a symbolic link to structure the _javascript_Core Glib
+ headers into a jsc directory. This follows the convention used in _javascript_Core where
+ there are public and private headers.
+
+ The public _javascript_Core GLib headers are copied before building _javascript_Core. The
+ private _javascript_Core were modified to include the public GLib headers through
+ <jsc/Header.h> rather than "Header.h" which is convention for the private C APIs in
+ _javascript_Core.
+
+ APICast.h was being erroneously included in JSCClassPrivate.h because its not a
+ _javascript_Core GLib header. Instead forward declarations were added to the private headers
+ and APICast.h was used as necessary in the .cpp files.
+
+ * API/glib/JSCClassPrivate.h:
+ * API/glib/JSCContext.cpp:
+ * API/glib/JSCContextPrivate.h:
+ * API/glib/JSCExceptionPrivate.h:
+ * API/glib/JSCValuePrivate.h:
+ * API/glib/JSCVirtualMachine.cpp:
+ * API/glib/JSCVirtualMachinePrivate.h:
+ * API/glib/JSCWrapperMap.cpp:
+ * GLib.cmake:
+ * PlatformGTK.cmake:
+
2021-03-03 Dmitry Bezhetskov <[email protected]>
[WASM-Function-References] Extend wasm type with type index
Modified: trunk/Source/_javascript_Core/GLib.cmake (273813 => 273814)
--- trunk/Source/_javascript_Core/GLib.cmake 2021-03-03 12:20:00 UTC (rev 273813)
+++ trunk/Source/_javascript_Core/GLib.cmake 2021-03-03 16:02:09 UTC (rev 273814)
@@ -1,6 +1,3 @@
-file(MAKE_DIRECTORY ${FORWARDING_HEADERS_DIR}/_javascript_Core/glib)
-file(MAKE_DIRECTORY ${DERIVED_SOURCES_JAVASCRIPCORE_GLIB_API_DIR})
-
list(APPEND _javascript_Core_SOURCES
API/glib/JSAPIWrapperGlobalObject.cpp
API/glib/JSAPIWrapperObjectGLib.cpp
@@ -16,14 +13,60 @@
API/glib/JSCWrapperMap.cpp
)
+list(APPEND _javascript_Core_INCLUDE_DIRECTORIES
+ "${_javascript_CoreGLib_FRAMEWORK_HEADERS_DIR}"
+)
+
list(APPEND _javascript_Core_PRIVATE_INCLUDE_DIRECTORIES
- "${FORWARDING_HEADERS_DIR}/_javascript_Core/glib"
- "${DERIVED_SOURCES_JAVASCRIPCORE_GLIB_API_DIR}"
+ "${_javascript_CoreGLib_DERIVED_SOURCES_DIR}"
"${_javascript_CORE_DIR}/API/glib"
)
+configure_file(API/glib/JSCVersion.h.in ${_javascript_CoreGLib_DERIVED_SOURCES_DIR}/JSCVersion.h)
+
+set(_javascript_CoreGLib_FRAMEWORK_HEADERS
+ ${_javascript_CoreGLib_DERIVED_SOURCES_DIR}/JSCVersion.h
+
+ API/glib/JSCAutocleanups.h
+ API/glib/JSCClass.h
+ API/glib/JSCContext.h
+ API/glib/JSCDefines.h
+ API/glib/JSCException.h
+ API/glib/JSCOptions.h
+ API/glib/JSCValue.h
+ API/glib/JSCVirtualMachine.h
+ API/glib/JSCWeakValue.h
+ API/glib/jsc.h
+)
+
+WEBKIT_COPY_FILES(_javascript_CoreGLib_CopyHeaders
+ DESTINATION ${_javascript_CoreGLib_FRAMEWORK_HEADERS_DIR}/jsc
+ FILES ${_javascript_CoreGLib_FRAMEWORK_HEADERS}
+ FLATTENED
+)
+list(APPEND _javascript_Core_DEPENDENCIES _javascript_CoreGLib_CopyHeaders)
+
+set(_javascript_CoreGLib_PRIVATE_FRAMEWORK_HEADERS
+ API/glib/JSCContextPrivate.h
+ API/glib/JSCValuePrivate.h
+)
+WEBKIT_COPY_FILES(_javascript_CoreGLib_CopyPrivateHeaders
+ DESTINATION ${_javascript_CoreGLib_PRIVATE_FRAMEWORK_HEADERS_DIR}/jsc
+ FILES ${_javascript_CoreGLib_PRIVATE_FRAMEWORK_HEADERS}
+ FLATTENED
+)
+
+list(APPEND _javascript_Core_INTERFACE_INCLUDE_DIRECTORIES
+ ${_javascript_CoreGLib_FRAMEWORK_HEADERS_DIR}
+ ${_javascript_CoreGLib_PRIVATE_FRAMEWORK_HEADERS_DIR}
+)
+list(APPEND _javascript_Core_INTERFACE_DEPENDENCIES
+ _javascript_CoreGLib_CopyHeaders
+ _javascript_CoreGLib_CopyPrivateHeaders
+)
+
set(_javascript_Core_INSTALLED_HEADERS
- ${DERIVED_SOURCES_JAVASCRIPCORE_GLIB_API_DIR}/JSCVersion.h
+ ${_javascript_CoreGLib_DERIVED_SOURCES_DIR}/JSCVersion.h
${_javascript_CORE_DIR}/API/glib/JSCAutocleanups.h
${_javascript_CORE_DIR}/API/glib/JSCClass.h
${_javascript_CORE_DIR}/API/glib/JSCContext.h
@@ -35,19 +78,3 @@
${_javascript_CORE_DIR}/API/glib/JSCWeakValue.h
${_javascript_CORE_DIR}/API/glib/jsc.h
)
-
-configure_file(API/glib/JSCVersion.h.in ${DERIVED_SOURCES_JAVASCRIPCORE_GLIB_API_DIR}/JSCVersion.h)
-
-# These symbolic link allows includes like #include <jsc/jsc.h> which simulates installed headers.
-add_custom_command(
- OUTPUT ${FORWARDING_HEADERS_DIR}/_javascript_Core/glib/jsc
- DEPENDS ${_javascript_CORE_DIR}/API/glib
- COMMAND ln -n -s -f ${_javascript_CORE_DIR}/API/glib ${FORWARDING_HEADERS_DIR}/_javascript_Core/glib/jsc
- VERBATIM
-)
-add_custom_target(JSC-fake-api-headers
- DEPENDS ${FORWARDING_HEADERS_DIR}/_javascript_Core/glib/jsc
-)
-set(_javascript_Core_EXTRA_DEPENDENCIES
- JSC-fake-api-headers
-)
Modified: trunk/Source/_javascript_Core/PlatformGTK.cmake (273813 => 273814)
--- trunk/Source/_javascript_Core/PlatformGTK.cmake 2021-03-03 12:20:00 UTC (rev 273813)
+++ trunk/Source/_javascript_Core/PlatformGTK.cmake 2021-03-03 16:02:09 UTC (rev 273814)
@@ -3,10 +3,6 @@
set(_javascript_Core_OUTPUT_NAME _javascript_coregtk-${WEBKITGTK_API_VERSION})
-list(APPEND _javascript_Core_PRIVATE_INCLUDE_DIRECTORIES
- "${DERIVED_SOURCES_JAVASCRIPCOREGTK_DIR}"
-)
-
configure_file(_javascript_coregtk.pc.in ${_javascript_Core_PKGCONFIG_FILE} @ONLY)
install(FILES "${CMAKE_BINARY_DIR}/Source/_javascript_Core/_javascript_coregtk-${WEBKITGTK_API_VERSION}.pc"
@@ -87,8 +83,8 @@
-DJSC_COMPILATION
-I${CMAKE_SOURCE_DIR}/Source
-I${_javascript_CORE_DIR}
- -I${DERIVED_SOURCES_JAVASCRIPCOREGTK_DIR}
- -I${FORWARDING_HEADERS_DIR}/_javascript_Core/glib
+ -I${_javascript_CoreGLib_FRAMEWORK_HEADERS_DIR}
+ -I${_javascript_CoreGLib_PRIVATE_FRAMEWORK_HEADERS_DIR}
${_javascript_Core_INSTALLED_HEADERS}
${_javascript_CORE_DIR}/API/glib/*.cpp
)
@@ -111,8 +107,8 @@
"namespace=jsc\n"
"cflags=-I${CMAKE_SOURCE_DIR}/Source\n"
" -I${_javascript_CORE_DIR}/API/glib\n"
- " -I${DERIVED_SOURCES_JAVASCRIPCOREGTK_DIR}\n"
- " -I${FORWARDING_HEADERS_DIR}/_javascript_Core/glib\n"
+ " -I${_javascript_CoreGLib_FRAMEWORK_HEADERS_DIR}\n"
+ " -I${_javascript_CoreGLib_PRIVATE_FRAMEWORK_HEADERS_DIR}\n"
"doc_dir=${_javascript_CORE_DIR}/API/glib/docs\n"
"source_dirs=${_javascript_CORE_DIR}/API/glib\n"
"headers=${_javascript_Core_INSTALLED_HEADERS}\n"
Modified: trunk/Source/WebKit/ChangeLog (273813 => 273814)
--- trunk/Source/WebKit/ChangeLog 2021-03-03 12:20:00 UTC (rev 273813)
+++ trunk/Source/WebKit/ChangeLog 2021-03-03 16:02:09 UTC (rev 273814)
@@ -1,3 +1,17 @@
+2021-03-03 Don Olmstead <[email protected]>
+
+ [CMake] _javascript_Core GLib headers should be copies
+ https://bugs.webkit.org/show_bug.cgi?id=222625
+
+ Reviewed by Michael Catanzaro.
+
+ Update the includes for the GLib ports.
+
+ * PlatformGTK.cmake:
+ * PlatformWPE.cmake:
+ * WebProcess/InjectedBundle/API/glib/DOM/WebKitDOMNode.cpp:
+ * WebProcess/InjectedBundle/API/glib/WebKitFrame.cpp:
+
2021-03-02 Myles C. Maxfield <[email protected]>
REGRESSION(r270691): It's impossible to use MobileAsset fonts on macOS
Modified: trunk/Source/WebKit/PlatformGTK.cmake (273813 => 273814)
--- trunk/Source/WebKit/PlatformGTK.cmake 2021-03-03 12:20:00 UTC (rev 273813)
+++ trunk/Source/WebKit/PlatformGTK.cmake 2021-03-03 16:02:09 UTC (rev 273814)
@@ -406,9 +406,6 @@
)
list(APPEND WebKit_INCLUDE_DIRECTORIES
- "${DERIVED_SOURCES_JAVASCRIPCOREGTK_DIR}"
- "${FORWARDING_HEADERS_DIR}/_javascript_Core/"
- "${FORWARDING_HEADERS_DIR}/_javascript_Core/glib"
"${WEBKIT_DIR}/NetworkProcess/glib"
"${WEBKIT_DIR}/NetworkProcess/gtk"
"${WEBKIT_DIR}/NetworkProcess/soup"
@@ -704,9 +701,9 @@
-I${WEBKIT_DIR}
-I${DERIVED_SOURCES_DIR}
-I${DERIVED_SOURCES_WEBKIT2GTK_DIR}
- -I${DERIVED_SOURCES_JAVASCRIPCOREGTK_DIR}
+ -I${_javascript_CoreGLib_FRAMEWORK_HEADERS_DIR}
+ -I${_javascript_CoreGLib_PRIVATE_FRAMEWORK_HEADERS_DIR}
-I${FORWARDING_HEADERS_DIR}
- -I${FORWARDING_HEADERS_DIR}/_javascript_Core/glib
-I${FORWARDING_HEADERS_WEBKIT2GTK_DIR}
-I${FORWARDING_HEADERS_WEBKIT2GTK_VERSIONED_DIR}
${WebKit2GTK_INSTALLED_HEADERS}
@@ -752,9 +749,9 @@
-I${WEBKIT_DIR}
-I${DERIVED_SOURCES_DIR}
-I${DERIVED_SOURCES_WEBKIT2GTK_DIR}
- -I${DERIVED_SOURCES_JAVASCRIPCOREGTK_DIR}
+ -I${_javascript_CoreGLib_FRAMEWORK_HEADERS_DIR}
+ -I${_javascript_CoreGLib_PRIVATE_FRAMEWORK_HEADERS_DIR}
-I${FORWARDING_HEADERS_DIR}
- -I${FORWARDING_HEADERS_DIR}/_javascript_Core/glib
-I${FORWARDING_HEADERS_WEBKIT2GTK_DIR}
-I${FORWARDING_HEADERS_WEBKIT2GTK_VERSIONED_DIR}
-I${FORWARDING_HEADERS_WEBKIT2GTK_EXTENSION_DIR}
Modified: trunk/Source/WebKit/PlatformWPE.cmake (273813 => 273814)
--- trunk/Source/WebKit/PlatformWPE.cmake 2021-03-03 12:20:00 UTC (rev 273813)
+++ trunk/Source/WebKit/PlatformWPE.cmake 2021-03-03 16:02:09 UTC (rev 273814)
@@ -10,7 +10,6 @@
file(MAKE_DIRECTORY ${FORWARDING_HEADERS_WPE_DIR})
file(MAKE_DIRECTORY ${FORWARDING_HEADERS_WPE_EXTENSION_DIR})
file(MAKE_DIRECTORY ${FORWARDING_HEADERS_WPE_DOM_DIR})
-file(MAKE_DIRECTORY ${FORWARDING_HEADERS_WPE_JSC_DIR})
configure_file(UIProcess/API/wpe/WebKitVersion.h.in ${DERIVED_SOURCES_WPE_API_DIR}/WebKitVersion.h)
configure_file(wpe/wpe-webkit.pc.in ${WPE_PKGCONFIG_FILE} @ONLY)
@@ -56,18 +55,10 @@
VERBATIM
)
-add_custom_command(
- OUTPUT ${FORWARDING_HEADERS_WPE_JSC_DIR}/jsc
- DEPENDS ${_javascript_CORE_DIR}/API/glib/
- COMMAND ln -n -s -f ${_javascript_CORE_DIR}/API/glib ${FORWARDING_HEADERS_WPE_JSC_DIR}/jsc
- VERBATIM
-)
-
add_custom_target(webkitwpe-fake-api-headers
DEPENDS ${FORWARDING_HEADERS_WPE_DIR}/wpe
${FORWARDING_HEADERS_WPE_EXTENSION_DIR}/wpe
${FORWARDING_HEADERS_WPE_DOM_DIR}/wpe
- ${FORWARDING_HEADERS_WPE_JSC_DIR}/jsc
)
list(APPEND WebKit_DEPENDENCIES
@@ -255,14 +246,9 @@
)
list(APPEND WebKit_INCLUDE_DIRECTORIES
- "${DERIVED_SOURCES_JAVASCRIPCOREWPE_DIR}"
- "${FORWARDING_HEADERS_DIR}"
- "${FORWARDING_HEADERS_DIR}/_javascript_Core/"
- "${FORWARDING_HEADERS_DIR}/_javascript_Core/glib"
"${FORWARDING_HEADERS_WPE_DIR}"
"${FORWARDING_HEADERS_WPE_EXTENSION_DIR}"
"${FORWARDING_HEADERS_WPE_DOM_DIR}"
- "${DERIVED_SOURCES_DIR}"
"${DERIVED_SOURCES_WPE_API_DIR}"
"${WEBKIT_DIR}/NetworkProcess/glib"
"${WEBKIT_DIR}/NetworkProcess/soup"
@@ -298,9 +284,6 @@
"${WEBKIT_DIR}/WebProcess/WebPage/atk"
"${WEBKIT_DIR}/WebProcess/WebPage/libwpe"
"${WEBKIT_DIR}/WebProcess/WebPage/wpe"
- "${WTF_DIR}/wtf/gtk/"
- "${WTF_DIR}/wtf/gobject"
- "${WTF_DIR}"
)
list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES
@@ -445,12 +428,13 @@
set(qtwpe_INCLUDE_DIRECTORIES
${CMAKE_BINARY_DIR}
${GLIB_INCLUDE_DIRS}
- ${Qt5_INCLUDE_DIRS}
- ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
+ ${_javascript_CoreGLib_FRAMEWORK_HEADERS_DIR}
${LIBEPOXY_INCLUDE_DIRS}
${LIBSOUP_INCLUDE_DIRS}
+ ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
+ ${Qt5_INCLUDE_DIRS}
+ ${WPEBACKEND_FDO_INCLUDE_DIRS}
${WPE_INCLUDE_DIRS}
- ${WPEBACKEND_FDO_INCLUDE_DIRS}
)
list(APPEND WPE_API_INSTALLED_HEADERS
Modified: trunk/Source/WebKit/WebProcess/InjectedBundle/API/glib/DOM/WebKitDOMNode.cpp (273813 => 273814)
--- trunk/Source/WebKit/WebProcess/InjectedBundle/API/glib/DOM/WebKitDOMNode.cpp 2021-03-03 12:20:00 UTC (rev 273813)
+++ trunk/Source/WebKit/WebProcess/InjectedBundle/API/glib/DOM/WebKitDOMNode.cpp 2021-03-03 16:02:09 UTC (rev 273814)
@@ -23,6 +23,7 @@
#include "DOMObjectCache.h"
#include "WebKitDOMNodePrivate.h"
#include "WebKitDOMPrivate.h"
+#include <_javascript_Core/APICast.h>
#include <WebCore/JSNode.h>
#include <jsc/JSCContextPrivate.h>
#include <jsc/JSCValuePrivate.h>
Modified: trunk/Source/WebKit/WebProcess/InjectedBundle/API/glib/WebKitFrame.cpp (273813 => 273814)
--- trunk/Source/WebKit/WebProcess/InjectedBundle/API/glib/WebKitFrame.cpp 2021-03-03 12:20:00 UTC (rev 273813)
+++ trunk/Source/WebKit/WebProcess/InjectedBundle/API/glib/WebKitFrame.cpp 2021-03-03 16:02:09 UTC (rev 273814)
@@ -23,6 +23,7 @@
#include "WebKitDOMNodePrivate.h"
#include "WebKitFramePrivate.h"
#include "WebKitScriptWorldPrivate.h"
+#include <_javascript_Core/APICast.h>
#include <_javascript_Core/JSGlobalObjectInlines.h>
#include <_javascript_Core/JSLock.h>
#include <WebCore/Frame.h>
Modified: trunk/Source/cmake/OptionsGTK.cmake (273813 => 273814)
--- trunk/Source/cmake/OptionsGTK.cmake 2021-03-03 12:20:00 UTC (rev 273813)
+++ trunk/Source/cmake/OptionsGTK.cmake 2021-03-03 16:02:09 UTC (rev 273814)
@@ -421,12 +421,14 @@
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_JAVASCRIPCOREGTK_DIR ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/_javascript_coregtk)
-set(DERIVED_SOURCES_JAVASCRIPCORE_GLIB_API_DIR ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/_javascript_coregtk/jsc)
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)
+set(_javascript_CoreGLib_FRAMEWORK_HEADERS_DIR ${CMAKE_BINARY_DIR}/_javascript_CoreGLib/Headers)
+set(_javascript_CoreGLib_PRIVATE_FRAMEWORK_HEADERS_DIR ${CMAKE_BINARY_DIR}/_javascript_CoreGLib/PrivateHeaders)
+set(_javascript_CoreGLib_DERIVED_SOURCES_DIR ${CMAKE_BINARY_DIR}/_javascript_CoreGLib/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/Source/cmake/OptionsWPE.cmake (273813 => 273814)
--- trunk/Source/cmake/OptionsWPE.cmake 2021-03-03 12:20:00 UTC (rev 273813)
+++ trunk/Source/cmake/OptionsWPE.cmake 2021-03-03 16:02:09 UTC (rev 273814)
@@ -261,13 +261,14 @@
set(FORWARDING_HEADERS_WPE_DIR ${FORWARDING_HEADERS_DIR}/wpe)
set(FORWARDING_HEADERS_WPE_EXTENSION_DIR ${FORWARDING_HEADERS_DIR}/wpe-webextension)
set(FORWARDING_HEADERS_WPE_DOM_DIR ${FORWARDING_HEADERS_DIR}/wpe-dom)
-set(FORWARDING_HEADERS_WPE_JSC_DIR ${FORWARDING_HEADERS_DIR}/wpe-jsc)
-set(DERIVED_SOURCES_JAVASCRIPCOREWPE_DIR ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/_javascript_corewpe)
-set(DERIVED_SOURCES_JAVASCRIPCORE_GLIB_API_DIR ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/_javascript_corewpe/jsc)
set(DERIVED_SOURCES_WPE_API_DIR ${DERIVED_SOURCES_WEBKIT_DIR}/wpe)
set(WPE_PKGCONFIG_FILE ${CMAKE_BINARY_DIR}/wpe-webkit-${WPE_API_VERSION}.pc)
set(WPEWebExtension_PKGCONFIG_FILE ${CMAKE_BINARY_DIR}/wpe-web-extension-${WPE_API_VERSION}.pc)
+set(_javascript_CoreGLib_FRAMEWORK_HEADERS_DIR ${CMAKE_BINARY_DIR}/_javascript_CoreGLib/Headers)
+set(_javascript_CoreGLib_PRIVATE_FRAMEWORK_HEADERS_DIR ${CMAKE_BINARY_DIR}/_javascript_CoreGLib/PrivateHeaders)
+set(_javascript_CoreGLib_DERIVED_SOURCES_DIR ${CMAKE_BINARY_DIR}/_javascript_CoreGLib/DerivedSources)
+
include(BubblewrapSandboxChecks)
include(GStreamerChecks)
Modified: trunk/Tools/ChangeLog (273813 => 273814)
--- trunk/Tools/ChangeLog 2021-03-03 12:20:00 UTC (rev 273813)
+++ trunk/Tools/ChangeLog 2021-03-03 16:02:09 UTC (rev 273814)
@@ -1,3 +1,19 @@
+2021-03-03 Don Olmstead <[email protected]>
+
+ [CMake] _javascript_Core GLib headers should be copies
+ https://bugs.webkit.org/show_bug.cgi?id=222625
+
+ Reviewed by Michael Catanzaro.
+
+ Update the includes for the GLib ports.
+
+ * MiniBrowser/wpe/CMakeLists.txt:
+ * TestWebKitAPI/PlatformGTK.cmake:
+ * TestWebKitAPI/PlatformWPE.cmake:
+ * TestWebKitAPI/Tests/_javascript_Core/glib/TestJSC.cpp:
+ * TestWebKitAPI/glib/CMakeLists.txt:
+ * TestWebKitAPI/glib/PlatformGTK.cmake:
+
2021-03-02 Myles C. Maxfield <[email protected]>
REGRESSION(r270691): It's impossible to use MobileAsset fonts on macOS
Modified: trunk/Tools/MiniBrowser/wpe/CMakeLists.txt (273813 => 273814)
--- trunk/Tools/MiniBrowser/wpe/CMakeLists.txt 2021-03-03 12:20:00 UTC (rev 273813)
+++ trunk/Tools/MiniBrowser/wpe/CMakeLists.txt 2021-03-03 16:02:09 UTC (rev 273814)
@@ -4,10 +4,11 @@
set(MiniBrowser_PRIVATE_INCLUDE_DIRECTORIES
${CMAKE_BINARY_DIR}
- ${TOOLS_DIR}/wpe/backends/
+ ${CMAKE_BINARY_DIR}/DerivedSources/WPEToolingBackends
${DERIVED_SOURCES_WPE_API_DIR}
${FORWARDING_HEADERS_WPE_DIR}
- ${CMAKE_BINARY_DIR}/DerivedSources/WPEToolingBackends
+ ${_javascript_CoreGLib_FRAMEWORK_HEADERS_DIR}
+ ${TOOLS_DIR}/wpe/backends/
)
set(MiniBrowser_SYSTEM_INCLUDE_DIRECTORIES
Modified: trunk/Tools/TestWebKitAPI/PlatformGTK.cmake (273813 => 273814)
--- trunk/Tools/TestWebKitAPI/PlatformGTK.cmake 2021-03-03 12:20:00 UTC (rev 273813)
+++ trunk/Tools/TestWebKitAPI/PlatformGTK.cmake 2021-03-03 16:02:09 UTC (rev 273814)
@@ -108,10 +108,6 @@
${CMAKE_BINARY_DIR}
${TESTWEBKITAPI_DIR}
${THIRDPARTY_DIR}/gtest/include
- ${FORWARDING_HEADERS_DIR}
- ${FORWARDING_HEADERS_DIR}/_javascript_Core
- ${FORWARDING_HEADERS_DIR}/_javascript_Core/glib
- ${DERIVED_SOURCES_JAVASCRIPCOREGTK_DIR}
)
set(TestJSC_LIBRARIES
Modified: trunk/Tools/TestWebKitAPI/PlatformWPE.cmake (273813 => 273814)
--- trunk/Tools/TestWebKitAPI/PlatformWPE.cmake 2021-03-03 12:20:00 UTC (rev 273813)
+++ trunk/Tools/TestWebKitAPI/PlatformWPE.cmake 2021-03-03 16:02:09 UTC (rev 273814)
@@ -107,10 +107,6 @@
${CMAKE_BINARY_DIR}
${TESTWEBKITAPI_DIR}
${THIRDPARTY_DIR}/gtest/include
- ${FORWARDING_HEADERS_DIR}
- ${FORWARDING_HEADERS_DIR}/_javascript_Core
- ${FORWARDING_HEADERS_DIR}/_javascript_Core/glib
- ${DERIVED_SOURCES_JAVASCRIPCOREWPE_DIR}
)
set(TestJSC_LIBRARIES
Modified: trunk/Tools/TestWebKitAPI/Tests/_javascript_Core/glib/TestJSC.cpp (273813 => 273814)
--- trunk/Tools/TestWebKitAPI/Tests/_javascript_Core/glib/TestJSC.cpp 2021-03-03 12:20:00 UTC (rev 273813)
+++ trunk/Tools/TestWebKitAPI/Tests/_javascript_Core/glib/TestJSC.cpp 2021-03-03 16:02:09 UTC (rev 273814)
@@ -24,6 +24,7 @@
#include "jsc/JSCContextPrivate.h"
#undef JSC_COMPILATION
+#include <_javascript_Core/JSContextRef.h>
#include <jsc/jsc.h>
#include <wtf/HashSet.h>
#include <wtf/Threading.h>
@@ -30,6 +31,7 @@
#include <wtf/Vector.h>
#include <wtf/glib/GRefPtr.h>
#include <wtf/glib/GUniquePtr.h>
+#include <wtf/text/CString.h>
class LeakChecker {
public:
Modified: trunk/Tools/TestWebKitAPI/glib/CMakeLists.txt (273813 => 273814)
--- trunk/Tools/TestWebKitAPI/glib/CMakeLists.txt 2021-03-03 12:20:00 UTC (rev 273813)
+++ trunk/Tools/TestWebKitAPI/glib/CMakeLists.txt 2021-03-03 16:02:09 UTC (rev 273814)
@@ -8,6 +8,7 @@
set(WebKitGLibAPITests_INCLUDE_DIRECTORIES
${CMAKE_BINARY_DIR}
${FORWARDING_HEADERS_DIR}
+ ${_javascript_CoreGLib_FRAMEWORK_HEADERS_DIR}
${TOOLS_DIR}/TestWebKitAPI/Tests/WebKitGLib
${TOOLS_DIR}/TestWebKitAPI/glib/WebKitGLib
)
Modified: trunk/Tools/TestWebKitAPI/glib/PlatformGTK.cmake (273813 => 273814)
--- trunk/Tools/TestWebKitAPI/glib/PlatformGTK.cmake 2021-03-03 12:20:00 UTC (rev 273813)
+++ trunk/Tools/TestWebKitAPI/glib/PlatformGTK.cmake 2021-03-03 16:02:09 UTC (rev 273814)
@@ -6,7 +6,6 @@
)
list(APPEND WebKitGLibAPITests_INCLUDE_DIRECTORIES
- ${DERIVED_SOURCES_JAVASCRIPCOREGTK_DIR}
${DERIVED_SOURCES_WEBKIT2GTK_DIR}
${FORWARDING_HEADERS_WEBKIT2GTK_DIR}
${FORWARDING_HEADERS_WEBKIT2GTK_VERSIONED_DIR}
