Attachment 397853 Details for Bug 210366 – WIP Patch

[patch] WIP Patch

bug-210366.diff (text/plain), 37.92 KB, created by Don Olmstead on 2020-04-28 10:18:52 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Don Olmstead

Created: 2020-04-28 10:18:52 PDT

Size: 37.92 KB

patch

obsolete

>diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
>index 0844dff80887..af70c6f6fe50 100644
>--- a/Source/CMakeLists.txt
>+++ b/Source/CMakeLists.txt
>@@ -45,4 +45,10 @@ if (ENABLE_WEBDRIVER)
>     add_subdirectory(WebDriver)
> endif ()
> 
>+WEBKIT_FRAMEWORK_DEBUG(WTF)
>+WEBKIT_FRAMEWORK_DEBUG(JavaScriptCore)
>+WEBKIT_FRAMEWORK_DEBUG(PAL)
>+WEBKIT_FRAMEWORK_DEBUG(WebCore)
>+WEBKIT_FRAMEWORK_DEBUG(WebKit)
>+
> WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
>diff --git a/Source/JavaScriptCore/API/glib/JSCContextPrivate.h b/Source/JavaScriptCore/API/glib/JSCContextPrivate.h
>index fc7270ed52ed..b6594b15dda4 100644
>--- a/Source/JavaScriptCore/API/glib/JSCContextPrivate.h
>+++ b/Source/JavaScriptCore/API/glib/JSCContextPrivate.h
>@@ -25,9 +25,9 @@
> #include "JSContextRef.h"
> #include <wtf/glib/GRefPtr.h>
> 
>-GRefPtr<JSCContext> jscContextGetOrCreate(JSGlobalContextRef);
>-JSGlobalContextRef jscContextGetJSContext(JSCContext*);
>-GRefPtr<JSCValue> jscContextGetOrCreateValue(JSCContext*, JSValueRef);
>+JS_EXPORT_PRIVATE GRefPtr<JSCContext> jscContextGetOrCreate(JSGlobalContextRef);
>+JS_EXPORT_PRIVATE JSGlobalContextRef jscContextGetJSContext(JSCContext*);
>+JS_EXPORT_PRIVATE GRefPtr<JSCValue> jscContextGetOrCreateValue(JSCContext*, JSValueRef);
> void jscContextValueDestroyed(JSCContext*, JSValueRef);
> JSC::JSObject* jscContextGetJSWrapper(JSCContext*, gpointer);
> JSC::JSObject* jscContextGetOrCreateJSWrapper(JSCContext*, JSClassRef, JSValueRef prototype = nullptr, gpointer = nullptr, GDestroyNotify = nullptr);
>diff --git a/Source/JavaScriptCore/API/glib/JSCValuePrivate.h b/Source/JavaScriptCore/API/glib/JSCValuePrivate.h
>index 62144353f551..98ae5fea3191 100644
>--- a/Source/JavaScriptCore/API/glib/JSCValuePrivate.h
>+++ b/Source/JavaScriptCore/API/glib/JSCValuePrivate.h
>@@ -21,5 +21,5 @@
> 
> #include "JSCValue.h"
> 
>-JSValueRef jscValueGetJSValue(JSCValue*);
>+JS_EXPORT_PRIVATE JSValueRef jscValueGetJSValue(JSCValue*);
> JSCValue* jscValueCreate(JSCContext*, JSValueRef);
>diff --git a/Source/JavaScriptCore/CMakeLists.txt b/Source/JavaScriptCore/CMakeLists.txt
>index 3572b6c6ba09..693d446380ae 100644
>--- a/Source/JavaScriptCore/CMakeLists.txt
>+++ b/Source/JavaScriptCore/CMakeLists.txt
>@@ -118,10 +118,6 @@ set(JavaScriptCore_OBJECT_LUT_SOURCES
>     wasm/js/WebAssemblyTablePrototype.cpp
> )
> 
>-set(JavaScriptCore_LIBRARIES
>-    WebKit::WTF
>-)
>-
> if (USE_CAPSTONE)
>     list(APPEND JavaScriptCore_LIBRARIES capstone)
> endif ()
>@@ -1372,7 +1368,8 @@ add_subdirectory(shell)
> 
> target_include_directories(LowLevelInterpreterLib
>     PRIVATE "$<TARGET_PROPERTY:JavaScriptCore,INCLUDE_DIRECTORIES>")
>-add_dependencies(LowLevelInterpreterLib WTF_CopyHeaders Bytecodes JSCBuiltins)
>+target_link_libraries(LowLevelInterpreterLib WebKit::WTF)
>+add_dependencies(LowLevelInterpreterLib Bytecodes JSCBuiltins)
> 
> if (CMAKE_COMPILER_IS_GNUCXX AND GCC_OFFLINEASM_SOURCE_MAP)
>     message(STATUS "Enabling asm postprocessing")
>@@ -1396,6 +1393,7 @@ list(APPEND JavaScriptCore_SOURCES $<TARGET_OBJECTS:LowLevelInterpreterLib>)
> 
> WEBKIT_COMPUTE_SOURCES(JavaScriptCore)
> WEBKIT_WRAP_SOURCELIST(${JavaScriptCore_SOURCES})
>+WEBKIT_FRAMEWORK_LINK(JavaScriptCore LINK WTF)
> WEBKIT_FRAMEWORK(JavaScriptCore)
> WEBKIT_FRAMEWORK_TARGET(JavaScriptCore)
> 
>diff --git a/Source/JavaScriptCore/PlatformGTK.cmake b/Source/JavaScriptCore/PlatformGTK.cmake
>index 0b2968d27cd2..7226a202c5d7 100644
>--- a/Source/JavaScriptCore/PlatformGTK.cmake
>+++ b/Source/JavaScriptCore/PlatformGTK.cmake
>@@ -39,7 +39,6 @@ if (ENABLE_INTROSPECTION)
>     )
> endif ()
> 
>-add_definitions(-DSTATICALLY_LINKED_WITH_WTF)
> add_definitions(-DJSC_COMPILATION)
> 
> list(APPEND JavaScriptCore_LIBRARIES
>@@ -48,6 +47,10 @@ list(APPEND JavaScriptCore_LIBRARIES
> list(APPEND JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES
>     ${GLIB_INCLUDE_DIRS}
> )
>+list(APPEND JavaScriptCore_PRIVATE_LIBRARIES
>+    $<TARGET_OBJECTS:WTF>
>+    $<TARGET_OBJECTS:bmalloc>
>+)
> 
> if (ENABLE_INTROSPECTION)
>     # Add ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} to LD_LIBRARY_PATH or DYLD_LIBRARY_PATH
>diff --git a/Source/JavaScriptCore/PlatformJSCOnly.cmake b/Source/JavaScriptCore/PlatformJSCOnly.cmake
>index 7b1e732c4040..60dbbf89eb70 100644
>--- a/Source/JavaScriptCore/PlatformJSCOnly.cmake
>+++ b/Source/JavaScriptCore/PlatformJSCOnly.cmake
>@@ -1,5 +1,3 @@
>-add_definitions(-DSTATICALLY_LINKED_WITH_WTF)
>-
> if (USE_GLIB)
>     list(APPEND JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES
>         ${GLIB_INCLUDE_DIRS}
>diff --git a/Source/JavaScriptCore/PlatformPlayStation.cmake b/Source/JavaScriptCore/PlatformPlayStation.cmake
>index 30edc96d7a62..17cbd0d2a85a 100644
>--- a/Source/JavaScriptCore/PlatformPlayStation.cmake
>+++ b/Source/JavaScriptCore/PlatformPlayStation.cmake
>@@ -57,8 +57,3 @@ list(APPEND JavaScriptCore_PRIVATE_LIBRARIES
>     $<TARGET_OBJECTS:WTF>
>     $<TARGET_OBJECTS:bmalloc>
> )
>-
>-list(APPEND JavaScriptCore_PRIVATE_DEFINITIONS
>-    STATICALLY_LINKED_WITH_WTF
>-    STATICALLY_LINKED_WITH_bmalloc
>-)
>diff --git a/Source/JavaScriptCore/inspector/remote/glib/RemoteInspectorServer.h b/Source/JavaScriptCore/inspector/remote/glib/RemoteInspectorServer.h
>index 7fb8a0a9d366..b3f5be89e411 100644
>--- a/Source/JavaScriptCore/inspector/remote/glib/RemoteInspectorServer.h
>+++ b/Source/JavaScriptCore/inspector/remote/glib/RemoteInspectorServer.h
>@@ -40,10 +40,10 @@ namespace Inspector {
> 
> class RemoteInspectorServer {
> public:
>-    static RemoteInspectorServer& singleton();
>+    JS_EXPORT_PRIVATE static RemoteInspectorServer& singleton();
>     ~RemoteInspectorServer();
> 
>-    bool start(const char* address, unsigned port);
>+    JS_EXPORT_PRIVATE bool start(const char* address, unsigned port);
>     bool isRunning() const { return !!m_service; }
> 
> private:
>diff --git a/Source/JavaScriptCore/inspector/remote/glib/RemoteInspectorUtils.h b/Source/JavaScriptCore/inspector/remote/glib/RemoteInspectorUtils.h
>index 6f95ab5c52a5..ea43307abdd9 100644
>--- a/Source/JavaScriptCore/inspector/remote/glib/RemoteInspectorUtils.h
>+++ b/Source/JavaScriptCore/inspector/remote/glib/RemoteInspectorUtils.h
>@@ -35,7 +35,7 @@ typedef struct _GBytes GBytes;
> namespace Inspector {
> 
> GRefPtr<GBytes> backendCommands();
>-const CString& backendCommandsHash();
>+JS_EXPORT_PRIVATE const CString& backendCommandsHash();
> 
> } // namespace Inspector
> 
>diff --git a/Source/JavaScriptCore/shell/CMakeLists.txt b/Source/JavaScriptCore/shell/CMakeLists.txt
>index 56fb3f2c6aa8..effdd7cbef22 100644
>--- a/Source/JavaScriptCore/shell/CMakeLists.txt
>+++ b/Source/JavaScriptCore/shell/CMakeLists.txt
>@@ -2,10 +2,6 @@ set(jsc_SOURCES
>     ../jsc.cpp
> )
> 
>-if ("${JavaScriptCore_LIBRARY_TYPE}" MATCHES "STATIC")
>-    set(jsc_PRIVATE_DEFINITIONS STATICALLY_LINKED_WITH_JavaScriptCore)
>-endif ()
>-
> set(jsc_LIBRARIES
>     ${CMAKE_DL_LIBS}
>     WebKit::JavaScriptCore
>diff --git a/Source/WTF/wtf/ASCIICType.cpp b/Source/WTF/wtf/ASCIICType.cpp
>index 6f40a70bed61..197bb4435d34 100644
>--- a/Source/WTF/wtf/ASCIICType.cpp
>+++ b/Source/WTF/wtf/ASCIICType.cpp
>@@ -27,7 +27,7 @@
> 
> namespace WTF {
> 
>-WTF_EXPORT_PRIVATE const unsigned char asciiCaseFoldTable[256] = {
>+const unsigned char asciiCaseFoldTable[256] = {
>     0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
>     0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f,
>     0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f,
>diff --git a/Source/WTF/wtf/CMakeLists.txt b/Source/WTF/wtf/CMakeLists.txt
>index a575881bac4a..cae4f014651c 100644
>--- a/Source/WTF/wtf/CMakeLists.txt
>+++ b/Source/WTF/wtf/CMakeLists.txt
>@@ -508,13 +508,6 @@ set(WTF_PRIVATE_INCLUDE_DIRECTORIES
> 
> set(WTF_LIBRARIES
>     ${CMAKE_DL_LIBS}
>-)
>-
>-if (NOT USE_SYSTEM_MALLOC)
>-    list(APPEND WTF_LIBRARIES WebKit::bmalloc)
>-endif ()
>-
>-list(APPEND WTF_LIBRARIES
>     ICU::data
>     ICU::i18n
>     ICU::uc
>@@ -522,7 +515,6 @@ list(APPEND WTF_LIBRARIES
> 
> set(WTF_INTERFACE_LIBRARIES WTF)
> set(WTF_INTERFACE_INCLUDE_DIRECTORIES ${WTF_FRAMEWORK_HEADERS_DIR})
>-set(WTF_INTERFACE_DEPENDENCIES WTF_CopyHeaders)
> 
> WEBKIT_FRAMEWORK_DECLARE(WTF)
> WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
>@@ -531,8 +523,12 @@ WEBKIT_COPY_FILES(WTF_CopyHeaders
>     DESTINATION ${WTF_FRAMEWORK_HEADERS_DIR}/wtf
>     FILES ${WTF_PUBLIC_HEADERS}
> )
>+list(APPEND WTF_INTERFACE_DEPENDENCIES WTF_CopyHeaders)
> 
> WEBKIT_WRAP_SOURCELIST(${WTF_SOURCES})
>+if (NOT USE_SYSTEM_MALLOC)
>+    WEBKIT_FRAMEWORK_LINK(WTF LINK bmalloc)
>+endif ()
> WEBKIT_FRAMEWORK(WTF)
> WEBKIT_FRAMEWORK_TARGET(WTF)
> 
>diff --git a/Source/WTF/wtf/DateMath.h b/Source/WTF/wtf/DateMath.h
>index cfd5d75cfdca..246ba67c764b 100644
>--- a/Source/WTF/wtf/DateMath.h
>+++ b/Source/WTF/wtf/DateMath.h
>@@ -93,7 +93,7 @@ WTF_EXPORT_PRIVATE double parseES5DateFromNullTerminatedCharacters(const char* d
> WTF_EXPORT_PRIVATE double parseDateFromNullTerminatedCharacters(const char* dateString);
> WTF_EXPORT_PRIVATE double parseDateFromNullTerminatedCharacters(const char* dateString, bool& isLocalTime);
> // dayOfWeek: [0, 6] 0 being Monday, day: [1, 31], month: [0, 11], year: ex: 2011, hours: [0, 23], minutes: [0, 59], seconds: [0, 59], utcOffset: [-720,720]. 
>-String makeRFC2822DateString(unsigned dayOfWeek, unsigned day, unsigned month, unsigned year, unsigned hours, unsigned minutes, unsigned seconds, int utcOffset);
>+WTF_EXPORT_PRIVATE String makeRFC2822DateString(unsigned dayOfWeek, unsigned day, unsigned month, unsigned year, unsigned hours, unsigned minutes, unsigned seconds, int utcOffset);
> 
> inline double jsCurrentTime()
> {
>diff --git a/Source/WTF/wtf/FileSystem.h b/Source/WTF/wtf/FileSystem.h
>index e9558667db72..60b32e46fc42 100644
>--- a/Source/WTF/wtf/FileSystem.h
>+++ b/Source/WTF/wtf/FileSystem.h
>@@ -140,7 +140,7 @@ bool excludeFromBackup(const String&); // Returns true if successful.
> WTF_EXPORT_PRIVATE Vector<String> listDirectory(const String& path, const String& filter);
> 
> WTF_EXPORT_PRIVATE CString fileSystemRepresentation(const String&);
>-String stringFromFileSystemRepresentation(const char*);
>+WTF_EXPORT_PRIVATE String stringFromFileSystemRepresentation(const char*);
> 
> inline bool isHandleValid(const PlatformFileHandle& handle) { return handle != invalidPlatformFileHandle; }
> 
>diff --git a/Source/WTF/wtf/PlatformPlayStation.cmake b/Source/WTF/wtf/PlatformPlayStation.cmake
>index fc6f780d4098..f9eb04e4353d 100644
>--- a/Source/WTF/wtf/PlatformPlayStation.cmake
>+++ b/Source/WTF/wtf/PlatformPlayStation.cmake
>@@ -27,6 +27,3 @@ PLAYSTATION_COPY_SHARED_LIBRARIES(WTF_CopySharedLibs
>     FILES
>         ${ICU_LIBRARIES}
> )
>-
>-# bmalloc is compiled as an OBJECT library so it is statically linked
>-list(APPEND WTF_PRIVATE_DEFINITIONS STATICALLY_LINKED_WITH_bmalloc)
>diff --git a/Source/WTF/wtf/PrintStream.h b/Source/WTF/wtf/PrintStream.h
>index 04b0561bce1d..e946013bdfe4 100644
>--- a/Source/WTF/wtf/PrintStream.h
>+++ b/Source/WTF/wtf/PrintStream.h
>@@ -89,8 +89,8 @@ protected:
>         printImpl(remainingValues...);
>     }
>     
>-    virtual PrintStream& begin();
>-    virtual void end();
>+    WTF_EXPORT_PRIVATE virtual PrintStream& begin();
>+    WTF_EXPORT_PRIVATE virtual void end();
> };
> 
> WTF_EXPORT_PRIVATE void printInternal(PrintStream&, const char*);
>diff --git a/Source/WTF/wtf/RunLoop.h b/Source/WTF/wtf/RunLoop.h
>index 2e246e240e7f..ceac2eda4853 100644
>--- a/Source/WTF/wtf/RunLoop.h
>+++ b/Source/WTF/wtf/RunLoop.h
>@@ -117,8 +117,8 @@ public:
>         virtual void fired() = 0;
> 
> #if USE(GLIB_EVENT_LOOP)
>-        void setName(const char*);
>-        void setPriority(int);
>+        WTF_EXPORT_PRIVATE void setName(const char*);
>+        WTF_EXPORT_PRIVATE void setPriority(int);
> #endif
> 
>     private:
>diff --git a/Source/WTF/wtf/glib/GLibUtilities.h b/Source/WTF/wtf/glib/GLibUtilities.h
>index 064cab4f886b..3a5fad543527 100644
>--- a/Source/WTF/wtf/glib/GLibUtilities.h
>+++ b/Source/WTF/wtf/glib/GLibUtilities.h
>@@ -24,9 +24,9 @@
> #include <wtf/Assertions.h>
> #include <wtf/text/CString.h>
> 
>-CString getCurrentExecutablePath();
>-CString getCurrentExecutableName();
>-CString enumToString(GType, guint value);
>+WTF_EXPORT_PRIVATE CString getCurrentExecutablePath();
>+WTF_EXPORT_PRIVATE CString getCurrentExecutableName();
>+WTF_EXPORT_PRIVATE CString enumToString(GType, guint value);
> 
> // These might be added to glib in the future, but in the meantime they're defined here.
> #ifndef GULONG_TO_POINTER
>diff --git a/Source/WTF/wtf/glib/GSocketMonitor.h b/Source/WTF/wtf/glib/GSocketMonitor.h
>index 30f96a301dd1..7ec383a6e37c 100644
>--- a/Source/WTF/wtf/glib/GSocketMonitor.h
>+++ b/Source/WTF/wtf/glib/GSocketMonitor.h
>@@ -39,10 +39,10 @@ class GSocketMonitor {
>     WTF_MAKE_NONCOPYABLE(GSocketMonitor);
> public:
>     GSocketMonitor() = default;
>-    ~GSocketMonitor();
>+    WTF_EXPORT_PRIVATE ~GSocketMonitor();
> 
>-    void start(GSocket*, GIOCondition, RunLoop&, Function<gboolean(GIOCondition)>&&);
>-    void stop();
>+    WTF_EXPORT_PRIVATE void start(GSocket*, GIOCondition, RunLoop&, Function<gboolean(GIOCondition)>&&);
>+    WTF_EXPORT_PRIVATE void stop();
>     bool isActive() const { return !!m_source; }
> 
> private:
>diff --git a/Source/WTF/wtf/glib/SocketConnection.h b/Source/WTF/wtf/glib/SocketConnection.h
>index 10a9fac51c9b..db786d329856 100644
>--- a/Source/WTF/wtf/glib/SocketConnection.h
>+++ b/Source/WTF/wtf/glib/SocketConnection.h
>@@ -40,14 +40,15 @@ public:
>     {
>         return adoptRef(*new SocketConnection(WTFMove(connection), messageHandlers, userData));
>     }
>-    ~SocketConnection();
>+    WTF_EXPORT_PRIVATE ~SocketConnection();
>+
>+    WTF_EXPORT_PRIVATE void sendMessage(const char*, GVariant*);
> 
>     bool isClosed() const { return !m_connection; }
>-    void sendMessage(const char*, GVariant*);
>     void close();
> 
> private:
>-    SocketConnection(GRefPtr<GSocketConnection>&&, const MessageHandlers&, gpointer);
>+    WTF_EXPORT_PRIVATE SocketConnection(GRefPtr<GSocketConnection>&&, const MessageHandlers&, gpointer);
> 
>     bool read();
>     bool readMessage();
>diff --git a/Source/WTF/wtf/linux/CurrentProcessMemoryStatus.h b/Source/WTF/wtf/linux/CurrentProcessMemoryStatus.h
>index 6cb513220770..8f04cf89fb63 100644
>--- a/Source/WTF/wtf/linux/CurrentProcessMemoryStatus.h
>+++ b/Source/WTF/wtf/linux/CurrentProcessMemoryStatus.h
>@@ -38,7 +38,7 @@ struct ProcessMemoryStatus {
>     size_t dt { 0 };
> };
> 
>-void currentProcessMemoryStatus(ProcessMemoryStatus&);
>+WTF_EXPORT_PRIVATE void currentProcessMemoryStatus(ProcessMemoryStatus&);
> 
> } // namespace WTF
> 
>diff --git a/Source/WebCore/CMakeLists.txt b/Source/WebCore/CMakeLists.txt
>index caef46a544e6..412765c7edca 100644
>--- a/Source/WebCore/CMakeLists.txt
>+++ b/Source/WebCore/CMakeLists.txt
>@@ -10,10 +10,6 @@ set_property(DIRECTORY . PROPERTY FOLDER "WebCore")
> 
> add_subdirectory(PAL/pal)
> 
>-if (PAL_LIBRARY_TYPE MATCHES STATIC)
>-    add_definitions(-DSTATICALLY_LINKED_WITH_PAL=1)
>-endif ()
>-
> list(APPEND WebCore_UNIFIED_SOURCE_LIST_FILES
>     "Sources.txt"
> )
>diff --git a/Source/WebCore/PAL/pal/CMakeLists.txt b/Source/WebCore/PAL/pal/CMakeLists.txt
>index ac12685ebd5a..264a87dc8f30 100644
>--- a/Source/WebCore/PAL/pal/CMakeLists.txt
>+++ b/Source/WebCore/PAL/pal/CMakeLists.txt
>@@ -38,15 +38,6 @@ set(PAL_PRIVATE_INCLUDE_DIRECTORIES
>     "${PAL_DIR}/pal/text"
> )
> 
>-# PAL only uses WebKit::WTF but we need to determine where that is
>-# If WTF is statically linked into a shared JavaScriptCore then that should be
>-# linked otherwise it can be linked directly
>-if (NOT ${WTF_LIBRARY_TYPE} STREQUAL "SHARED" AND ${JavaScriptCore_LIBRARY_TYPE} STREQUAL "SHARED")
>-    set(PAL_LIBRARIES WebKit::JavaScriptCore)
>-else ()
>-    set(PAL_LIBRARIES WebKit::WTF)
>-endif ()
>-
> set(PAL_INTERFACE_LIBRARIES PAL)
> set(PAL_INTERFACE_INCLUDE_DIRECTORIES ${PAL_FRAMEWORK_HEADERS_DIR})
> set(PAL_INTERFACE_DEPENDENCIES PAL_CopyHeaders)
>@@ -60,5 +51,6 @@ WEBKIT_COPY_FILES(PAL_CopyHeaders
> )
> 
> WEBKIT_WRAP_SOURCELIST(${PAL_SOURCES})
>+WEBKIT_FRAMEWORK_LINK(PAL LINK WTF)
> WEBKIT_FRAMEWORK(PAL)
> WEBKIT_FRAMEWORK_TARGET(PAL)
>diff --git a/Source/WebCore/platform/ContentType.h b/Source/WebCore/platform/ContentType.h
>index 585a3fd5a7ef..7c278a68e389 100644
>--- a/Source/WebCore/platform/ContentType.h
>+++ b/Source/WebCore/platform/ContentType.h
>@@ -37,11 +37,11 @@ public:
>     WEBCORE_EXPORT explicit ContentType(const String& type);
>     ContentType() = default;
> 
>-    static const String& codecsParameter();
>+    WEBCORE_EXPORT static const String& codecsParameter();
>     static const String& profilesParameter();
> 
>-    String parameter(const String& parameterName) const;
>-    String containerType() const;
>+    WEBCORE_EXPORT String parameter(const String& parameterName) const;
>+    WEBCORE_EXPORT String containerType() const;
>     Vector<String> codecs() const;
>     Vector<String> profiles() const;
>     const String& raw() const { return m_type; }
>diff --git a/Source/WebCore/platform/graphics/cairo/RefPtrCairo.h b/Source/WebCore/platform/graphics/cairo/RefPtrCairo.h
>index aa1d19226b30..ec07678db24f 100644
>--- a/Source/WebCore/platform/graphics/cairo/RefPtrCairo.h
>+++ b/Source/WebCore/platform/graphics/cairo/RefPtrCairo.h
>@@ -36,7 +36,7 @@ namespace WTF {
> template<> void refIfNotNull(cairo_t* ptr);
> template<> WEBCORE_EXPORT void derefIfNotNull(cairo_t* ptr);
> 
>-template<> void refIfNotNull(cairo_surface_t* ptr);
>+template<> WEBCORE_EXPORT void refIfNotNull(cairo_surface_t* ptr);
> template<> WEBCORE_EXPORT void derefIfNotNull(cairo_surface_t* ptr);
> 
> template<> void refIfNotNull(cairo_font_face_t* ptr);
>diff --git a/Source/WebCore/platform/gtk/GtkUtilities.h b/Source/WebCore/platform/gtk/GtkUtilities.h
>index fa8967edb7f5..d52d9385c6fd 100644
>--- a/Source/WebCore/platform/gtk/GtkUtilities.h
>+++ b/Source/WebCore/platform/gtk/GtkUtilities.h
>@@ -45,6 +45,6 @@ WallTime wallTimeForEvent(const GdkEvent*);
> 
> String defaultGtkSystemFont();
> 
>-unsigned stateModifierForGdkButton(unsigned button);
>+WEBCORE_EXPORT unsigned stateModifierForGdkButton(unsigned button);
> 
> } // namespace WebCore
>diff --git a/Source/WebCore/platform/network/soup/CertificateInfo.h b/Source/WebCore/platform/network/soup/CertificateInfo.h
>index 4eac4c76efb4..2afd0a55135d 100644
>--- a/Source/WebCore/platform/network/soup/CertificateInfo.h
>+++ b/Source/WebCore/platform/network/soup/CertificateInfo.h
>@@ -46,7 +46,7 @@ public:
>     explicit CertificateInfo(const WebCore::ResourceResponse&);
>     explicit CertificateInfo(const WebCore::ResourceError&);
>     explicit CertificateInfo(GTlsCertificate*, GTlsCertificateFlags);
>-    ~CertificateInfo();
>+    WEBCORE_EXPORT ~CertificateInfo();
> 
>     GTlsCertificate* certificate() const { return m_certificate.get(); }
>     void setCertificate(GTlsCertificate* certificate) { m_certificate = certificate; }
>diff --git a/Source/WebCore/platform/network/soup/SoupNetworkSession.h b/Source/WebCore/platform/network/soup/SoupNetworkSession.h
>index 72b6507f71d5..c8d4842314ac 100644
>--- a/Source/WebCore/platform/network/soup/SoupNetworkSession.h
>+++ b/Source/WebCore/platform/network/soup/SoupNetworkSession.h
>@@ -68,7 +68,7 @@ public:
>     static void setInitialAcceptLanguages(const CString&);
>     void setAcceptLanguages(const CString&);
> 
>-    static void setShouldIgnoreTLSErrors(bool);
>+    WEBCORE_EXPORT static void setShouldIgnoreTLSErrors(bool);
>     static Optional<ResourceError> checkTLSErrors(const URL&, GTlsCertificate*, GTlsCertificateFlags);
>     static void allowSpecificHTTPSCertificateForHost(const CertificateInfo&, const String& host);
> 
>diff --git a/Source/WebDriver/PlatformGTK.cmake b/Source/WebDriver/PlatformGTK.cmake
>index b786aceafc6d..4c6f989ae2cd 100644
>--- a/Source/WebDriver/PlatformGTK.cmake
>+++ b/Source/WebDriver/PlatformGTK.cmake
>@@ -18,4 +18,6 @@ list(APPEND WebDriver_SOURCES
> 
> list(APPEND WebDriver_LIBRARIES
>     ${LIBSOUP_LIBRARIES}
>+    $<TARGET_OBJECTS:WTF>
>+    $<TARGET_OBJECTS:bmalloc>
> )
>diff --git a/Source/WebKit/CMakeLists.txt b/Source/WebKit/CMakeLists.txt
>index daecd86c74c8..543ea2df8d67 100644
>--- a/Source/WebKit/CMakeLists.txt
>+++ b/Source/WebKit/CMakeLists.txt
>@@ -2,10 +2,6 @@ include(WebKitCommon)
> 
> set_property(DIRECTORY . PROPERTY FOLDER "WebKit")
> 
>-if (PAL_LIBRARY_TYPE MATCHES STATIC)
>-    add_definitions(-DSTATICALLY_LINKED_WITH_PAL=1)
>-endif ()
>-
> set(WebKit_PRIVATE_INCLUDE_DIRECTORIES
>     "${CMAKE_BINARY_DIR}"
> )
>@@ -263,9 +259,6 @@ set(WebKit_MESSAGES_IN_FILES
>     WebProcess/WebStorage/StorageAreaMap.messages.in
> )
> 
>-# FIXME: https://bugs.webkit.org/show_bug.cgi?id=210366
>-set(WebKit_LIBRARIES WebKit::WebCore)
>-
> set(WebProcess_LIBRARIES
>     WebKit
> )
>@@ -510,6 +503,7 @@ list(APPEND WebKit_SOURCES
> list(APPEND WebKit_SOURCES ${WebKit_DERIVED_SOURCES})
> 
> WEBKIT_COMPUTE_SOURCES(WebKit)
>+WEBKIT_FRAMEWORK_LINK(WebKit LINK WTF JavaScriptCore PAL WebCore)
> WEBKIT_FRAMEWORK(WebKit)
> WEBKIT_FRAMEWORK_TARGET(WebKit)
> ADD_WEBKIT_PREFIX_HEADER(WebKit)
>diff --git a/Source/WebKit/PlatformFTW.cmake b/Source/WebKit/PlatformFTW.cmake
>index ce03bded03fe..256ca64f6058 100644
>--- a/Source/WebKit/PlatformFTW.cmake
>+++ b/Source/WebKit/PlatformFTW.cmake
>@@ -208,8 +208,3 @@ list(APPEND WebKit_PUBLIC_FRAMEWORK_HEADERS
> 
>     UIProcess/API/C/win/WKView.h
> )
>-
>-list(APPEND WebKit_PRIVATE_DEFINITIONS
>-    STATICALLY_LINKED_WITH_PAL
>-    STATICALLY_LINKED_WITH_WebCore
>-)
>diff --git a/Source/WebKit/PlatformGTK.cmake b/Source/WebKit/PlatformGTK.cmake
>index 9631b99db696..24239e6c5c62 100644
>--- a/Source/WebKit/PlatformGTK.cmake
>+++ b/Source/WebKit/PlatformGTK.cmake
>@@ -447,6 +447,11 @@ list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES
>     ${LIBSOUP_INCLUDE_DIRS}
> )
> 
>+list(APPEND WebKit_PRIVATE_LIBRARIES
>+    $<TARGET_OBJECTS:WebCore>
>+    $<TARGET_OBJECTS:PAL>
>+)
>+
> if (USE_WPE_RENDERER)
>     list(APPEND WebKit_INCLUDE_DIRECTORIES
>         "${WEBKIT_DIR}/WebProcess/WebPage/libwpe"
>@@ -468,10 +473,12 @@ set(WebKitCommonSystemIncludeDirectories ${WebKit_SYSTEM_INCLUDE_DIRECTORIES})
> list(APPEND WebProcess_SOURCES
>     WebProcess/EntryPoint/unix/WebProcessMain.cpp
> )
>+list(APPEND WebProcess_LIBRARIES ${LIBGCRYPT_LIBRARIES})
> 
> list(APPEND NetworkProcess_SOURCES
>     NetworkProcess/EntryPoint/unix/NetworkProcessMain.cpp
> )
>+list(APPEND NetworkProcess_LIBRARIES ${LIBGCRYPT_LIBRARIES})
> 
> list(APPEND GPUProcess_SOURCES
>     GPUProcess/EntryPoint/unix/GPUProcessMain.cpp
>diff --git a/Source/WebKit/PlatformWPE.cmake b/Source/WebKit/PlatformWPE.cmake
>index 094b2bb76ba1..2c6902506dd8 100644
>--- a/Source/WebKit/PlatformWPE.cmake
>+++ b/Source/WebKit/PlatformWPE.cmake
>@@ -67,10 +67,12 @@ list(APPEND WebKit_DEPENDENCIES
> list(APPEND WebProcess_SOURCES
>     WebProcess/EntryPoint/unix/WebProcessMain.cpp
> )
>+list(APPEND WebProcess_LIBRARIES ${LIBGCRYPT_LIBRARIES})
> 
> list(APPEND NetworkProcess_SOURCES
>     NetworkProcess/EntryPoint/unix/NetworkProcessMain.cpp
> )
>+list(APPEND NetworkProcess_LIBRARIES ${LIBGCRYPT_LIBRARIES})
> 
> list(APPEND GPUProcess_SOURCES
>     GPUProcess/EntryPoint/unix/GPUProcessMain.cpp
>diff --git a/Source/WebKit/PlatformWin.cmake b/Source/WebKit/PlatformWin.cmake
>index 950de9e16362..3c1cafa50175 100644
>--- a/Source/WebKit/PlatformWin.cmake
>+++ b/Source/WebKit/PlatformWin.cmake
>@@ -173,6 +173,7 @@ if (${WTF_PLATFORM_WIN_CAIRO})
>     )
> 
>     list(APPEND WebKit_PRIVATE_LIBRARIES
>+        $<TARGET_OBJECTS:PAL>
>         $<TARGET_OBJECTS:WebCore>
>         OpenSSL::SSL
>         mfuuid.lib
>@@ -212,8 +213,3 @@ if (${WTF_PLATFORM_WIN_CAIRO})
>         UIProcess/API/C/curl/WKWebsiteDataStoreRefCurl.h
>     )
> endif ()
>-
>-list(APPEND WebKit_PRIVATE_DEFINITIONS
>-    STATICALLY_LINKED_WITH_PAL
>-    STATICALLY_LINKED_WITH_WebCore
>-)
>diff --git a/Source/WebKit/UIProcess/TextChecker.h b/Source/WebKit/UIProcess/TextChecker.h
>index 58c3afe37393..e46e89c0ffbe 100644
>--- a/Source/WebKit/UIProcess/TextChecker.h
>+++ b/Source/WebKit/UIProcess/TextChecker.h
>@@ -26,6 +26,7 @@
> #pragma once
> 
> #include "TextCheckerCompletion.h"
>+#include "WKDeclarationSpecifiers.h"
> #include <WebCore/EditorClient.h>
> #include <WebCore/TextCheckerClient.h>
> 
>@@ -41,7 +42,7 @@ public:
>     static const TextCheckerState& state();
>     static bool isContinuousSpellCheckingAllowed();
> 
>-    static bool setContinuousSpellCheckingEnabled(bool);
>+    WK_EXPORT static bool setContinuousSpellCheckingEnabled(bool);
>     static void setGrammarCheckingEnabled(bool);
>     
>     static void setTestingMode(bool);
>diff --git a/Source/WebKitLegacy/PlatformWin.cmake b/Source/WebKitLegacy/PlatformWin.cmake
>index 461b0884eac8..a6ed35eeb76b 100644
>--- a/Source/WebKitLegacy/PlatformWin.cmake
>+++ b/Source/WebKitLegacy/PlatformWin.cmake
>@@ -423,6 +423,7 @@ add_library(WebKitLegacyGUID STATIC
> set_target_properties(WebKitLegacyGUID PROPERTIES OUTPUT_NAME WebKitGUID${DEBUG_SUFFIX})
> 
> list(APPEND WebKitLegacy_PRIVATE_LIBRARIES
>+    $<TARGET_OBJECTS:PAL>
>     $<TARGET_OBJECTS:WebCore>
>     Comctl32
>     Comsupp
>diff --git a/Source/bmalloc/CMakeLists.txt b/Source/bmalloc/CMakeLists.txt
>index 5522a844c2af..a72ab672e716 100644
>--- a/Source/bmalloc/CMakeLists.txt
>+++ b/Source/bmalloc/CMakeLists.txt
>@@ -141,6 +141,10 @@ set(bmalloc_LIBRARIES
>     ${CMAKE_DL_LIBS}
> )
> 
>+if (BUSE_EXPORT_MACROS)
>+    set(bmalloc_PRIVATE_DEFINITIONS BUSE_EXPORT_MACROS)
>+endif ()
>+
> set(bmalloc_INTERFACE_LIBRARIES bmalloc)
> set(bmalloc_INTERFACE_INCLUDE_DIRECTORIES ${bmalloc_FRAMEWORK_HEADERS_DIR})
> set(bmalloc_INTERFACE_DEPENDENCIES bmalloc_CopyHeaders)
>@@ -162,4 +166,7 @@ if (DEVELOPER_MODE)
>     target_include_directories(mbmalloc PRIVATE ${bmalloc_PRIVATE_INCLUDE_DIRECTORIES})
>     target_link_libraries(mbmalloc Threads::Threads bmalloc)
>     set_target_properties(mbmalloc PROPERTIES COMPILE_DEFINITIONS "BUILDING_mbmalloc")
>+    if (BUSE_EXPORT_MACROS)
>+        target_compile_definitions(mbmalloc PRIVATE BUSE_EXPORT_MACROS)
>+    endif ()
> endif ()
>diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake
>index de411c97931e..5cb933790062 100644
>--- a/Source/cmake/OptionsGTK.cmake
>+++ b/Source/cmake/OptionsGTK.cmake
>@@ -447,6 +447,22 @@ set(JavaScriptCore_PKGCONFIG_FILE ${CMAKE_BINARY_DIR}/Source/JavaScriptCore/java
> 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)
> 
>+if (${CMAKE_VERSION} VERSION_LESS "3.12.0")
>+    message(WARNING "Using static libraries instead of object libraries. Consider upgrading your CMake version")
>+    set(bmalloc_LIBRARY_TYPE STATIC)
>+    set(WTF_LIBRARY_TYPE STATIC)
>+else ()
>+    SET_AND_EXPOSE_TO_BUILD(BUSE_EXPORT_MACROS ON)
>+    SET_AND_EXPOSE_TO_BUILD(USE_EXPORT_MACROS ON)
>+    set(CMAKE_CXX_VISIBILITY_PRESET hidden)
>+    set(CMAKE_VISIBILITY_INLINES_HIDDEN ON)
>+
>+    set(bmalloc_LIBRARY_TYPE OBJECT)
>+    set(WTF_LIBRARY_TYPE OBJECT)
>+    set(WebCore_LIBRARY_TYPE OBJECT)
>+    set(PAL_LIBRARY_TYPE OBJECT)
>+endif ()
>+
> set(JavaScriptCore_LIBRARY_TYPE SHARED)
> set(SHOULD_INSTALL_JS_SHELL ON)
> 
>diff --git a/Source/cmake/OptionsWinCairo.cmake b/Source/cmake/OptionsWinCairo.cmake
>index 35edf853f893..316481cc50f8 100644
>--- a/Source/cmake/OptionsWinCairo.cmake
>+++ b/Source/cmake/OptionsWinCairo.cmake
>@@ -79,5 +79,6 @@ set(WTF_SCRIPTS_DIR ${CMAKE_BINARY_DIR}/WTF/Scripts)
> set(JavaScriptCore_SCRIPTS_DIR ${CMAKE_BINARY_DIR}/JavaScriptCore/Scripts)
> 
> # Override library types
>+set(PAL_LIBRARY_TYPE OBJECT)
> set(WebCore_LIBRARY_TYPE OBJECT)
> set(WebCoreTestSupport_LIBRARY_TYPE OBJECT)
>diff --git a/Source/cmake/WebKitMacros.cmake b/Source/cmake/WebKitMacros.cmake
>index c078d57582e7..2e15c05a7e91 100644
>--- a/Source/cmake/WebKitMacros.cmake
>+++ b/Source/cmake/WebKitMacros.cmake
>@@ -388,6 +388,109 @@ function(WEBKIT_COPY_FILES target_name)
>     add_custom_target(${target_name} ALL DEPENDS ${dst_files})
> endfunction()
> 
>+function(_WEBKIT_LINK_FRAMEWORK_INTO target_name framework _public_frameworks_var _private_frameworks_var)
>+    set_property(GLOBAL PROPERTY ${framework}_LINKED_INTO ${target_name})
>+
>+    get_property(_framework_public_frameworks GLOBAL PROPERTY ${framework}_FRAMEWORKS)
>+    foreach (dependency IN LISTS ${_framework_public_frameworks})
>+        set(${_public_frameworks_var} "${${_public_frameworks_var}};${dependency}" PARENT_SCOPE)
>+    endforeach ()
>+
>+    get_property(_framework_private_frameworks GLOBAL PROPERTY ${framework}_PRIVATE_FRAMEWORKS)
>+    foreach (dependency IN LISTS _framework_private_frameworks)
>+        set(${_private_frameworks_var} "${${_private_frameworks_var}};${dependency}" PARENT_SCOPE)
>+        _WEBKIT_LINK_FRAMEWORK_INTO(${target_name} ${dependency} ${_public_frameworks_var} ${_private_frameworks_var})
>+    endforeach ()
>+endfunction()
>+
>+# Macro for determining the visibility for a linked framework
>+macro(WEBKIT_FRAMEWORK_LINK target_name)
>+    set(multiValueArgs LINK)
>+    cmake_parse_arguments(opt "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
>+
>+    # Set the public libraries before modifying them when determining visibility.
>+    set_property(GLOBAL PROPERTY ${target_name}_PUBLIC_LIBRARIES ${${target_name}_LIBRARIES})
>+
>+    set(_public_frameworks)
>+    set(_private_frameworks)
>+
>+    foreach (framework IN LISTS opt_LINK)
>+        get_property(_linked_into GLOBAL PROPERTY ${framework}_LINKED_INTO)
>+        if (_linked_into)
>+            list(APPEND _public_frameworks ${_linked_into})
>+        elseif (${framework}_LIBRARY_TYPE STREQUAL "SHARED")
>+            list(APPEND _public_frameworks ${framework})
>+        else ()
>+            list(APPEND _private_frameworks ${framework})
>+        endif ()
>+    endforeach ()
>+
>+    # Recurse into the dependent frameworks
>+    if (_private_frameworks)
>+        list(REMOVE_DUPLICATES _private_frameworks)
>+    endif ()
>+    if (${target_name}_LIBRARY_TYPE STREQUAL "SHARED")
>+        set_property(GLOBAL PROPERTY ${target_name}_LINKED_INTO ${target_name})
>+        foreach (framework IN LISTS _private_frameworks)
>+            _WEBKIT_LINK_FRAMEWORK_INTO(${target_name} ${framework} _public_frameworks _private_frameworks)
>+        endforeach ()
>+    endif ()
>+
>+    # Add to the ${target_name}_LIBRARIES
>+    if (_public_frameworks)
>+        list(REMOVE_DUPLICATES _public_frameworks)
>+    endif ()
>+    foreach (framework IN LISTS _public_frameworks)
>+        list(APPEND ${target_name}_LIBRARIES WebKit::${framework})
>+    endforeach ()
>+
>+    # Add to the ${target_name}_PRIVATE_LIBRARIES
>+    if (_private_frameworks)
>+        list(REMOVE_DUPLICATES _private_frameworks)
>+    endif ()
>+    foreach (framework IN LISTS _private_frameworks)
>+        list(APPEND ${target_name}_PRIVATE_LIBRARIES WebKit::${framework})
>+        list(APPEND ${target_name}_PRIVATE_DEFINITIONS "STATICALLY_LINKED_WITH_${framework}")
>+        if (${target_name}_LIBRARY_TYPE STREQUAL "SHARED")
>+            get_property(_linked_libraries GLOBAL PROPERTY ${framework}_PUBLIC_LIBRARIES)
>+            list(APPEND ${target_name}_INTERFACE_LIBRARIES
>+                ${_linked_libraries}
>+            )
>+            list(APPEND ${target_name}_INTERFACE_INCLUDE_DIRECTORIES
>+                ${${framework}_FRAMEWORK_HEADERS_DIR}
>+                ${${framework}_PRIVATE_FRAMEWORK_HEADERS_DIR}
>+            )
>+        endif ()
>+    endforeach ()
>+
>+    set_property(GLOBAL PROPERTY ${target_name}_FRAMEWORKS ${_public_frameworks})
>+    set_property(GLOBAL PROPERTY ${target_name}_PRIVATE_FRAMEWORKS ${_private_frameworks})
>+
>+    WEBKIT_FRAMEWORK_DEBUG(${target_name})
>+    message(STATUS "Libraries: ${${target_name}_LIBRARIES}")
>+    message(STATUS "Private Libraries: ${${target_name}_PRIVATE_LIBRARIES}")
>+    message(STATUS "Interface Libraries: ${${target_name}_INTERFACE_LIBRARIES}")
>+    message(STATUS "Private compile definitions: ${${target_name}_PRIVATE_DEFINITIONS}")
>+    message(STATUS "Interface includes: ${${target_name}_INTERFACE_INCLUDE_DIRECTORIES}")
>+endmacro()
>+
>+macro(WEBKIT_FRAMEWORK_DEBUG target_name)
>+    message(STATUS "Target: ${target_name}")
>+    message(STATUS "Library type: ${${target_name}_LIBRARY_TYPE}")
>+    get_property(_linked_into GLOBAL PROPERTY ${target_name}_LINKED_INTO)
>+    message(STATUS "Linked into: ${_linked_into}")
>+    message(STATUS "Frameworks:")
>+    get_property(_public_frameworks GLOBAL PROPERTY ${target_name}_FRAMEWORKS)
>+    foreach (framework IN LISTS _public_frameworks)
>+        message(STATUS "  ${framework}")
>+    endforeach ()
>+    message(STATUS "Private Frameworks:")
>+    get_property(_private_frameworks GLOBAL PROPERTY ${target_name}_PRIVATE_FRAMEWORKS)
>+    foreach (framework IN LISTS _private_frameworks)
>+        message(STATUS "  ${framework}")
>+    endforeach ()
>+endmacro()
>+
> # Helper macros for debugging CMake problems.
> macro(WEBKIT_DEBUG_DUMP_COMMANDS)
>     set(CMAKE_VERBOSE_MAKEFILE ON)
>diff --git a/Tools/DumpRenderTree/TestNetscapePlugIn/PlatformGTK.cmake b/Tools/DumpRenderTree/TestNetscapePlugIn/PlatformGTK.cmake
>index 7b471d75a04c..ad8a88844722 100644
>--- a/Tools/DumpRenderTree/TestNetscapePlugIn/PlatformGTK.cmake
>+++ b/Tools/DumpRenderTree/TestNetscapePlugIn/PlatformGTK.cmake
>@@ -1,3 +1,8 @@
>+list(APPEND TestNetscapePlugIn_LIBRARIES
>+    $<TARGET_OBJECTS:WTF>
>+    $<TARGET_OBJECTS:bmalloc>
>+)
>+
> if (MOZ_X11)
>     list(APPEND TestNetscapePlugIn_SYSTEM_INCLUDE_DIRECTORIES
>         ${X11_INCLUDE_DIR}
>diff --git a/Tools/TestWebKitAPI/CMakeLists.txt b/Tools/TestWebKitAPI/CMakeLists.txt
>index 5deda787c80b..584b8c96717b 100644
>--- a/Tools/TestWebKitAPI/CMakeLists.txt
>+++ b/Tools/TestWebKitAPI/CMakeLists.txt
>@@ -332,7 +332,7 @@ if (ENABLE_WEBKIT)
> 
>     target_compile_definitions(TestWebKitAPIInjectedBundle PRIVATE BUILDING_TestWebKit)
>     target_include_directories(TestWebKitAPIInjectedBundle PRIVATE ${TestWebKit_PRIVATE_INCLUDE_DIRECTORIES})
>-    target_link_libraries(TestWebKitAPIInjectedBundle PRIVATE WebKit::WebKit WTF)
>+    target_link_libraries(TestWebKitAPIInjectedBundle PRIVATE WebKit::WebKit)
> 
>     if (COMPILER_IS_GCC_OR_CLANG)
>         WEBKIT_ADD_TARGET_CXX_FLAGS(TestWebKitAPIInjectedBundle -Wno-dangling-else
>diff --git a/Tools/TestWebKitAPI/InjectedBundleMain.cpp b/Tools/TestWebKitAPI/InjectedBundleMain.cpp
>index b2537f737d51..19e88d275c51 100644
>--- a/Tools/TestWebKitAPI/InjectedBundleMain.cpp
>+++ b/Tools/TestWebKitAPI/InjectedBundleMain.cpp
>@@ -30,11 +30,7 @@
> #include "InjectedBundleController.h"
> #include <WebKit/WKBundleInitialize.h>
> 
>-#if defined(WIN32) || defined(_WIN32)
>-extern "C" __declspec(dllexport) 
>-#else
>-extern "C"
>-#endif
>+extern "C" WTF_EXPORT_DECLARATION
> void WKBundleInitialize(WKBundleRef bundle, WKTypeRef initializationUserData)
> {
>     TestWebKitAPI::InjectedBundleController::singleton().initialize(bundle, initializationUserData);
>diff --git a/Tools/TestWebKitAPI/PlatformGTK.cmake b/Tools/TestWebKitAPI/PlatformGTK.cmake
>index b755a5994cc7..c5b30f5b4432 100644
>--- a/Tools/TestWebKitAPI/PlatformGTK.cmake
>+++ b/Tools/TestWebKitAPI/PlatformGTK.cmake
>@@ -28,6 +28,11 @@ list(APPEND TestWTF_LIBRARIES
>     GTK::GTK
> )
> 
>+list(APPEND TestWTF_PRIVATE_LIBRARIES
>+    $<TARGET_OBJECTS:WTF>
>+    $<TARGET_OBJECTS:bmalloc>
>+)
>+
> # TestWebCore
> list(APPEND TestWebCore_SOURCES
>     ${test_main_SOURCES}
>@@ -50,7 +55,11 @@ list(APPEND TestWebCore_SYSTEM_INCLUDE_DIRECTORIES
> list(APPEND TestWebCore_LIBRARIES
>     GTK::GTK
> )
>-ADD_WHOLE_ARCHIVE_TO_LIBRARIES(TestWebCore_LIBRARIES)
>+
>+list(APPEND TestWebCore_PRIVATE_LIBRARIES
>+    $<TARGET_OBJECTS:PAL>
>+    $<TARGET_OBJECTS:WebCore>
>+)
> 
> # TestWebKit
> list(APPEND TestWebKit_SOURCES
>diff --git a/Tools/TestWebKitAPI/PlatformWin.cmake b/Tools/TestWebKitAPI/PlatformWin.cmake
>index b400bac405ae..d91c10917597 100644
>--- a/Tools/TestWebKitAPI/PlatformWin.cmake
>+++ b/Tools/TestWebKitAPI/PlatformWin.cmake
>@@ -41,6 +41,7 @@ list(APPEND TestWebCore_SOURCES
> list(APPEND TestWebCore_DEFINITIONS ${webcore_DEFINITIONS})
> 
> list(APPEND TestWebCore_LIBRARIES
>+    $<TARGET_OBJECTS:PAL>
>     $<TARGET_OBJECTS:WebCore>
>     Crypt32
>     D2d1
>diff --git a/Tools/TestWebKitAPI/Tests/WebKitGLib/WebExtensionTest.cpp b/Tools/TestWebKitAPI/Tests/WebKitGLib/WebExtensionTest.cpp
>index 6d2a48604b23..a8d418198e2c 100644
>--- a/Tools/TestWebKitAPI/Tests/WebKitGLib/WebExtensionTest.cpp
>+++ b/Tools/TestWebKitAPI/Tests/WebKitGLib/WebExtensionTest.cpp
>@@ -704,7 +704,7 @@ static void registerGResource(void)
>     g_resource_unref(resource);
> }
> 
>-extern "C" void webkit_web_extension_initialize_with_user_data(WebKitWebExtension* extension, GVariant* userData)
>+extern "C" WTF_EXPORT_DECLARATION void webkit_web_extension_initialize_with_user_data(WebKitWebExtension* extension, GVariant* userData)
> {
>     WebKitScriptWorld* isolatedWorld = webkit_script_world_new_with_name("WebExtensionTestScriptWorld");
>     g_assert_true(WEBKIT_IS_SCRIPT_WORLD(isolatedWorld));
>diff --git a/Tools/TestWebKitAPI/Tests/WebKitGLib/WebProcessTest.cpp b/Tools/TestWebKitAPI/Tests/WebKitGLib/WebProcessTest.cpp
>index f441a719a823..32e71a506025 100644
>--- a/Tools/TestWebKitAPI/Tests/WebKitGLib/WebProcessTest.cpp
>+++ b/Tools/TestWebKitAPI/Tests/WebKitGLib/WebProcessTest.cpp
>@@ -99,7 +99,7 @@ static void windowObjectClearedCallback(WebKitScriptWorld* world, WebKitWebPage*
>     jsc_context_set_value(context.get(), "WebProcessTestRunner", testRunner.get());
> }
> 
>-extern "C" void webkit_web_extension_initialize(WebKitWebExtension* extension)
>+extern "C" WTF_EXPORT_DECLARATION void webkit_web_extension_initialize(WebKitWebExtension* extension)
> {
>     webkitWebExtensionSetGarbageCollectOnPageDestroy(extension);
>     g_signal_connect(webkit_script_world_get_default(), "window-object-cleared", G_CALLBACK(windowObjectClearedCallback), extension);
>diff --git a/Tools/WebKitTestRunner/CMakeLists.txt b/Tools/WebKitTestRunner/CMakeLists.txt
>index 6d1640085b91..9ae8dc1e4861 100644
>--- a/Tools/WebKitTestRunner/CMakeLists.txt
>+++ b/Tools/WebKitTestRunner/CMakeLists.txt
>@@ -24,8 +24,8 @@ set(WebKitTestRunner_SOURCES
> )
> 
> set(WebKitTestRunner_LIBRARIES
>-    WebCoreTestSupport
>     WebKit::JavaScriptCore
>+    WebKit::WebCoreTestSupport
>     WebKit::WebKit
> )
> 
>@@ -37,10 +37,6 @@ set(WebKitTestRunner_INCLUDE_DIRECTORIES
>     ${WebKitTestRunner_UISCRIPTCONTEXT_DIR}
> )
> 
>-list(APPEND WebKitTestRunner_INCLUDE_DIRECTORIES
>-    ${WEBCORE_DIR}/testing/js
>-)
>-
> list(APPEND WebKitTestRunner_INCLUDE_DIRECTORIES
>     ${WebCore_PRIVATE_FRAMEWORK_HEADERS_DIR}
> )
>diff --git a/Tools/WebKitTestRunner/InjectedBundle/InjectedBundleMain.cpp b/Tools/WebKitTestRunner/InjectedBundle/InjectedBundleMain.cpp
>index dfa3d318f572..1fd2c6acc06f 100644
>--- a/Tools/WebKitTestRunner/InjectedBundle/InjectedBundleMain.cpp
>+++ b/Tools/WebKitTestRunner/InjectedBundle/InjectedBundleMain.cpp
>@@ -28,11 +28,7 @@
> 
> #include <WebKit/WKBundleInitialize.h>
> 
>-#if defined(WIN32)
>-extern "C" __declspec(dllexport)
>-#else
>-extern "C"
>-#endif
>+extern "C" WTF_EXPORT_DECLARATION
> void WKBundleInitialize(WKBundleRef bundle, WKTypeRef initializationUserData)
> {
>     WTR::InjectedBundle::singleton().initialize(bundle, initializationUserData);

Actions: View | Formatted Diff | Diff

Attachments on bug 210366: 396142 | 396143 | 396153 | 396154 | 396171 | 396172 | 396180 | 396181 | 396182 | 396184 | 396193 | 396194 | 396314 | 396851 | 396853 | 396854 | 396928 | 396929 | 396931 | 397389 | 397473 | 397475 | 397487 | 397491 | 397498 | 397698 | 397701 | 397703 | 397717 | 397724 | 397726 | 397728 | 397735 | 397747 | 397787 | 397788 | 397790 | 397793 | 397798 | 397799 | 397844 | 397853 | 397874 | 397877 | 397881 | 398065 | 398075 | 415452 | 415454 | 415565 | 415701 | 415702 | 415703 | 415706 | 415708 | 415709 | 415713 | 415715 | 415720 | 415721 | 415922 | 415930 | 415932 | 416001