Attachment 331396 Details for Bug 181683 – Patch

[patch] Patch

bug-181683-20180116120655.patch (text/plain), 3.27 KB, created by Michael Catanzaro on 2018-01-16 10:06:55 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Catanzaro

Created: 2018-01-16 10:06:55 PST

Size: 3.27 KB

patch

obsolete

>Subversion Revision: 226961
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 6cf0d7f1febc5cd001d24fb6dcff71cc06d8a80f..9343ac80c8ba3837da9ad0e9d40434d3f9c53920 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,14 @@
>+2018-01-16  Michael Catanzaro  <mcatanzaro@igalia.com>
>+
>+        PAL should link to JavaScriptCore rather than WTF
>+        https://bugs.webkit.org/show_bug.cgi?id=181683
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Do not link directly to JavaScriptCore. Get it via PAL.
>+
>+        * CMakeLists.txt:
>+
> 2018-01-15  Michael Catanzaro  <mcatanzaro@igalia.com>
> 
>         Improve use of ExportMacros
>diff --git a/Source/WebCore/PAL/ChangeLog b/Source/WebCore/PAL/ChangeLog
>index 018e0ae00424a2f536ed03723da811192922dad6..231158eb9e7935799dc25256cb5928deda250d92 100644
>--- a/Source/WebCore/PAL/ChangeLog
>+++ b/Source/WebCore/PAL/ChangeLog
>@@ -1,3 +1,32 @@
>+2018-01-16  Michael Catanzaro  <mcatanzaro@igalia.com>
>+
>+        PAL should link to JavaScriptCore rather than WTF
>+        https://bugs.webkit.org/show_bug.cgi?id=181683
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Currently we are accidentally linking WTF into both libjavascriptcoregtk and libwebkit2gtk,
>+        which could in theory cause problems similar to bug #179914. There are only two possible
>+        solutions:
>+
>+         - Ensure WTF always built as a shared library if JavaScriptCore is built as a shared
>+           library
>+         - Change PAL to link to JavaScriptCore instead of WTF
>+
>+        The problem here is caused by layer hopping. It can never be a problem if each library only
>+        links to the next lowest-layered library.
>+
>+        The downside is this allows PAL to use JavaScriptCore symbols, which is not super desirable.
>+        I came up with a hack yesterday for PAL to link to WTF usually, but link to JavaScriptCore
>+        instead if ${JavaScriptCore_LIBRARY_TYPE} MATCHES "SHARED" AND ${WTF_LIBRARY_TYPE} MATCHES
>+        "STATIC". But that is getting too complex and introduces more possibility for platform-
>+        dependent build failures. Better to just accept that PAL will depend on JavaScriptCore.
>+
>+        Note: I'm not brave enough to update the XCode build. We can use that to enforce that no
>+        JavaScriptCore symbols actually get used, I guess....
>+
>+        * pal/CMakeLists.txt:
>+
> 2018-01-15  Michael Catanzaro  <mcatanzaro@igalia.com>
> 
>         Improve use of ExportMacros
>diff --git a/Source/WebCore/CMakeLists.txt b/Source/WebCore/CMakeLists.txt
>index dbbeed747a26cb97ef209ff5d1ed9b426895be9d..032d6ee99e5541aab31aab1bd489fb336e8c8321 100644
>--- a/Source/WebCore/CMakeLists.txt
>+++ b/Source/WebCore/CMakeLists.txt
>@@ -1076,7 +1076,6 @@ set(WebCore_LIBRARIES
>     ${LIBXSLT_LIBRARIES}
>     ${SQLITE_LIBRARIES}
>     ${ZLIB_LIBRARIES}
>-    JavaScriptCore${DEBUG_SUFFIX}
>     PAL${DEBUG_SUFFIX}
> )
> 
>diff --git a/Source/WebCore/PAL/pal/CMakeLists.txt b/Source/WebCore/PAL/pal/CMakeLists.txt
>index 544fff148aecf45359e13d3e0895dbf310fa93de..33c2d81c635e80f6c653ca64bc822a4f0deb63b6 100644
>--- a/Source/WebCore/PAL/pal/CMakeLists.txt
>+++ b/Source/WebCore/PAL/pal/CMakeLists.txt
>@@ -23,7 +23,7 @@ set(PAL_SYSTEM_INCLUDE_DIRECTORIES
> )
> 
> set(PAL_LIBRARIES
>-    PRIVATE WTF
>+    JavaScriptCore${DEBUG_SUFFIX}
> )
> 
> WEBKIT_FRAMEWORK_DECLARE(PAL)

Flags:

annulen: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 181683: 331394 | 331396