Changeset 244812 in webkit

Timestamp:

Apr 30, 2019, 4:56:05 PM (7 years ago)

Author:

Chris Dumez

Message:

Unreviewed, rolling out r244802.

Caused an API test failure

Reverted changeset:

"Regression(PSON) URL scheme handlers can no longer respond
asynchronously"
​https://bugs.webkit.org/show_bug.cgi?id=197426
​https://trac.webkit.org/changeset/244802

Location:

trunk

Files:

• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/UIProcess/WebPageProxy.cpp (modified) (3 diffs)
• Source/WebKit/UIProcess/WebPageProxy.h (modified) (1 diff)
• Source/WebKit/UIProcess/WebURLSchemeHandler.cpp (modified) (2 diffs)
• Source/WebKit/UIProcess/WebURLSchemeHandler.h (modified) (2 diffs)
• Source/WebKit/UIProcess/WebURLSchemeTask.h (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm (modified) (6 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-04-30  Chris Dumez  <cdumez@apple.com>
+
+        Unreviewed, rolling out r244802.
+
+        Caused an API test failure
+
+        Reverted changeset:
+
+        "Regression(PSON) URL scheme handlers can no longer respond
+        asynchronously"
+        https://bugs.webkit.org/show_bug.cgi?id=197426
+        https://trac.webkit.org/changeset/244802
+
 2019-04-30  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebKit/UIProcess/WebPageProxy.cpp

@@ -6742 +6742 @@
     }
 
-    stopAllURLSchemeTasks(m_process.ptr());
+    stopAllURLSchemeTasks();
 }
 
@@ -6802 +6802 @@
 }
 
-void WebPageProxy::stopAllURLSchemeTasks(WebProcessProxy* process)
+void WebPageProxy::stopAllURLSchemeTasks()
 {
     HashSet<WebURLSchemeHandler*> handlers;
@@ -6809 +6809 @@
 
     for (auto* handler : handlers)
-        handler->stopAllTasksForPage(*this, process);
+        handler->stopAllTasksForPage(*this);
 }
 

trunk/Source/WebKit/UIProcess/WebPageProxy.h

@@ -2002 +2002 @@
     void viewIsBecomingVisible();
 
-    void stopAllURLSchemeTasks(WebProcessProxy* = nullptr);
+    void stopAllURLSchemeTasks();
 
     void clearInspectorTargets();

trunk/Source/WebKit/UIProcess/WebURLSchemeHandler.cpp

@@ -61 +61 @@
 }
 
-WebProcessProxy* WebURLSchemeHandler::processForTaskIdentifier(uint64_t taskIdentifier) const
-{
-    auto iterator = m_tasks.find(taskIdentifier);
-    if (iterator == m_tasks.end())
-        return nullptr;
-    return iterator->value->process();
-}
-
-void WebURLSchemeHandler::stopAllTasksForPage(WebPageProxy& page, WebProcessProxy* process)
+void WebURLSchemeHandler::stopAllTasksForPage(WebPageProxy& page)
 {
     auto iterator = m_tasksByPageIdentifier.find(page.pageID());
@@ -76 +68 @@
 
     auto& tasksByPage = iterator->value;
-    Vector<uint64_t> taskIdentifiersToStop;
-    taskIdentifiersToStop.reserveInitialCapacity(tasksByPage.size());
-    for (auto taskIdentifier : tasksByPage) {
-        if (!process || processForTaskIdentifier(taskIdentifier) == process)
-            taskIdentifiersToStop.uncheckedAppend(taskIdentifier);
-    }
+    while (!tasksByPage.isEmpty())
+        stopTask(page, *tasksByPage.begin());
 
-    for (auto& taskIdentifier : taskIdentifiersToStop)
-        stopTask(page, taskIdentifier);
-
+    ASSERT(m_tasksByPageIdentifier.find(page.pageID()) == m_tasksByPageIdentifier.end());
 }
 

trunk/Source/WebKit/UIProcess/WebURLSchemeHandler.h

@@ -56 +56 @@
     void startTask(WebPageProxy&, WebProcessProxy&, uint64_t taskIdentifier, WebCore::ResourceRequest&&, SyncLoadCompletionHandler&&);
     void stopTask(WebPageProxy&, uint64_t taskIdentifier);
-    void stopAllTasksForPage(WebPageProxy&, WebProcessProxy*);
+    void stopAllTasksForPage(WebPageProxy&);
     void taskCompleted(WebURLSchemeTask&);
 
@@ -68 +68 @@
 
     void removeTaskFromPageMap(uint64_t pageID, uint64_t taskID);
-    WebProcessProxy* processForTaskIdentifier(uint64_t) const;
 
     uint64_t m_identifier;

trunk/Source/WebKit/UIProcess/WebURLSchemeTask.h

@@ -59 +59 @@
     uint64_t identifier() const { return m_identifier; }
     uint64_t pageID() const { return m_pageIdentifier; }
-    WebProcessProxy* process() const { return m_process.get(); }
 
     const WebCore::ResourceRequest& request() const { return m_request; }

trunk/Tools/ChangeLog

@@ +1 @@
+2019-04-30  Chris Dumez  <cdumez@apple.com>
+
+        Unreviewed, rolling out r244802.
+
+        Caused an API test failure
+
+        Reverted changeset:
+
+        "Regression(PSON) URL scheme handlers can no longer respond
+        asynchronously"
+        https://bugs.webkit.org/show_bug.cgi?id=197426
+        https://trac.webkit.org/changeset/244802
+
 2019-04-30  Chris Dumez  <cdumez@apple.com>
 

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

@@ -49 +49 @@
 #import <WebKit/_WKWebsiteDataStoreConfiguration.h>
 #import <WebKit/_WKWebsitePolicies.h>
-#import <wtf/BlockPtr.h>
 #import <wtf/Deque.h>
 #import <wtf/HashMap.h>
@@ -240 +239 @@
     HashMap<String, String> _redirects;
     HashMap<String, RetainPtr<NSData>> _dataMappings;
-    HashSet<id <WKURLSchemeTask>> _runningTasks;
-    bool _shouldRespondAsynchronously;
 }
 - (instancetype)initWithBytes:(const char*)bytes;
@@ -267 +264 @@
 }
 
-- (void)setShouldRespondAsynchronously:(BOOL)value
-{
-    _shouldRespondAsynchronously = value;
-}
-
 - (void)webView:(WKWebView *)webView startURLSchemeTask:(id <WKURLSchemeTask>)task
 {
+    NSURL *finalURL = task.request.URL;
+    auto target = _redirects.get(task.request.URL.absoluteString);
+    if (!target.isEmpty()) {
+        auto redirectResponse = adoptNS([[NSURLResponse alloc] initWithURL:task.request.URL MIMEType:nil expectedContentLength:0 textEncodingName:nil]);
+
+        finalURL = [NSURL URLWithString:(NSString *)target];
+        auto request = adoptNS([[NSURLRequest alloc] initWithURL:finalURL]);
+
+        [(id<WKURLSchemeTaskPrivate>)task _didPerformRedirection:redirectResponse.get() newRequest:request.get()];
+    }
+
     if ([(id<WKURLSchemeTaskPrivate>)task _requestOnlyIfCached]) {
         [task didFailWithError:[NSError errorWithDomain:@"TestWebKitAPI" code:1 userInfo:nil]];
@@ -279 +282 @@
     }
 
-    _runningTasks.add(task);
-
-    auto doAsynchronouslyIfNecessary = [self, strongSelf = retainPtr(self), task = retainPtr(task)](Function<void(id <WKURLSchemeTask>)>&& f, double delay) {
-        if (!_shouldRespondAsynchronously)
-            return f(task.get());
-        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, delay * NSEC_PER_SEC), dispatch_get_main_queue(), makeBlockPtr([self, strongSelf, task, f = WTFMove(f)] {
-            if (_runningTasks.contains(task.get()))
-                f(task.get());
-        }).get());
-    };
-
-    NSURL *finalURL = task.request.URL;
-    auto target = _redirects.get(task.request.URL.absoluteString);
-    if (!target.isEmpty()) {
-        auto redirectResponse = adoptNS([[NSURLResponse alloc] initWithURL:task.request.URL MIMEType:nil expectedContentLength:0 textEncodingName:nil]);
-
-        finalURL = [NSURL URLWithString:(NSString *)target];
-        auto request = adoptNS([[NSURLRequest alloc] initWithURL:finalURL]);
-
-        [(id<WKURLSchemeTaskPrivate>)task _didPerformRedirection:redirectResponse.get() newRequest:request.get()];
-    }
-
-    doAsynchronouslyIfNecessary([finalURL = retainPtr(finalURL)](id <WKURLSchemeTask> task) {
-        RetainPtr<NSURLResponse> response = adoptNS([[NSURLResponse alloc] initWithURL:finalURL.get() MIMEType:@"text/html" expectedContentLength:1 textEncodingName:nil]);
-        [task didReceiveResponse:response.get()];
-    }, 0.1);
-
-    doAsynchronouslyIfNecessary([self, finalURL = retainPtr(finalURL)](id <WKURLSchemeTask> task) {
-        if (auto data = _dataMappings.get([finalURL absoluteString]))
-            [task didReceiveData:data.get()];
-        else if (_bytes) {
-            RetainPtr<NSData> data = adoptNS([[NSData alloc] initWithBytesNoCopy:(void *)_bytes length:strlen(_bytes) freeWhenDone:NO]);
-            [task didReceiveData:data.get()];
-        } else
-            [task didReceiveData:[@"Hello" dataUsingEncoding:NSUTF8StringEncoding]];
-    }, 0.2);
-
-    doAsynchronouslyIfNecessary([self](id <WKURLSchemeTask> task) {
-        [task didFinish];
-        _runningTasks.remove(task);
-    }, 0.3);
+    RetainPtr<NSURLResponse> response = adoptNS([[NSURLResponse alloc] initWithURL:finalURL MIMEType:@"text/html" expectedContentLength:1 textEncodingName:nil]);
+    [task didReceiveResponse:response.get()];
+
+    if (auto data = _dataMappings.get([finalURL absoluteString]))
+        [task didReceiveData:data.get()];
+    else if (_bytes) {
+        RetainPtr<NSData> data = adoptNS([[NSData alloc] initWithBytesNoCopy:(void *)_bytes length:strlen(_bytes) freeWhenDone:NO]);
+        [task didReceiveData:data.get()];
+    } else
+        [task didReceiveData:[@"Hello" dataUsingEncoding:NSUTF8StringEncoding]];
+
+    [task didFinish];
 }
 
 - (void)webView:(WKWebView *)webView stopURLSchemeTask:(id <WKURLSchemeTask>)task
 {
-    _runningTasks.remove(task);
 }
 
@@ -499 +472 @@
 }
 
-enum class SchemeHandlerShouldBeAsync { No, Yes };
-static void runBasicTest(SchemeHandlerShouldBeAsync schemeHandlerShouldBeAsync)
-{
-    auto processPoolConfiguration = psonProcessPoolConfiguration();
-    auto processPool = adoptNS([[WKProcessPool alloc] _initWithConfiguration:processPoolConfiguration.get()]);
-
-    auto webViewConfiguration = adoptNS([[WKWebViewConfiguration alloc] init]);
-    [webViewConfiguration setProcessPool:processPool.get()];
-    auto handler = adoptNS([[PSONScheme alloc] init]);
-    [handler setShouldRespondAsynchronously:(schemeHandlerShouldBeAsync == SchemeHandlerShouldBeAsync::Yes)];
+TEST(ProcessSwap, Basic)
+{
+    auto processPoolConfiguration = psonProcessPoolConfiguration();
+    auto processPool = adoptNS([[WKProcessPool alloc] _initWithConfiguration:processPoolConfiguration.get()]);
+
+    auto webViewConfiguration = adoptNS([[WKWebViewConfiguration alloc] init]);
+    [webViewConfiguration setProcessPool:processPool.get()];
+    auto handler = adoptNS([[PSONScheme alloc] init]);
     [webViewConfiguration setURLSchemeHandler:handler.get() forURLScheme:@"PSON"];
 
@@ -544 +515 @@
     // 3 loads, 3 decidePolicy calls (e.g. the load that did perform a process swap should not have generated an additional decidePolicy call)
     EXPECT_EQ(numberOfDecidePolicyCalls, 3);
-}
-
-TEST(ProcessSwap, Basic)
-{
-    runBasicTest(SchemeHandlerShouldBeAsync::No);
-}
-
-TEST(ProcessSwap, BasicWithAsyncSchemeHandler)
-{
-    runBasicTest(SchemeHandlerShouldBeAsync::Yes);
 }