Attachment 347672 Details for Bug 186722 – Patch

[patch] Patch

bug-186722-20180821144029.patch (text/plain), 3.42 KB, created by Michael Catanzaro on 2018-08-21 12:40:31 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Catanzaro

Created: 2018-08-21 12:40:31 PDT

Size: 3.42 KB

patch

obsolete

>Subversion Revision: 235114
>diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake
>index 945dedec22eff04197728abd5a6e501a950d507f..a0dea9d572cb19ba0126149f840e05f43cc09e89 100644
>--- a/Source/cmake/OptionsGTK.cmake
>+++ b/Source/cmake/OptionsGTK.cmake
>@@ -126,13 +126,11 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ASYNC_SCROLLING PRIVATE ON)
> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DRAG_SUPPORT PUBLIC ON)
> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_GEOLOCATION PUBLIC ON)
> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ICONDATABASE PUBLIC ON)
>-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_JIT PUBLIC ON)
> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SAMPLING_PROFILER PUBLIC ON)
> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SPELLCHECK PUBLIC ON)
> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TOUCH_EVENTS PUBLIC ON)
> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_CRYPTO PUBLIC ON)
> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBDRIVER PUBLIC ON)
>-WEBKIT_OPTION_DEFAULT_PORT_VALUE(USE_SYSTEM_MALLOC PUBLIC OFF)
> 
> # Private options shared with other WebKit ports. Add options here when
> # we need a value different from the default defined in WebKitFeatures.cmake.
>diff --git a/Source/cmake/OptionsWPE.cmake b/Source/cmake/OptionsWPE.cmake
>index e87011d52d6e8c7c312ce7ec936ce7c2ad48970c..97a6fecb52bd08e987ac63bab937d65240025709 100644
>--- a/Source/cmake/OptionsWPE.cmake
>+++ b/Source/cmake/OptionsWPE.cmake
>@@ -21,11 +21,9 @@ include(GStreamerDefinitions)
> # changing the value of the option.
> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ACCELERATED_2D_CANVAS PUBLIC OFF)
> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ENCRYPTED_MEDIA PUBLIC ${ENABLE_EXPERIMENTAL_FEATURES})
>-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_JIT PUBLIC ON)
> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBDRIVER PUBLIC ON)
> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_CRYPTO PUBLIC ON)
> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_XSLT PUBLIC ON)
>-WEBKIT_OPTION_DEFAULT_PORT_VALUE(USE_SYSTEM_MALLOC PUBLIC OFF)
> 
> # Private options shared with other WebKit ports. Add options here only if
> # we need a value different from the default defined in WebKitFeatures.cmake.
>diff --git a/ChangeLog b/ChangeLog
>index 3eecbe1e940da57b102e943f271c25344c1bb6c9..2f950311513c6f1c3d9eb948f1063f4f6e1acd1f 100644
>--- a/ChangeLog
>+++ b/ChangeLog
>@@ -1,3 +1,22 @@
>+2018-08-21  Michael Catanzaro  <mcatanzaro@igalia.com>
>+
>+        [CMake] Automatically disable JIT and enable USE_SYSTEM_MALLOC on unfamiliar architectures
>+        https://bugs.webkit.org/show_bug.cgi?id=186722
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Time for part #2! This change was defeated for GTK and WPE by the code that makes the
>+        options public. We have three options: (a) duplicate the architecture check currently in
>+        WebKitFeatures.cmake in both OptionsGTK.cmake and OptionsWPE.cmake, (b) rely on the result
>+        of that check in OptionsGTK.cmake and OptionsWPE.cmake by using ENABLE_JIT_DEFAULT and
>+        USE_SYSTEM_MALLOC_DEFAULT, a fragile encapsulation violation, or (c) just make the options
>+        private. They have been public up until now because they needed to be turned off on
>+        unsupported architectures. But now they are off by default and enabled only for particular
>+        whitelisted architectures, so they shouldn't be needed anymore.
>+
>+        * Source/cmake/OptionsGTK.cmake:
>+        * Source/cmake/OptionsWPE.cmake:
>+
> 2018-08-18  Michael Catanzaro  <mcatanzaro@igalia.com>
> 
>         Adjust CMAKE_MODULE_LINKER_FLAGS for asan

Actions: View | Formatted Diff | Diff

Attachments on bug 186722: 342881 | 347672 | 347834 | 355563