Changeset 263547 in webkit

Timestamp:

Jun 25, 2020 5:10:25 PM (4 years ago)

Author:

Chris Dumez

Message:

Unreviewed, reverting r263545.

Patch will need refining

Reverted changeset:

"[iOS] Network process is crashing when launching TJMaxx app
due to invalid NetworkProcess::DestroySession IPC message"
​https://bugs.webkit.org/show_bug.cgi?id=213625
​https://trac.webkit.org/changeset/263545

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/Cocoa/WKWebsiteDataStore.h (modified) (1 diff)
• UIProcess/API/Cocoa/WKWebsiteDataStore.mm (modified) (2 diffs)
• UIProcess/Cocoa/VersionChecks.h (modified) (2 diffs)
• UIProcess/WebsiteData/WebsiteDataStore.cpp (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-06-25  Chris Dumez  <cdumez@apple.com>
+
+        Unreviewed, reverting r263545.
+
+        Patch will need refining
+
+        Reverted changeset:
+
+        "[iOS] Network process is crashing when launching TJMaxx app
+        due to invalid NetworkProcess::DestroySession IPC message"
+        https://bugs.webkit.org/show_bug.cgi?id=213625
+        https://trac.webkit.org/changeset/263545
+
 2020-06-25  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.h

@@ -48 +48 @@
 + (WKWebsiteDataStore *)nonPersistentDataStore;
 
-- (instancetype)new NS_UNAVAILABLE;
 - (instancetype)init NS_UNAVAILABLE;
 

trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm

@@ -31 +31 @@
 #import "CompletionHandlerCallChecker.h"
 #import "ShouldGrandfatherStatistics.h"
-#import "VersionChecks.h"
 #import "WKHTTPCookieStoreInternal.h"
 #import "WKNSArray.h"
@@ -117 +116 @@
 }
 
-- (instancetype)init
-{
-    // This is a workaround for apps that were managing to call [WKWebsiteDataStore init].
-    // FIXME: We should eventually drop this and always return nil.
-    if (!WebKit::linkedOnOrAfter(WebKit::SDKVersion::FirstWithWKWebsiteDataStoreInitReturningNil)) {
-        RELEASE_LOG_ERROR(Process, "Application is calling [WKWebsiteDataStore init], which is not supported");
-        return [WKWebsiteDataStore defaultDataStore];
-    }
-    return nil;
-}
-
 - (void)dealloc
 {

trunk/Source/WebKit/UIProcess/Cocoa/VersionChecks.h

@@ -95 +95 @@
     FirstThatSendsNativeMouseEvents = DYLD_IOS_VERSION_13_4,
     FirstWithInitializeWebKit2MainThreadAssertion = DYLD_IOS_VERSION_14_0,
-    FirstWithWKWebsiteDataStoreInitReturningNil = DYLD_IOS_VERSION_14_0,
 #elif PLATFORM(MAC)
     FirstWithNetworkCache = DYLD_MACOSX_VERSION_10_11,
@@ -109 +108 @@
     FirstWithSessionCleanupByDefault = DYLD_MACOS_VERSION_FIRST_WITH_SESSION_CLEANUP_BY_DEFAULT,
     FirstWithInitializeWebKit2MainThreadAssertion = DYLD_MACOSX_VERSION_10_16,
-    FirstWithWKWebsiteDataStoreInitReturningNil = DYLD_MACOSX_VERSION_10_16,
 #endif
 };

trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp

@@ -125 +125 @@
 {
     ASSERT(RunLoop::isMain());
-    RELEASE_ASSERT(m_sessionID.isValid());
 
     platformDestroy();