Title: [263547] trunk/Source/WebKit
- Revision
- 263547
- Author
- [email protected]
- Date
- 2020-06-25 17:10:25 -0700 (Thu, 25 Jun 2020)
Log 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
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (263546 => 263547)
--- trunk/Source/WebKit/ChangeLog 2020-06-25 23:50:21 UTC (rev 263546)
+++ trunk/Source/WebKit/ChangeLog 2020-06-26 00:10:25 UTC (rev 263547)
@@ -1,5 +1,18 @@
2020-06-25 Chris Dumez <[email protected]>
+ 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 <[email protected]>
+
[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
<rdar://problem/64737890>
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.h (263546 => 263547)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.h 2020-06-25 23:50:21 UTC (rev 263546)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.h 2020-06-26 00:10:25 UTC (rev 263547)
@@ -47,7 +47,6 @@
*/
+ (WKWebsiteDataStore *)nonPersistentDataStore;
-- (instancetype)new NS_UNAVAILABLE;
- (instancetype)init NS_UNAVAILABLE;
/*! @abstract Whether the data store is persistent or not. */
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm (263546 => 263547)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm 2020-06-25 23:50:21 UTC (rev 263546)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm 2020-06-26 00:10:25 UTC (rev 263547)
@@ -30,7 +30,6 @@
#import "AuthenticationChallengeDispositionCocoa.h"
#import "CompletionHandlerCallChecker.h"
#import "ShouldGrandfatherStatistics.h"
-#import "VersionChecks.h"
#import "WKHTTPCookieStoreInternal.h"
#import "WKNSArray.h"
#import "WKNSURLAuthenticationChallenge.h"
@@ -116,17 +115,6 @@
return wrapper(WebKit::WebsiteDataStore::createNonPersistent());
}
-- (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
{
_websiteDataStore->WebKit::WebsiteDataStore::~WebsiteDataStore();
Modified: trunk/Source/WebKit/UIProcess/Cocoa/VersionChecks.h (263546 => 263547)
--- trunk/Source/WebKit/UIProcess/Cocoa/VersionChecks.h 2020-06-25 23:50:21 UTC (rev 263546)
+++ trunk/Source/WebKit/UIProcess/Cocoa/VersionChecks.h 2020-06-26 00:10:25 UTC (rev 263547)
@@ -94,7 +94,6 @@
FirstWithSessionCleanupByDefault = DYLD_IOS_VERSION_FIRST_WITH_SESSION_CLEANUP_BY_DEFAULT,
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,
FirstWithExceptionsForDuplicateCompletionHandlerCalls = DYLD_MACOSX_VERSION_10_13,
@@ -108,7 +107,6 @@
FirstThatRestrictsBaseURLSchemes = DYLD_MACOSX_VERSION_10_15_4,
FirstWithSessionCleanupByDefault = DYLD_MACOS_VERSION_FIRST_WITH_SESSION_CLEANUP_BY_DEFAULT,
FirstWithInitializeWebKit2MainThreadAssertion = DYLD_MACOSX_VERSION_10_16,
- FirstWithWKWebsiteDataStoreInitReturningNil = DYLD_MACOSX_VERSION_10_16,
#endif
};
Modified: trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp (263546 => 263547)
--- trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp 2020-06-25 23:50:21 UTC (rev 263546)
+++ trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp 2020-06-26 00:10:25 UTC (rev 263547)
@@ -124,7 +124,6 @@
WebsiteDataStore::~WebsiteDataStore()
{
ASSERT(RunLoop::isMain());
- RELEASE_ASSERT(m_sessionID.isValid());
platformDestroy();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
