Changeset 232039 in webkit

Timestamp:

May 21, 2018 5:14:39 PM (6 years ago)

Author:

Basuke Suzuki

Message:

[Curl] Bugfix for r231968, Suspend/Resume with WK2
​https://bugs.webkit.org/show_bug.cgi?id=185830

The flags are needed to be updated even if it is cancelled or finished to cleanup correctly.
Also fixed trivial bug for very rare case (hard to produce the situation).

Reviewed by Youenn Fablet.

No new tests because WK2 is not ready for WinCairo yet in public., tested internaly.

• platform/network/curl/CurlRequest.cpp:

(WebCore::CurlRequest::suspend):
(WebCore::CurlRequest::resume):
(WebCore::CurlRequest::pausedStatusChanged):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/network/curl/CurlRequest.cpp (modified) (4 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-05-21  Basuke Suzuki  <Basuke.Suzuki@sony.com>
+
+        [Curl] Bugfix for r231968, Suspend/Resume with WK2
+        https://bugs.webkit.org/show_bug.cgi?id=185830
+
+        The flags are needed to be updated even if it is cancelled or finished to cleanup correctly.
+        Also fixed trivial bug for very rare case (hard to produce the situation).
+
+        Reviewed by Youenn Fablet.
+
+        No new tests because WK2 is not ready for WinCairo yet in public., tested internaly.
+
+        * platform/network/curl/CurlRequest.cpp:
+        (WebCore::CurlRequest::suspend):
+        (WebCore::CurlRequest::resume):
+        (WebCore::CurlRequest::pausedStatusChanged):
+
 2018-05-21  Commit Queue  <commit-queue@webkit.org>
 

trunk/Source/WebCore/platform/network/curl/CurlRequest.cpp

@@ -133 +133 @@
     ASSERT(isMainThread());
 
-    if (isCompletedOrCancelled())
-        return;
-
     setRequestPaused(true);
 }
@@ -142 +139 @@
 {
     ASSERT(isMainThread());
-
-    if (isCompletedOrCancelled())
-        return;
 
     setRequestPaused(false);
@@ -649 +643 @@
 void CurlRequest::pausedStatusChanged()
 {
+    if (isCompletedOrCancelled())
+        return;
+
     runOnWorkerThreadIfRequired([this, protectedThis = makeRef(*this)]() {
         if (isCompletedOrCancelled())
@@ -665 +662 @@
                 updateHandlePauseState(paused);
 
-            needCancel = (error != CURLE_OK && paused);
+            needCancel = (error != CURLE_OK && !paused);
         }