Changeset 292119 in webkit

Timestamp:

Mar 30, 2022, 1:51:38 PM (5 years ago)

Author:

sihui_liu@apple.com

Message:

Avoid initializing default WKWebsiteDataStore in -[WKWebViewConfiguration copyWithZone]
​https://bugs.webkit.org/show_bug.cgi?id=238531
rdar://90628101

Reviewed by Tim Horton.

Source/WebKit:

API test: WKWebsiteDataStore.DoNotCreateDefaultDataStore

• UIProcess/API/Cocoa/WKWebView.mm:

(-[WKWebView _initializeWithConfiguration:]):

• UIProcess/API/Cocoa/WKWebViewConfiguration.mm:

(-[WKWebViewConfiguration copyWithZone:]):

Tools:

• TestWebKitAPI/Tests/WebKitCocoa/WKWebsiteDatastore.mm:

(TestWebKitAPI::TEST):

Location:

trunk

Files:

• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm (modified) (1 diff)
• Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfiguration.mm (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebsiteDatastore.mm (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2022-03-30  Sihui Liu  <sihui_liu@apple.com>
+
+        Avoid initializing default WKWebsiteDataStore in -[WKWebViewConfiguration copyWithZone]
+        https://bugs.webkit.org/show_bug.cgi?id=238531
+        rdar://90628101
+
+        Reviewed by Tim Horton.
+
+        API test: WKWebsiteDataStore.DoNotCreateDefaultDataStore
+
+        * UIProcess/API/Cocoa/WKWebView.mm:
+        (-[WKWebView _initializeWithConfiguration:]):
+        * UIProcess/API/Cocoa/WKWebViewConfiguration.mm:
+        (-[WKWebViewConfiguration copyWithZone:]):
+
 2022-03-30  Youenn Fablet  <youenn@apple.com>
 

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

@@ -336 +336 @@
         [NSException raise:NSInvalidArgumentException format:@"Configuration cannot be nil"];
 
+    if (!configuration.websiteDataStore)
+        [NSException raise:NSInvalidArgumentException format:@"Configuration websiteDataStore cannot be nil"];
     _configuration = adoptNS([configuration copy]);
 

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

@@ -381 +381 @@
     configuration.preferences = self.preferences;
     configuration.userContentController = self.userContentController;
+    if (self._websiteDataStoreIfExists)
+        [configuration setWebsiteDataStore:self._websiteDataStoreIfExists];
     configuration.websiteDataStore = self.websiteDataStore;
     configuration.defaultWebpagePreferences = self.defaultWebpagePreferences;

trunk/Tools/ChangeLog

@@ +1 @@
+2022-03-30  Sihui Liu  <sihui_liu@apple.com>
+
+        Avoid initializing default WKWebsiteDataStore in -[WKWebViewConfiguration copyWithZone]
+        https://bugs.webkit.org/show_bug.cgi?id=238531
+        rdar://90628101
+
+        Reviewed by Tim Horton.
+
+        * TestWebKitAPI/Tests/WebKitCocoa/WKWebsiteDatastore.mm:
+        (TestWebKitAPI::TEST):
+
 2022-03-30  Carlos Alberto Lopez Perez  <clopez@igalia.com>
 

trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebsiteDatastore.mm

@@ -414 +414 @@
 }
 
+TEST(WKWebsiteDataStore, DoNotCreateDefaultDataStore)
+{
+    auto configuration = adoptNS([WKWebViewConfiguration new]);
+    [configuration.get() copy];
+    EXPECT_FALSE([WKWebsiteDataStore _defaultDataStoreExists]);
+}
+
 } // namespace TestWebKitAPI