Changeset 204085 in webkit

Timestamp:

Aug 3, 2016 10:15:12 AM (8 years ago)

Author:

commit-queue@webkit.org

Message:

http/tests/fetch/fetch-in-worker-crash.html is sometimes crashing
​https://bugs.webkit.org/show_bug.cgi?id=160498

Patch by Youenn Fablet <​youenn@apple.com> on 2016-08-03
Reviewed by Chris Dumez.

Source/WebCore:

Covered by http/tests/fetch/fetch-in-worker-crash.html.

• loader/WorkerThreadableLoader.cpp:

(WebCore::WorkerThreadableLoader::MainThreadBridge::cancel): Taking a reference of the client wrapper to ensure it can be cleaned-up successfully.

LayoutTests:

• http/tests/fetch/fetch-in-worker.js:

(onmessage): Reducing flakiness risk by making fetch http load being delayed.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/fetch/fetch-in-worker.js (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/loader/WorkerThreadableLoader.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-08-03  Youenn Fablet  <youenn@apple.com>
+
+        http/tests/fetch/fetch-in-worker-crash.html is sometimes crashing
+        https://bugs.webkit.org/show_bug.cgi?id=160498
+
+        Reviewed by Chris Dumez.
+
+        * http/tests/fetch/fetch-in-worker.js:
+        (onmessage): Reducing flakiness risk by making fetch http load being delayed.
+
 2016-08-03  Chris Dumez  <cdumez@apple.com>
 

trunk/LayoutTests/http/tests/fetch/fetch-in-worker.js

@@ -4 +4 @@
         return;
 
-    var promise1 = fetch("detached-frame.html").then(() => {
+    var promise1 = fetch("/misc/resources/delayed-log.php?delay=100").then(() => {
         postMessage("FAIL: promise 1 resolved");
     }, () => {

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-08-03  Youenn Fablet  <youenn@apple.com>
+
+        http/tests/fetch/fetch-in-worker-crash.html is sometimes crashing
+        https://bugs.webkit.org/show_bug.cgi?id=160498
+
+        Reviewed by Chris Dumez.
+
+        Covered by http/tests/fetch/fetch-in-worker-crash.html.
+
+        * loader/WorkerThreadableLoader.cpp:
+        (WebCore::WorkerThreadableLoader::MainThreadBridge::cancel): Taking a reference of the client wrapper to ensure it can be cleaned-up successfully.
+
 2016-08-02  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebCore/loader/WorkerThreadableLoader.cpp

@@ -150 +150 @@
     });
 
-    ThreadableLoaderClientWrapper* clientWrapper = m_workerClientWrapper.get();
-    if (!clientWrapper->done()) {
-        // If the client hasn't reached a termination state, then transition it by sending a cancellation error.
-        // Note: no more client callbacks will be done after this method -- the clearClientWrapper() call ensures that.
-        ResourceError error(ResourceError::Type::Cancellation);
-        clientWrapper->didFail(error);
+    if (m_workerClientWrapper->done()) {
+        clearClientWrapper();
+        return;
     }
-    clearClientWrapper();
+    // Taking a ref of client wrapper as call to didFail may take out the last reference of it.
+    Ref<ThreadableLoaderClientWrapper> protectedWorkerClientWrapper(*m_workerClientWrapper);
+    // If the client hasn't reached a termination state, then transition it by sending a cancellation error.
+    // Note: no more client callbacks will be done after this method -- we clear the client wrapper to ensure that.
+    ResourceError error(ResourceError::Type::Cancellation);
+    protectedWorkerClientWrapper->didFail(error);
+    protectedWorkerClientWrapper->clearClient();
 }