f878339a1b
https://bugs.webkit.org/show_bug.cgi?id=222803 Reviewed by Michael Catanzaro. .: GTK and WPE both build the JavaScriptCore 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: Source/JavaScriptCore: A number of private GLib JSC headers are directly including private JavaScriptCore headers. To get this to compile ${FORWARDING_HEADERS_DIR}/JavaScriptCore 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 JavaScriptCore_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: Source/WebKit: Update the includes and include directories. * PlatformGTK.cmake: * PlatformWPE.cmake: * WebProcess/InjectedBundle/API/glib/DOM/WebKitDOMNode.cpp: * WebProcess/InjectedBundle/API/glib/WebKitFrame.cpp: Tools: Update the includes and include directories. * MiniBrowser/wpe/CMakeLists.txt: * TestWebKitAPI/PlatformGTK.cmake: * TestWebKitAPI/PlatformWPE.cmake: * TestWebKitAPI/Tests/JavaScriptCore/glib/TestJSC.cpp: * TestWebKitAPI/glib/PlatformGTK.cmake: * TestWebKitAPI/glib/PlatformWPE.cmake: Canonical link: https://commits.webkit.org/235119@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@274201 268f45cc-cd09-0410-ab3c-d52691b4dbfc |
||
|---|---|---|
| .. | ||
| Configurations | ||
| MiniBrowser.xcodeproj | ||
| gtk | ||
| mac | ||
| playstation | ||
| win | ||
| wpe | ||
| MBToolbarItem.h | ||
| MBToolbarItem.m | ||
| Makefile | ||
| MiniBrowser.entitlements | ||