Diff
Modified: trunk/ChangeLog (274200 => 274201)
--- trunk/ChangeLog 2021-03-10 07:03:36 UTC (rev 274200)
+++ trunk/ChangeLog 2021-03-10 07:36:26 UTC (rev 274201)
@@ -1,3 +1,20 @@
+2021-03-09 Don Olmstead <[email protected]>
+
+ GLib JSC API headers should only include other GLib JSC API headers
+ https://bugs.webkit.org/show_bug.cgi?id=222803
+
+ Reviewed by Michael Catanzaro.
+
+ GTK and WPE both build the _javascript_Core GLib API. However they diverged with their CMake
+ variable names for the directory containing jsc. Declare a single variable for that
+ directory, DERIVED_SOURCES_JAVASCRIPTCORE_GLIB_DIR, that is shared between GLib ports.
+
+ Remove the GLIB_API_DIR variant which will just be replaced with
+ ${DERIVED_SOURCES_JAVASCRIPTCORE_GLIB_DIR}/jsc in the CMake code.
+
+ * Source/cmake/OptionsGTK.cmake:
+ * Source/cmake/OptionsWPE.cmake:
+
2021-03-09 Michael Catanzaro <[email protected]>
[GTK] Reenable -fvisibility=hidden
Modified: trunk/Source/_javascript_Core/API/glib/JSCClassPrivate.h (274200 => 274201)
--- trunk/Source/_javascript_Core/API/glib/JSCClassPrivate.h 2021-03-10 07:03:36 UTC (rev 274200)
+++ trunk/Source/_javascript_Core/API/glib/JSCClassPrivate.h 2021-03-10 07:36:26 UTC (rev 274201)
@@ -19,12 +19,18 @@
#pragma once
-#include "APICast.h"
#include "JSCClass.h"
#include "JSCContext.h"
#include "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 (274200 => 274201)
--- trunk/Source/_javascript_Core/API/glib/JSCContext.cpp 2021-03-10 07:03:36 UTC (rev 274200)
+++ trunk/Source/_javascript_Core/API/glib/JSCContext.cpp 2021-03-10 07:36:26 UTC (rev 274201)
@@ -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 (274200 => 274201)
--- trunk/Source/_javascript_Core/API/glib/JSCContextPrivate.h 2021-03-10 07:03:36 UTC (rev 274200)
+++ trunk/Source/_javascript_Core/API/glib/JSCContextPrivate.h 2021-03-10 07:36:26 UTC (rev 274201)
@@ -19,12 +19,19 @@
#pragma once
-#include "APICast.h"
#include "JSCContext.h"
#include "JSCValue.h"
-#include "JSContextRef.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/JSCVirtualMachine.cpp (274200 => 274201)
--- trunk/Source/_javascript_Core/API/glib/JSCVirtualMachine.cpp 2021-03-10 07:03:36 UTC (rev 274200)
+++ trunk/Source/_javascript_Core/API/glib/JSCVirtualMachine.cpp 2021-03-10 07:36:26 UTC (rev 274201)
@@ -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 (274200 => 274201)
--- trunk/Source/_javascript_Core/API/glib/JSCVirtualMachinePrivate.h 2021-03-10 07:03:36 UTC (rev 274200)
+++ trunk/Source/_javascript_Core/API/glib/JSCVirtualMachinePrivate.h 2021-03-10 07:36:26 UTC (rev 274201)
@@ -23,6 +23,8 @@
#include "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 (274200 => 274201)
--- trunk/Source/_javascript_Core/API/glib/JSCWrapperMap.cpp 2021-03-10 07:03:36 UTC (rev 274200)
+++ trunk/Source/_javascript_Core/API/glib/JSCWrapperMap.cpp 2021-03-10 07:36:26 UTC (rev 274201)
@@ -29,6 +29,7 @@
#include "JSCInlines.h"
#include "JSCValuePrivate.h"
#include "JSCallbackObject.h"
+#include "JSContextRef.h"
namespace JSC {
Modified: trunk/Source/_javascript_Core/ChangeLog (274200 => 274201)
--- trunk/Source/_javascript_Core/ChangeLog 2021-03-10 07:03:36 UTC (rev 274200)
+++ trunk/Source/_javascript_Core/ChangeLog 2021-03-10 07:36:26 UTC (rev 274201)
@@ -1,3 +1,30 @@
+2021-03-09 Don Olmstead <[email protected]>
+
+ GLib JSC API headers should only include other GLib JSC API headers
+ https://bugs.webkit.org/show_bug.cgi?id=222803
+
+ Reviewed by Michael Catanzaro.
+
+ A number of private GLib JSC headers are directly including private _javascript_Core headers.
+ To get this to compile ${FORWARDING_HEADERS_DIR}/_javascript_Core was added to the list of
+ includes in targets that needed the JSC headers. This is incorrect because they are being
+ distributed in different directories.
+
+ The private JSC headers being used were replaced with forward declarations. The source
+ files were then updated accordingly.
+
+ Also the include directories that contained the <jsc/Foo.h> headers were added to
+ _javascript_Core_INTERFACE_INCLUDE_DIRECTORIES so they're properly propagated to dependants.
+
+ * API/glib/JSCClassPrivate.h:
+ * API/glib/JSCContext.cpp:
+ * API/glib/JSCContextPrivate.h:
+ * API/glib/JSCVirtualMachine.cpp:
+ * API/glib/JSCVirtualMachinePrivate.h:
+ * API/glib/JSCWrapperMap.cpp:
+ * GLib.cmake:
+ * PlatformGTK.cmake:
+
2021-03-09 Keith Miller <[email protected]>
JSC Crash in makeString() while creating Error object.
Modified: trunk/Source/_javascript_Core/GLib.cmake (274200 => 274201)
--- trunk/Source/_javascript_Core/GLib.cmake 2021-03-10 07:03:36 UTC (rev 274200)
+++ trunk/Source/_javascript_Core/GLib.cmake 2021-03-10 07:36:26 UTC (rev 274201)
@@ -1,5 +1,5 @@
file(MAKE_DIRECTORY ${FORWARDING_HEADERS_DIR}/_javascript_Core/glib)
-file(MAKE_DIRECTORY ${DERIVED_SOURCES_JAVASCRIPCORE_GLIB_API_DIR})
+file(MAKE_DIRECTORY ${DERIVED_SOURCES_JAVASCRIPTCORE_GLIB_DIR}/jsc)
list(APPEND _javascript_Core_SOURCES
API/glib/JSAPIWrapperGlobalObject.cpp
@@ -18,12 +18,17 @@
list(APPEND _javascript_Core_PRIVATE_INCLUDE_DIRECTORIES
"${FORWARDING_HEADERS_DIR}/_javascript_Core/glib"
- "${DERIVED_SOURCES_JAVASCRIPCORE_GLIB_API_DIR}"
+ "${DERIVED_SOURCES_JAVASCRIPTCORE_GLIB_DIR}/jsc"
"${_javascript_CORE_DIR}/API/glib"
)
+list(APPEND _javascript_Core_INTERFACE_INCLUDE_DIRECTORIES
+ "${FORWARDING_HEADERS_DIR}/_javascript_Core/glib"
+ "${DERIVED_SOURCES_JAVASCRIPTCORE_GLIB_DIR}"
+)
+
set(_javascript_Core_INSTALLED_HEADERS
- ${DERIVED_SOURCES_JAVASCRIPCORE_GLIB_API_DIR}/JSCVersion.h
+ ${DERIVED_SOURCES_JAVASCRIPTCORE_GLIB_DIR}/jsc/JSCVersion.h
${_javascript_CORE_DIR}/API/glib/JSCAutocleanups.h
${_javascript_CORE_DIR}/API/glib/JSCClass.h
${_javascript_CORE_DIR}/API/glib/JSCContext.h
@@ -36,7 +41,7 @@
${_javascript_CORE_DIR}/API/glib/jsc.h
)
-configure_file(API/glib/JSCVersion.h.in ${DERIVED_SOURCES_JAVASCRIPCORE_GLIB_API_DIR}/JSCVersion.h)
+configure_file(API/glib/JSCVersion.h.in ${DERIVED_SOURCES_JAVASCRIPTCORE_GLIB_DIR}/jsc/JSCVersion.h)
# These symbolic link allows includes like #include <jsc/jsc.h> which simulates installed headers.
add_custom_command(
Modified: trunk/Source/_javascript_Core/PlatformGTK.cmake (274200 => 274201)
--- trunk/Source/_javascript_Core/PlatformGTK.cmake 2021-03-10 07:03:36 UTC (rev 274200)
+++ trunk/Source/_javascript_Core/PlatformGTK.cmake 2021-03-10 07:36:26 UTC (rev 274201)
@@ -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"
@@ -70,6 +66,7 @@
${INTROSPECTION_SCANNER}
--quiet
--warn-all
+ --warn-error
--symbol-prefix=jsc
--identifier-prefix=JSC
--namespace=_javascript_Core
@@ -85,9 +82,8 @@
${GIR_SOURCES_TOP_DIRS}
--c-include="jsc/jsc.h"
-DJSC_COMPILATION
- -I${CMAKE_SOURCE_DIR}/Source
- -I${_javascript_CORE_DIR}
- -I${DERIVED_SOURCES_JAVASCRIPCOREGTK_DIR}
+ -I${_javascript_CORE_DIR}/API/glib
+ -I${DERIVED_SOURCES_JAVASCRIPTCORE_GLIB_DIR}
-I${FORWARDING_HEADERS_DIR}/_javascript_Core/glib
${_javascript_Core_INSTALLED_HEADERS}
${_javascript_CORE_DIR}/API/glib/*.cpp
@@ -109,9 +105,8 @@
"decorator=JSC_API\n"
"deprecation_guard=JSC_DISABLE_DEPRECATED\n"
"namespace=jsc\n"
- "cflags=-I${CMAKE_SOURCE_DIR}/Source\n"
- " -I${_javascript_CORE_DIR}/API/glib\n"
- " -I${DERIVED_SOURCES_JAVASCRIPCOREGTK_DIR}\n"
+ "cflags=-I${_javascript_CORE_DIR}/API/glib\n"
+ " -I${DERIVED_SOURCES_JAVASCRIPTCORE_GLIB_DIR}\n"
" -I${FORWARDING_HEADERS_DIR}/_javascript_Core/glib\n"
"doc_dir=${_javascript_CORE_DIR}/API/glib/docs\n"
"source_dirs=${_javascript_CORE_DIR}/API/glib\n"
Modified: trunk/Source/WebKit/ChangeLog (274200 => 274201)
--- trunk/Source/WebKit/ChangeLog 2021-03-10 07:03:36 UTC (rev 274200)
+++ trunk/Source/WebKit/ChangeLog 2021-03-10 07:36:26 UTC (rev 274201)
@@ -1,3 +1,17 @@
+2021-03-09 Don Olmstead <[email protected]>
+
+ GLib JSC API headers should only include other GLib JSC API headers
+ https://bugs.webkit.org/show_bug.cgi?id=222803
+
+ Reviewed by Michael Catanzaro.
+
+ Update the includes and include directories.
+
+ * PlatformGTK.cmake:
+ * PlatformWPE.cmake:
+ * WebProcess/InjectedBundle/API/glib/DOM/WebKitDOMNode.cpp:
+ * WebProcess/InjectedBundle/API/glib/WebKitFrame.cpp:
+
2021-03-09 Chris Dumez <[email protected]>
REGRESSION (r274174): ASSERTION FAILED: m_shouldBeCalledOnMainThread == isMainThread() under WebKit::RemoteSampleBufferDisplayLayerManager::createLayer
Modified: trunk/Source/WebKit/PlatformGTK.cmake (274200 => 274201)
--- trunk/Source/WebKit/PlatformGTK.cmake 2021-03-10 07:03:36 UTC (rev 274200)
+++ trunk/Source/WebKit/PlatformGTK.cmake 2021-03-10 07:36:26 UTC (rev 274201)
@@ -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,7 +701,7 @@
-I${WEBKIT_DIR}
-I${DERIVED_SOURCES_DIR}
-I${DERIVED_SOURCES_WEBKIT2GTK_DIR}
- -I${DERIVED_SOURCES_JAVASCRIPCOREGTK_DIR}
+ -I${DERIVED_SOURCES_JAVASCRIPTCORE_GLIB_DIR}
-I${FORWARDING_HEADERS_DIR}
-I${FORWARDING_HEADERS_DIR}/_javascript_Core/glib
-I${FORWARDING_HEADERS_WEBKIT2GTK_DIR}
@@ -752,7 +749,7 @@
-I${WEBKIT_DIR}
-I${DERIVED_SOURCES_DIR}
-I${DERIVED_SOURCES_WEBKIT2GTK_DIR}
- -I${DERIVED_SOURCES_JAVASCRIPCOREGTK_DIR}
+ -I${DERIVED_SOURCES_JAVASCRIPTCORE_GLIB_DIR}
-I${FORWARDING_HEADERS_DIR}
-I${FORWARDING_HEADERS_DIR}/_javascript_Core/glib
-I${FORWARDING_HEADERS_WEBKIT2GTK_DIR}
Modified: trunk/Source/WebKit/PlatformWPE.cmake (274200 => 274201)
--- trunk/Source/WebKit/PlatformWPE.cmake 2021-03-10 07:03:36 UTC (rev 274200)
+++ trunk/Source/WebKit/PlatformWPE.cmake 2021-03-10 07:36:26 UTC (rev 274201)
@@ -255,15 +255,10 @@
)
list(APPEND WebKit_INCLUDE_DIRECTORIES
- "${DERIVED_SOURCES_JAVASCRIPCOREWPE_DIR}"
- "${FORWARDING_HEADERS_DIR}"
- "${FORWARDING_HEADERS_DIR}/_javascript_Core/"
- "${FORWARDING_HEADERS_DIR}/_javascript_Core/glib"
+ "${DERIVED_SOURCES_WPE_API_DIR}"
"${FORWARDING_HEADERS_WPE_DIR}"
+ "${FORWARDING_HEADERS_WPE_DOM_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"
"${WEBKIT_DIR}/Platform/IPC/glib"
@@ -291,16 +286,13 @@
"${WEBKIT_DIR}/WebProcess/InjectedBundle/API/glib/DOM"
"${WEBKIT_DIR}/WebProcess/InjectedBundle/API/wpe"
"${WEBKIT_DIR}/WebProcess/InjectedBundle/API/wpe/DOM"
- "${WEBKIT_DIR}/WebProcess/glib"
- "${WEBKIT_DIR}/WebProcess/soup"
"${WEBKIT_DIR}/WebProcess/WebCoreSupport/soup"
"${WEBKIT_DIR}/WebProcess/WebPage/CoordinatedGraphics"
"${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}"
+ "${WEBKIT_DIR}/WebProcess/glib"
+ "${WEBKIT_DIR}/WebProcess/soup"
)
list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES
@@ -383,8 +375,7 @@
ADD_WEBKIT_PREFIX_HEADER(WPEInjectedBundle)
target_link_libraries(WPEInjectedBundle WebKit)
-target_include_directories(WPEInjectedBundle PRIVATE ${WebKit_INCLUDE_DIRECTORIES} ${WebKit_PRIVATE_INCLUDE_DIRECTORIES})
-target_include_directories(WPEInjectedBundle SYSTEM PRIVATE ${WebKit_SYSTEM_INCLUDE_DIRECTORIES})
+target_include_directories(WPEInjectedBundle PRIVATE $<TARGET_PROPERTY:WebKit,INCLUDE_DIRECTORIES>)
file(WRITE ${CMAKE_BINARY_DIR}/gtkdoc-wpe.cfg
"[wpe-${WPE_API_VERSION}]\n"
@@ -443,6 +434,7 @@
)
set(qtwpe_INCLUDE_DIRECTORIES
+ $<TARGET_PROPERTY:WebKit,INCLUDE_DIRECTORIES>
${CMAKE_BINARY_DIR}
${GLIB_INCLUDE_DIRS}
${Qt5_INCLUDE_DIRS}
@@ -465,7 +457,7 @@
)
target_compile_definitions(qtwpe PUBLIC QT_NO_KEYWORDS=1)
target_link_libraries(qtwpe ${qtwpe_LIBRARIES})
- target_include_directories(qtwpe SYSTEM PRIVATE ${qtwpe_INCLUDE_DIRECTORIES})
+ target_include_directories(qtwpe PRIVATE ${qtwpe_INCLUDE_DIRECTORIES})
install(TARGETS qtwpe DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/qt5/qml/org/wpewebkit/qtwpe/")
install(FILES ${WEBKIT_DIR}/UIProcess/API/wpe/qt/qmldir DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/qt5/qml/org/wpewebkit/qtwpe/")
Modified: trunk/Source/WebKit/WebProcess/InjectedBundle/API/glib/DOM/WebKitDOMNode.cpp (274200 => 274201)
--- trunk/Source/WebKit/WebProcess/InjectedBundle/API/glib/DOM/WebKitDOMNode.cpp 2021-03-10 07:03:36 UTC (rev 274200)
+++ trunk/Source/WebKit/WebProcess/InjectedBundle/API/glib/DOM/WebKitDOMNode.cpp 2021-03-10 07:36:26 UTC (rev 274201)
@@ -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 (274200 => 274201)
--- trunk/Source/WebKit/WebProcess/InjectedBundle/API/glib/WebKitFrame.cpp 2021-03-10 07:03:36 UTC (rev 274200)
+++ trunk/Source/WebKit/WebProcess/InjectedBundle/API/glib/WebKitFrame.cpp 2021-03-10 07:36:26 UTC (rev 274201)
@@ -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 (274200 => 274201)
--- trunk/Source/cmake/OptionsGTK.cmake 2021-03-10 07:03:36 UTC (rev 274200)
+++ trunk/Source/cmake/OptionsGTK.cmake 2021-03-10 07:36:26 UTC (rev 274201)
@@ -434,8 +434,7 @@
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(DERIVED_SOURCES_JAVASCRIPTCORE_GLIB_DIR ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/_javascript_coregtk)
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)
Modified: trunk/Source/cmake/OptionsWPE.cmake (274200 => 274201)
--- trunk/Source/cmake/OptionsWPE.cmake 2021-03-10 07:03:36 UTC (rev 274200)
+++ trunk/Source/cmake/OptionsWPE.cmake 2021-03-10 07:36:26 UTC (rev 274201)
@@ -262,8 +262,7 @@
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_JAVASCRIPTCORE_GLIB_DIR ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/_javascript_corewpe)
set(DERIVED_SOURCES_WPE_API_DIR ${DERIVED_SOURCES_WEBKIT_DIR}/wpe)
set(WPE_PKGCONFIG_FILE ${CMAKE_BINARY_DIR}/wpe-webkit-${WPE_API_VERSION}.pc)
Modified: trunk/Tools/ChangeLog (274200 => 274201)
--- trunk/Tools/ChangeLog 2021-03-10 07:03:36 UTC (rev 274200)
+++ trunk/Tools/ChangeLog 2021-03-10 07:36:26 UTC (rev 274201)
@@ -1,3 +1,19 @@
+2021-03-09 Don Olmstead <[email protected]>
+
+ GLib JSC API headers should only include other GLib JSC API headers
+ https://bugs.webkit.org/show_bug.cgi?id=222803
+
+ Reviewed by Michael Catanzaro.
+
+ Update the includes and include directories.
+
+ * MiniBrowser/wpe/CMakeLists.txt:
+ * TestWebKitAPI/PlatformGTK.cmake:
+ * TestWebKitAPI/PlatformWPE.cmake:
+ * TestWebKitAPI/Tests/_javascript_Core/glib/TestJSC.cpp:
+ * TestWebKitAPI/glib/PlatformGTK.cmake:
+ * TestWebKitAPI/glib/PlatformWPE.cmake:
+
2021-03-09 Alex Christensen <[email protected]>
HTTPS upgrade should allow same-site redirects from HTTPS to HTTP
Modified: trunk/Tools/MiniBrowser/wpe/CMakeLists.txt (274200 => 274201)
--- trunk/Tools/MiniBrowser/wpe/CMakeLists.txt 2021-03-10 07:03:36 UTC (rev 274200)
+++ trunk/Tools/MiniBrowser/wpe/CMakeLists.txt 2021-03-10 07:36:26 UTC (rev 274201)
@@ -4,10 +4,12 @@
set(MiniBrowser_PRIVATE_INCLUDE_DIRECTORIES
${CMAKE_BINARY_DIR}
- ${TOOLS_DIR}/wpe/backends/
+ ${CMAKE_BINARY_DIR}/DerivedSources/WPEToolingBackends
+ ${DERIVED_SOURCES_JAVASCRIPTCORE_GLIB_DIR}
${DERIVED_SOURCES_WPE_API_DIR}
+ ${FORWARDING_HEADERS_DIR}/_javascript_Core/glib
${FORWARDING_HEADERS_WPE_DIR}
- ${CMAKE_BINARY_DIR}/DerivedSources/WPEToolingBackends
+ ${TOOLS_DIR}/wpe/backends/
)
set(MiniBrowser_SYSTEM_INCLUDE_DIRECTORIES
Modified: trunk/Tools/TestWebKitAPI/PlatformGTK.cmake (274200 => 274201)
--- trunk/Tools/TestWebKitAPI/PlatformGTK.cmake 2021-03-10 07:03:36 UTC (rev 274200)
+++ trunk/Tools/TestWebKitAPI/PlatformGTK.cmake 2021-03-10 07:36:26 UTC (rev 274201)
@@ -104,10 +104,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 (274200 => 274201)
--- trunk/Tools/TestWebKitAPI/PlatformWPE.cmake 2021-03-10 07:03:36 UTC (rev 274200)
+++ trunk/Tools/TestWebKitAPI/PlatformWPE.cmake 2021-03-10 07:36:26 UTC (rev 274201)
@@ -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 (274200 => 274201)
--- trunk/Tools/TestWebKitAPI/Tests/_javascript_Core/glib/TestJSC.cpp 2021-03-10 07:03:36 UTC (rev 274200)
+++ trunk/Tools/TestWebKitAPI/Tests/_javascript_Core/glib/TestJSC.cpp 2021-03-10 07:36:26 UTC (rev 274201)
@@ -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/PlatformGTK.cmake (274200 => 274201)
--- trunk/Tools/TestWebKitAPI/glib/PlatformGTK.cmake 2021-03-10 07:03:36 UTC (rev 274200)
+++ trunk/Tools/TestWebKitAPI/glib/PlatformGTK.cmake 2021-03-10 07:36:26 UTC (rev 274201)
@@ -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}
Modified: trunk/Tools/TestWebKitAPI/glib/PlatformWPE.cmake (274200 => 274201)
--- trunk/Tools/TestWebKitAPI/glib/PlatformWPE.cmake 2021-03-10 07:03:36 UTC (rev 274200)
+++ trunk/Tools/TestWebKitAPI/glib/PlatformWPE.cmake 2021-03-10 07:36:26 UTC (rev 274201)
@@ -6,10 +6,12 @@
)
list(APPEND WebKitGLibAPITests_INCLUDE_DIRECTORIES
+ ${DERIVED_SOURCES_JAVASCRIPTCORE_GLIB_DIR}
${DERIVED_SOURCES_WPE_API_DIR}
+ ${FORWARDING_HEADERS_DIR}/_javascript_Core/glib
${FORWARDING_HEADERS_WPE_DIR}
+ ${FORWARDING_HEADERS_WPE_DOM_DIR}
${FORWARDING_HEADERS_WPE_EXTENSION_DIR}
- ${FORWARDING_HEADERS_WPE_DOM_DIR}
${TOOLS_DIR}/wpe/backends
)
