Disable ApplicationCache with linkedOnOrAfter check

https://bugs.webkit.org/show_bug.cgi?id=224629 Patch by Alex Christensen <achristensen@webkit.org> on 2021-04-16 Reviewed by Brady Eidson. Source/WebCore: ApplicationCache has been deprecated for two years in WebKit with a message to developers since r227225. Firefox removed support in https://bugzilla.mozilla.org/show_bug.cgi?id=1619673 which shipped with Firefox 84 on Dec 15, 2020. Chrome removed support in https://bugs.chromium.org/p/chromium/issues/detail?id=582750 by default in Chrome 85 on August 25, 2020 but they have a reverse origin trial program running right now so that some origins have it working, but they are planning to remove even that support October 2021. We have kept it working for a reason related to rdar://38505756, specifically the 4th and 5th comment in that bug. That reason is now passed. This patch removes support for new apps but keeps it working for 3rd party apps linked with existing SDKs. Once those apps update to a new SDK, they will be unable to use ApplicationCache. They will need to migrate to use fetch service workers instead. * platform/cocoa/VersionChecks.h: Source/WebKit: * Shared/WebPreferencesDefaultValues.cpp: (WebKit::defaultOfflineWebApplicationCacheEnabled): * Shared/WebPreferencesDefaultValues.h: Source/WTF: * Scripts/Preferences/WebPreferences.yaml: Tools: * TestWebKitAPI/Tests/WebKit/WKPreferences.cpp: (TestWebKitAPI::TEST): * TestWebKitAPI/Tests/WebKitCocoa/WebsiteDataStoreCustomPaths.mm: (TEST): * WebKitTestRunner/TestOptions.cpp: (WTR::TestOptions::defaults): Canonical link: https://commits.webkit.org/236651@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@276164 268f45cc-cd09-0410-ab3c-d52691b4dbfc
WebKit · Apr 16, 2021 · 6012498 · 6012498
1 parent 4ddb743
commit 6012498
Show file tree

Hide file tree

Showing 11 changed files with 77 additions and 2 deletions.
diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog
@@ -1,3 +1,12 @@
+2021-04-16  Alex Christensen  <achristensen@webkit.org>
+
+        Disable ApplicationCache with linkedOnOrAfter check
+        https://bugs.webkit.org/show_bug.cgi?id=224629
+
+        Reviewed by Brady Eidson.
+
+        * Scripts/Preferences/WebPreferences.yaml:
+
 2021-04-16  Alex Christensen  <achristensen@webkit.org>
 
         Reduce maximum HashTable entry size to 128 bytes

diff --git a/Source/WTF/Scripts/Preferences/WebPreferences.yaml b/Source/WTF/Scripts/Preferences/WebPreferences.yaml
@@ -1598,7 +1598,7 @@ OfflineWebApplicationCacheEnabled:
     WebKitLegacy:
       default: false
     WebKit:
-      default: true
+      default: WebKit::defaultOfflineWebApplicationCacheEnabled()
     WebCore:
       default: false
 

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
@@ -1,3 +1,26 @@
+2021-04-16  Alex Christensen  <achristensen@webkit.org>
+
+        Disable ApplicationCache with linkedOnOrAfter check
+        https://bugs.webkit.org/show_bug.cgi?id=224629
+
+        Reviewed by Brady Eidson.
+
+        ApplicationCache has been deprecated for two years in WebKit with a message to developers since r227225.
+
+        Firefox removed support in https://bugzilla.mozilla.org/show_bug.cgi?id=1619673 which shipped with Firefox 84 on Dec 15, 2020.
+
+        Chrome removed support in https://bugs.chromium.org/p/chromium/issues/detail?id=582750 by default in Chrome 85 on August 25, 2020
+        but they have a reverse origin trial program running right now so that some origins have it working, but they are planning to remove
+        even that support October 2021.
+
+        We have kept it working for a reason related to rdar://38505756, specifically the 4th and 5th comment in that bug.
+        That reason is now passed.
+
+        This patch removes support for new apps but keeps it working for 3rd party apps linked with existing SDKs.  Once those apps update
+        to a new SDK, they will be unable to use ApplicationCache.  They will need to migrate to use fetch service workers instead.
+
+        * platform/cocoa/VersionChecks.h:
+
 2021-04-16  Commit Queue  <commit-queue@webkit.org>
 
         Unreviewed, reverting r273733.

diff --git a/Source/WebCore/platform/cocoa/VersionChecks.h b/Source/WebCore/platform/cocoa/VersionChecks.h
@@ -72,6 +72,7 @@ enum class SDKVersion : uint32_t {
     FirstWithDOMWindowReuseRestriction  = DYLD_IOS_VERSION_14_5,
     FirstWithSharedNetworkProcess = DYLD_IOS_VERSION_14_5,
     FirstWithBlankViewOnJSPrompt = DYLD_IOS_VERSION_14_5,
+    FirstWithApplicationCacheDisabledByDefault = DYLD_IOS_VERSION_15_0,
 #elif PLATFORM(MAC)
     FirstWithNetworkCache = DYLD_MACOSX_VERSION_10_11,
     FirstWithExceptionsForDuplicateCompletionHandlerCalls = DYLD_MACOSX_VERSION_10_13,
@@ -94,6 +95,7 @@ enum class SDKVersion : uint32_t {
     FirstWithNullOriginForNonSpecialSchemedURLs = DYLD_MACOSX_VERSION_12_00,
     FirstWithDOMWindowReuseRestriction = DYLD_MACOSX_VERSION_11_3,
     FirstWithBlankViewOnJSPrompt = DYLD_MACOSX_VERSION_11_3,
+    FirstWithApplicationCacheDisabledByDefault = DYLD_MACOSX_VERSION_12_00,
 #endif
 };
 

diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
@@ -1,3 +1,14 @@
+2021-04-16  Alex Christensen  <achristensen@webkit.org>
+
+        Disable ApplicationCache with linkedOnOrAfter check
+        https://bugs.webkit.org/show_bug.cgi?id=224629
+
+        Reviewed by Brady Eidson.
+
+        * Shared/WebPreferencesDefaultValues.cpp:
+        (WebKit::defaultOfflineWebApplicationCacheEnabled):
+        * Shared/WebPreferencesDefaultValues.h:
+
 2021-04-16  Ada Chan  <ada.chan@apple.com>
 
         Add WKUIDelegate SPI for starting XR session

diff --git a/Source/WebKit/Shared/WebPreferencesDefaultValues.cpp b/Source/WebKit/Shared/WebPreferencesDefaultValues.cpp
@@ -129,6 +129,18 @@ bool defaultAsyncOverflowScrollingEnabled()
     return defaultAsyncFrameAndOverflowScrollingEnabled();
 }
 
+bool defaultOfflineWebApplicationCacheEnabled()
+{
+#if PLATFORM(COCOA)
+    static bool newSDK = linkedOnOrAfter(WebCore::SDKVersion::FirstWithApplicationCacheDisabledByDefault);
+    return !newSDK;
+#else
+    // FIXME: Other platforms should consider turning this off.
+    // ApplicationCache is on its way to being removed from WebKit.
+    return true;
+#endif
+}
+
 #if ENABLE(GPU_PROCESS)
 
 bool defaultUseGPUProcessForCanvasRenderingEnabled()

diff --git a/Source/WebKit/Shared/WebPreferencesDefaultValues.h b/Source/WebKit/Shared/WebPreferencesDefaultValues.h
@@ -66,6 +66,7 @@ bool allowsDeprecatedSynchronousXMLHttpRequestDuringUnload();
 
 bool defaultAsyncFrameScrollingEnabled();
 bool defaultAsyncOverflowScrollingEnabled();
+bool defaultOfflineWebApplicationCacheEnabled();
 
 #if ENABLE(GPU_PROCESS)
 bool defaultUseGPUProcessForCanvasRenderingEnabled();

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
@@ -1,3 +1,17 @@
+2021-04-16  Alex Christensen  <achristensen@webkit.org>
+
+        Disable ApplicationCache with linkedOnOrAfter check
+        https://bugs.webkit.org/show_bug.cgi?id=224629
+
+        Reviewed by Brady Eidson.
+
+        * TestWebKitAPI/Tests/WebKit/WKPreferences.cpp:
+        (TestWebKitAPI::TEST):
+        * TestWebKitAPI/Tests/WebKitCocoa/WebsiteDataStoreCustomPaths.mm:
+        (TEST):
+        * WebKitTestRunner/TestOptions.cpp:
+        (WTR::TestOptions::defaults):
+
 2021-04-16  Tyler Wilcock  <twilco.o@protonmail.com>
 
         [css-counter-styles] Parse and add feature flag for @counter-style

diff --git a/Tools/TestWebKitAPI/Tests/WebKit/WKPreferences.cpp b/Tools/TestWebKitAPI/Tests/WebKit/WKPreferences.cpp
@@ -74,7 +74,7 @@ TEST(WebKit, WKPreferencesDefaults)
 
     EXPECT_TRUE(WKPreferencesGetJavaScriptEnabled(preference));
     EXPECT_TRUE(WKPreferencesGetLoadsImagesAutomatically(preference));
-    EXPECT_TRUE(WKPreferencesGetOfflineWebApplicationCacheEnabled(preference));
+    EXPECT_FALSE(WKPreferencesGetOfflineWebApplicationCacheEnabled(preference));
     EXPECT_TRUE(WKPreferencesGetLocalStorageEnabled(preference));
     EXPECT_TRUE(WKPreferencesGetXSSAuditorEnabled(preference));
     EXPECT_FALSE(WKPreferencesGetFrameFlatteningEnabled(preference));

diff --git a/Tools/TestWebKitAPI/Tests/WebKitCocoa/WebsiteDataStoreCustomPaths.mm b/Tools/TestWebKitAPI/Tests/WebKitCocoa/WebsiteDataStoreCustomPaths.mm
@@ -33,6 +33,7 @@
 #import "TestWKWebView.h"
 #import <JavaScriptCore/JSCConfig.h>
 #import <WebKit/WKHTTPCookieStorePrivate.h>
+#import <WebKit/WKPreferencesPrivate.h>
 #import <WebKit/WKPreferencesRef.h>
 #import <WebKit/WKProcessPoolPrivate.h>
 #import <WebKit/WKUserContentControllerPrivate.h>
@@ -658,6 +659,7 @@ TCPServer server([] (int socket) {
     [webViewConfiguration setWebsiteDataStore:adoptNS([[WKWebsiteDataStore alloc] _initWithConfiguration:websiteDataStoreConfiguration.get()]).get()];
 
     auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600) configuration:webViewConfiguration.get()]);
+    [webView.get().configuration.preferences _setOfflineApplicationCacheIsEnabled:YES];
     [webView synchronouslyLoadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:[NSString stringWithFormat:@"http://127.0.0.1:%d/index.html", server.port()]]]];
 
     while (![fileManager fileExistsAtPath:subdirectoryPath])

diff --git a/Tools/WebKitTestRunner/TestOptions.cpp b/Tools/WebKitTestRunner/TestOptions.cpp
@@ -98,6 +98,7 @@ const TestFeatures& TestOptions::defaults()
             { "ModernMediaControlsEnabled", true },
             { "NeedsSiteSpecificQuirks", false },
             { "NeedsStorageAccessFromFileURLsQuirk", false },
+            { "OfflineWebApplicationCacheEnabled", true },
             { "OffscreenCanvasEnabled", true },
             { "PageVisibilityBasedProcessSuppressionEnabled", false },
             { "PluginsEnabled", true },