[cocoa] Expand when new experimental network loader is enabled

https://bugs.webkit.org/show_bug.cgi?id=273091 rdar://126718999 Reviewed by Brent Fulgham. The existing feature flag still takes precedence, but now the loader is used when the a LOOA check passes, and for all tests (not only layout tests). Otherwise, if the loader is enabled, then we use it for Safari. * Source/WTF/wtf/cocoa/RuntimeApplicationChecksCocoa.h: * Source/WebKit/UIProcess/WebsiteData/Cocoa/WebsiteDataStoreCocoa.mm: (WebKit::WebsiteDataStore::useNetworkLoader): Canonical link: https://commits.webkit.org/278344@main
WebKit · May 3, 2024 · 9fdc371 · 9fdc371
1 parent 4e8f922
commit 9fdc371
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 3 deletions.
diff --git a/Source/WTF/wtf/cocoa/RuntimeApplicationChecksCocoa.h b/Source/WTF/wtf/cocoa/RuntimeApplicationChecksCocoa.h
@@ -122,6 +122,7 @@ enum class SDKAlignedBehavior {
     ThrowOnKVCInstanceVariableAccess,
     LaxCookieSameSiteAttribute,
     BlockOptionallyBlockableMixedContent,
+    UseCFNetworkNetworkLoader,
 
     NumberOfBehaviors
 };

diff --git a/Source/WebCore/PAL/pal/spi/cocoa/NetworkSPI.h b/Source/WebCore/PAL/pal/spi/cocoa/NetworkSPI.h
@@ -55,6 +55,8 @@ void nw_parameters_set_traffic_class(nw_parameters_t, uint32_t traffic_class);
 
 nw_interface_t nw_path_copy_interface(nw_path_t);
 
+bool nw_settings_get_unified_http_enabled(void);
+
 WTF_EXTERN_C_END
 
 #endif // USE(APPLE_INTERNAL_SDK)
diff --git a/Source/WebKit/UIProcess/WebsiteData/Cocoa/WebsiteDataStoreCocoa.mm b/Source/WebKit/UIProcess/WebsiteData/Cocoa/WebsiteDataStoreCocoa.mm
@@ -43,6 +43,7 @@
 #import <WebCore/RuntimeApplicationChecks.h>
 #import <WebCore/SearchPopupMenuCocoa.h>
 #import <pal/spi/cf/CFNetworkSPI.h>
+#import <pal/spi/cocoa/NetworkSPI.h>
 #import <wtf/FileSystem.h>
 #import <wtf/NeverDestroyed.h>
 #import <wtf/ProcessPrivilege.h>
@@ -220,11 +221,32 @@ bool experimentalFeatureEnabled(const String& key, bool defaultValue)
 
 std::optional<bool> WebsiteDataStore::useNetworkLoader()
 {
-#if HAVE(NETWORK_LOADER)
-    return optionalExperimentalFeatureEnabled(WebPreferencesKey::cFNetworkNetworkLoaderEnabledKey(), std::nullopt);
-#else
+#if !HAVE(NETWORK_LOADER)
     return false;
+#else
+
+    [[maybe_unused]] const auto isSafari =
+#if PLATFORM(MAC)
+        MacApplication::isSafari();
+#elif PLATFORM(IOS_FAMILY)
+        WebCore::IOSApplication::isMobileSafari() || WebCore::IOSApplication::isSafariViewService();
+#else
+        false;
 #endif
+
+    if (auto isEnabled = optionalExperimentalFeatureEnabled(WebPreferencesKey::cFNetworkNetworkLoaderEnabledKey(), std::nullopt))
+        return isEnabled;
+    if (!linkedOnOrAfterSDKWithBehavior(SDKAlignedBehavior::UseCFNetworkNetworkLoader))
+        return std::nullopt;
+#if defined(NW_SETTINGS_HAS_UNIFIED_HTTP)
+    if (isRunningTest(WebCore::applicationBundleIdentifier()))
+        return true;
+    if (nw_settings_get_unified_http_enabled())
+        return isSafari;
+#endif
+    return std::nullopt;
+
+#endif // NETWORK_LOADER
 }
 
 void WebsiteDataStore::platformInitialize()