Changeset 243320 in webkit

Timestamp:

Mar 21, 2019, 1:31:19 PM (6 years ago)

Author:

Chris Dumez

Message:

WebKit should throw when trying to create a WKWebView with a related view that is using a different data store
​https://bugs.webkit.org/show_bug.cgi?id=196041
<rdar://problem/49083230>

Reviewed by Alex Christensen.

Source/WebKit:

WebKit should throw when trying to create a WKWebView with a related view that is using a different data store.
We do not support having several WebsiteDataStores sharing the same WebProcess.

• UIProcess/API/Cocoa/WKWebView.mm:

(-[WKWebView _initializeWithConfiguration:]):

• UIProcess/WebProcessPool.cpp:

(WebKit::WebProcessPool::createWebPage):

Tools:

Add API test coverage.

• TestWebKitAPI/Tests/WebKitCocoa/WKWebViewConfiguration.mm:

(TEST):

Location:

trunk

Files:

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

trunk/Source/WebKit/ChangeLog ¶

@@ +1 @@
+2019-03-21  Chris Dumez  <cdumez@apple.com>
+
+        WebKit should throw when trying to create a WKWebView with a related view that is using a different data store
+        https://bugs.webkit.org/show_bug.cgi?id=196041
+        <rdar://problem/49083230>
+
+        Reviewed by Alex Christensen.
+
+        WebKit should throw when trying to create a WKWebView with a related view that is using a different data store.
+        We do not support having several WebsiteDataStores sharing the same WebProcess.
+
+        * UIProcess/API/Cocoa/WKWebView.mm:
+        (-[WKWebView _initializeWithConfiguration:]):
+        * UIProcess/WebProcessPool.cpp:
+        (WebKit::WebProcessPool::createWebPage):
+
 2019-03-21  Alex Christensen  <achristensen@webkit.org>
 

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

@@ -553 +553 @@
         if (processPool && processPool != relatedWebViewProcessPool)
             [NSException raise:NSInvalidArgumentException format:@"Related web view %@ has process pool %@ but configuration specifies a different process pool %@", relatedWebView, relatedWebViewProcessPool, configuration.processPool];
+        if ([relatedWebView->_configuration websiteDataStore] != [_configuration websiteDataStore])
+            [NSException raise:NSInvalidArgumentException format:@"Related web view %@ has data store %@ but configuration specifies a different data store %@", relatedWebView, [relatedWebView->_configuration websiteDataStore], [_configuration websiteDataStore]];
 
         [_configuration setProcessPool:relatedWebViewProcessPool];

trunk/Source/WebKit/UIProcess/WebProcessPool.cpp ¶

@@ -1216 +1216 @@
         // Sharing processes, e.g. when creating the page via window.open().
         process = &pageConfiguration->relatedPage()->process();
+        // We do not support several WebsiteDataStores sharing a single process.
+        ASSERT(process.get() == m_dummyProcessProxy || &pageConfiguration->websiteDataStore()->websiteDataStore() == &process->websiteDataStore());
+        ASSERT(&pageConfiguration->relatedPage()->websiteDataStore() == &pageConfiguration->websiteDataStore()->websiteDataStore());
     } else if (WebKit::isInspectorProcessPool(*this)) {
         // Do not delay process launch for inspector pages as inspector pages do not know how to transition from a terminated process.

trunk/Tools/ChangeLog ¶

@@ +1 @@
+2019-03-21  Chris Dumez  <cdumez@apple.com>
+
+        WebKit should throw when trying to create a WKWebView with a related view that is using a different data store
+        https://bugs.webkit.org/show_bug.cgi?id=196041
+        <rdar://problem/49083230>
+
+        Reviewed by Alex Christensen.
+
+        Add API test coverage.
+
+        * TestWebKitAPI/Tests/WebKitCocoa/WKWebViewConfiguration.mm:
+        (TEST):
+
 2019-03-21  Alex Christensen  <achristensen@webkit.org>
 

trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebViewConfiguration.mm ¶

@@ -29 +29 @@
 #import <WebKit/WKWebView.h>
 #import <WebKit/WKWebViewConfigurationPrivate.h>
+#import <WebKit/WKWebsiteDataStore.h>
 #import <wtf/Function.h>
 #import <wtf/RetainPtr.h>
@@ -63 +64 @@
     });
 #pragma clang diagnostic pop
+
+    // Related WebViews cannot use different data stores.
+    auto configurationForEphemeralView = adoptNS([[WKWebViewConfiguration alloc] init]);
+    configurationForEphemeralView.get().websiteDataStore = [WKWebsiteDataStore nonPersistentDataStore];
+    auto ephemeralWebView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600) configuration:configurationForEphemeralView.get()]);
+    shouldThrowExceptionWhenUsed([&](WKWebViewConfiguration *configuration) {
+        [configuration _setRelatedWebView:ephemeralWebView.get()];
+    });
 }