Attachment 340873 Details for Bug 185830 – FIX

[patch] FIX

185830.diff (text/plain), 2.14 KB, created by Basuke Suzuki on 2018-05-21 12:56:08 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Basuke Suzuki

Created: 2018-05-21 12:56:08 PDT

Size: 2.14 KB

patch

obsolete

>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 123deee123a..af1daf5be3a 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,20 @@
>+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 NOBODY (OOPS!).
>+
>+        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  Olivier Blin  <olivier.blin@softathome.com>
> 
>         [CMake][WebCore] fix sqlite include dir variable
>diff --git a/Source/WebCore/platform/network/curl/CurlRequest.cpp b/Source/WebCore/platform/network/curl/CurlRequest.cpp
>index 2aa48f16179..026e8d29d54 100644
>--- a/Source/WebCore/platform/network/curl/CurlRequest.cpp
>+++ b/Source/WebCore/platform/network/curl/CurlRequest.cpp
>@@ -132,9 +132,6 @@ void CurlRequest::suspend()
> {
>     ASSERT(isMainThread());
> 
>-    if (isCompletedOrCancelled())
>-        return;
>-
>     setRequestPaused(true);
> }
> 
>@@ -142,9 +139,6 @@ void CurlRequest::resume()
> {
>     ASSERT(isMainThread());
> 
>-    if (isCompletedOrCancelled())
>-        return;
>-
>     setRequestPaused(false);
> }
> 
>@@ -648,6 +642,9 @@ void CurlRequest::invokeCancel()
> 
> void CurlRequest::pausedStatusChanged()
> {
>+    if (isCompletedOrCancelled())
>+        return;
>+
>     runOnWorkerThreadIfRequired([this, protectedThis = makeRef(*this)]() {
>         if (isCompletedOrCancelled())
>             return;
>@@ -664,7 +661,7 @@ void CurlRequest::pausedStatusChanged()
>             if (error == CURLE_OK)
>                 updateHandlePauseState(paused);
> 
>-            needCancel = (error != CURLE_OK && paused);
>+            needCancel = (error != CURLE_OK && !paused);
>         }
> 
>         if (needCancel)

Actions: View | Formatted Diff | Diff

Attachments on bug 185830: 340873