Changeset 280961 in webkit

Timestamp:

Aug 12, 2021, 4:43:55 AM (5 years ago)

Author:

youenn@apple.com

Message:

REGRESSION (r280726): [ Big Sur wk1 ] 25 imported/w3c/web-platform-tests/fetch/ failing
​https://bugs.webkit.org/show_bug.cgi?id=228926
<rdar://problem/81715332>

Reviewed by Eric Carlson.

isFeatureFlagEnabled is called when creating/initializing WebPreferences.
It used to check for WebView, which triggers the execution of WebView initialize method
while DumpRenderTree is in the middle of creating its testing setup, including its storage testing sessions.
Instead, check for WebResource to remove this side effect and get back to past DumpRenderTree initialization.

• WebView/WebPreferencesDefaultValues.mm:

(WebKit::isFeatureFlagEnabled):

Location:

trunk/Source/WebKitLegacy/mac

Files:

• ChangeLog (modified) (1 diff)
• WebView/WebPreferencesDefaultValues.mm (modified) (1 diff)

trunk/Source/WebKitLegacy/mac/ChangeLog

@@ +1 @@
+2021-08-12  Youenn Fablet  <youenn@apple.com>
+
+        REGRESSION (r280726): [ Big Sur wk1 ] 25 imported/w3c/web-platform-tests/fetch/ failing
+        https://bugs.webkit.org/show_bug.cgi?id=228926
+        <rdar://problem/81715332>
+
+        Reviewed by Eric Carlson.
+
+        isFeatureFlagEnabled is called when creating/initializing WebPreferences.
+        It used to check for WebView, which triggers the execution of WebView initialize method
+        while DumpRenderTree is in the middle of creating its testing setup, including its storage testing sessions.
+        Instead, check for WebResource to remove this side effect and get back to past DumpRenderTree initialization.
+
+        * WebView/WebPreferencesDefaultValues.mm:
+        (WebKit::isFeatureFlagEnabled):
+
 2021-08-11  Peng Liu  <peng.liu6@apple.com>
 

trunk/Source/WebKitLegacy/mac/WebView/WebPreferencesDefaultValues.mm

@@ -50 +50 @@
 #if HAVE(SYSTEM_FEATURE_FLAGS)
 
-    // FIXME: On MacOS, we need to deal with the cases when system feature flags are not available.
-    // But we need to fix <http://webkit.org/b/228926> first.
-#if PLATFORM(COCOA)
+#if PLATFORM(MAC)
+    static bool isSystemWebKit = [] {
+        auto *bundle = [NSBundle bundleForClass:NSClassFromString(@"WebResource")];
+        return [bundle.bundlePath hasPrefix:@"/System/"];
+    }();
+
+    return isSystemWebKit ? _os_feature_enabled_impl("WebKit", featureName) : defaultValue;
+#else
     UNUSED_PARAM(defaultValue);
     return _os_feature_enabled_impl("WebKit", featureName);