Title: [292185] trunk
Revision
292185
Author
[email protected]
Date
2022-03-31 15:09:11 -0700 (Thu, 31 Mar 2022)

Log Message

Unreviewed, reverting r292119.
https://bugs.webkit.org/show_bug.cgi?id=238638

New API test is flaky

Reverted changeset:

"Avoid initializing default WKWebsiteDataStore in
-[WKWebViewConfiguration copyWithZone]"
https://bugs.webkit.org/show_bug.cgi?id=238531
https://commits.webkit.org/r292119

Modified Paths

Diff

Modified: trunk/Source/WebKit/ChangeLog (292184 => 292185)


--- trunk/Source/WebKit/ChangeLog	2022-03-31 21:58:55 UTC (rev 292184)
+++ trunk/Source/WebKit/ChangeLog	2022-03-31 22:09:11 UTC (rev 292185)
@@ -1,3 +1,17 @@
+2022-03-31  Commit Queue  <[email protected]>
+
+        Unreviewed, reverting r292119.
+        https://bugs.webkit.org/show_bug.cgi?id=238638
+
+        New API test is flaky
+
+        Reverted changeset:
+
+        "Avoid initializing default WKWebsiteDataStore in
+        -[WKWebViewConfiguration copyWithZone]"
+        https://bugs.webkit.org/show_bug.cgi?id=238531
+        https://commits.webkit.org/r292119
+
 2022-03-31  Wenson Hsieh  <[email protected]>
 
         [iOS] Add support for temporarily installing VKCImageAnalysisInteraction on WKContentView

Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm (292184 => 292185)


--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm	2022-03-31 21:58:55 UTC (rev 292184)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm	2022-03-31 22:09:11 UTC (rev 292185)
@@ -335,8 +335,6 @@
     if (!configuration)
         [NSException raise:NSInvalidArgumentException format:@"Configuration cannot be nil"];
 
-    if (!configuration.websiteDataStore)
-        [NSException raise:NSInvalidArgumentException format:@"Configuration websiteDataStore cannot be nil"];
     _configuration = adoptNS([configuration copy]);
 
     if (WKWebView *relatedWebView = [_configuration _relatedWebView]) {

Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfiguration.mm (292184 => 292185)


--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfiguration.mm	2022-03-31 21:58:55 UTC (rev 292184)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfiguration.mm	2022-03-31 22:09:11 UTC (rev 292185)
@@ -381,8 +381,6 @@
     configuration.processPool = self.processPool;
     configuration.preferences = self.preferences;
     configuration.userContentController = self.userContentController;
-    if (self._websiteDataStoreIfExists)
-        [configuration setWebsiteDataStore:self._websiteDataStoreIfExists];
     configuration.websiteDataStore = self.websiteDataStore;
     configuration.defaultWebpagePreferences = self.defaultWebpagePreferences;
     configuration._visitedLinkStore = self._visitedLinkStore;

Modified: trunk/Tools/ChangeLog (292184 => 292185)


--- trunk/Tools/ChangeLog	2022-03-31 21:58:55 UTC (rev 292184)
+++ trunk/Tools/ChangeLog	2022-03-31 22:09:11 UTC (rev 292185)
@@ -1,3 +1,17 @@
+2022-03-31  Commit Queue  <[email protected]>
+
+        Unreviewed, reverting r292119.
+        https://bugs.webkit.org/show_bug.cgi?id=238638
+
+        New API test is flaky
+
+        Reverted changeset:
+
+        "Avoid initializing default WKWebsiteDataStore in
+        -[WKWebViewConfiguration copyWithZone]"
+        https://bugs.webkit.org/show_bug.cgi?id=238531
+        https://commits.webkit.org/r292119
+
 2022-03-31  Elliott Williams  <[email protected]>
 
         [XCBuild] WebKitLegacy's "Migrated headers" script does not emit task information

Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebsiteDatastore.mm (292184 => 292185)


--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebsiteDatastore.mm	2022-03-31 21:58:55 UTC (rev 292184)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebsiteDatastore.mm	2022-03-31 22:09:11 UTC (rev 292185)
@@ -413,11 +413,4 @@
     [webView synchronouslyLoadRequest:[NSURLRequest requestWithURL:url]];
 }
 
-TEST(WKWebsiteDataStore, DoNotCreateDefaultDataStore)
-{
-    auto configuration = adoptNS([WKWebViewConfiguration new]);
-    [configuration.get() copy];
-    EXPECT_FALSE([WKWebsiteDataStore _defaultDataStoreExists]);
-}
-
 } // namespace TestWebKitAPI
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to