Attachment 341946 Details for Bug 186286 – Patch

[patch] Patch

bug-186286-20180604190108.patch (text/plain), 4.07 KB, created by Brent Fulgham on 2018-06-04 19:01:08 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Brent Fulgham

Created: 2018-06-04 19:01:08 PDT

Size: 4.07 KB

patch

obsolete

>Subversion Revision: 232467
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index b0c78392524e10a903328dcef9b2f7d3c265ff4b..ddc731d30f6476390043186cb895e3a5096b4fbf 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,21 @@
>+2018-06-04  Brent Fulgham  <bfulgham@apple.com>
>+
>+        Revise DEFAULT_EXPERIMENTAL_FEATURES_ENABLED to work properly on Apple builds
>+        https://bugs.webkit.org/show_bug.cgi?id=186286
>+        <rdar://problem/40782992>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Use the WK_RELOCATABLE_FRAMEWORKS flag (which is always defined for non-production builds)
>+        to define ENABLE(EXPERIMENTAL_FEATURES) so that we do not need to manually
>+        change this flag when preparing for a production release.
>+
>+        * Configurations/BaseTarget.xcconfig: Use WK_RELOCATABLE_FRAMEWORKS to determine whether
>+        experimental features should be enabled.
>+        * Shared/WebPreferencesDefaultValues.cpp:
>+        (enableExperimentalFeatures):
>+        * Shared/WebPreferencesDefaultValues.h:
>+
> 2018-06-03  Andy Estes  <aestes@apple.com>
> 
>         [Wi-Fi Assertions] Resume assertions when NetworkProcess::cancelPrepareToSuspend is called
>diff --git a/Source/WebKit/Configurations/BaseTarget.xcconfig b/Source/WebKit/Configurations/BaseTarget.xcconfig
>index 0b91c178a8c3b9b89963227a657367ffa74e5e29..bc4386b9132c4748620f5a2d408d8288dd3ee893 100644
>--- a/Source/WebKit/Configurations/BaseTarget.xcconfig
>+++ b/Source/WebKit/Configurations/BaseTarget.xcconfig
>@@ -36,7 +36,7 @@ FRAMEWORK_SEARCH_PATHS = $(FRAMEWORK_SEARCH_PATHS_base);
> SYSTEM_FRAMEWORK_SEARCH_PATHS = $(inherited) $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks;
> 
> GCC_PREFIX_HEADER = WebKit2Prefix.h;
>-GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) $(FEATURE_DEFINES) $(WK_MANUAL_SANDBOXING_DEFINES) $(WK_CORE_PREDICTION_DEFINES) U_DISABLE_RENAMING=1 U_SHOW_CPLUSPLUS_API=0 FRAMEWORK_NAME=WebKit;
>+GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) $(FEATURE_DEFINES) $(WK_MANUAL_SANDBOXING_DEFINES) $(WK_CORE_PREDICTION_DEFINES) U_DISABLE_RENAMING=1 U_SHOW_CPLUSPLUS_API=0 WK_RELOCATABLE_FRAMEWORKS=$(WK_RELOCATABLE_FRAMEWORKS) FRAMEWORK_NAME=WebKit;
> WEBKITADDITIONS_HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include/WebKitAdditions $(SDKROOT)/usr/local/include/WebKitAdditions;
> LIBWEBRTC_HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include/webrtc $(SDKROOT)/usr/local/include/webrtc;
> 
>diff --git a/Source/WebKit/Shared/WebPreferencesDefaultValues.cpp b/Source/WebKit/Shared/WebPreferencesDefaultValues.cpp
>index 390cdfb78f506870cb4d85e24cf90c9364850b4b..258ece0dbee9c9f59815132f51b2a56d1abc427e 100644
>--- a/Source/WebKit/Shared/WebPreferencesDefaultValues.cpp
>+++ b/Source/WebKit/Shared/WebPreferencesDefaultValues.cpp
>@@ -57,3 +57,13 @@ bool defaultCustomPasteboardDataEnabled()
> #endif
> }
> 
>+bool enableExperimentalFeatures()
>+{
>+#if PLATFORM(COCOA) && defined(WK_RELOCATABLE_FRAMEWORKS)
>+    return STRINGIZE_VALUE_OF(WK_RELOCATABLE_FRAMEWORKS) == "YES";
>+#elif ENABLE(EXPERIMENTAL_FEATURES)
>+    return true
>+#else
>+    return false
>+#endif
>+}
>diff --git a/Source/WebKit/Shared/WebPreferencesDefaultValues.h b/Source/WebKit/Shared/WebPreferencesDefaultValues.h
>index 6dc6f57077a8e48a20402b3d46bca1821233c02f..308bc443fd3fb78a5fd6ae7c953373936bb00bdf 100644
>--- a/Source/WebKit/Shared/WebPreferencesDefaultValues.h
>+++ b/Source/WebKit/Shared/WebPreferencesDefaultValues.h
>@@ -188,12 +188,7 @@
> #define DISABLED_ADAPTATIONS_META_TAG_ENABLED false
> #endif
> 
>-// Cocoa ports must disable experimental features on release branches for now.
>-#if ENABLE(EXPERIMENTAL_FEATURES) || PLATFORM(COCOA)
>-#define DEFAULT_EXPERIMENTAL_FEATURES_ENABLED true
>-#else
>-#define DEFAULT_EXPERIMENTAL_FEATURES_ENABLED false
>-#endif
>+#define DEFAULT_EXPERIMENTAL_FEATURES_ENABLED enableExperimentalFeatures()
> 
> #if ENABLE(EXPERIMENTAL_FEATURES) || PLATFORM(COCOA)
> #define DEFAULT_SERVICE_WORKERS_ENABLED true
>@@ -203,3 +198,4 @@
> 
> bool defaultPassiveTouchListenersAsDefaultOnDocument();
> bool defaultCustomPasteboardDataEnabled();
>+bool enableExperimentalFeatures();

Actions: View | Formatted Diff | Diff

Attachments on bug 186286: 341946 | 341949 | 341973