Changeset 225743 in webkit

Timestamp:

Dec 11, 2017 9:38:57 AM (6 years ago)

Author:

commit-queue@webkit.org

Message:

[WinCairo] DumpRenderTree times out for all non-http tests
​https://bugs.webkit.org/show_bug.cgi?id=180571

Patch by Basuke Suzuki <Basuke Suzuki> on 2017-12-11
Reviewed by Alex Christensen.

Bug fix on processing the curl event for file protocol.

No new tests. This fix is to run existing tests.

• platform/network/curl/CurlRequest.cpp:

(WebCore::CurlRequest::completeDidReceiveResponse):

• platform/network/curl/CurlRequest.h:

(WebCore::CurlRequest::isCompleted const):
(WebCore::CurlRequest::isCancelled const):
(WebCore::CurlRequest::isCompletedOrCancelled const):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-12-11  Basuke Suzuki  <Basuke.Suzuki@sony.com>
+
+        [WinCairo] DumpRenderTree times out for all non-http tests
+        https://bugs.webkit.org/show_bug.cgi?id=180571
+
+        Reviewed by Alex Christensen.
+
+        Bug fix on processing the curl event for file protocol.
+
+        No new tests. This fix is to run existing tests.
+
+        * platform/network/curl/CurlRequest.cpp:
+        (WebCore::CurlRequest::completeDidReceiveResponse):
+        * platform/network/curl/CurlRequest.h:
+        (WebCore::CurlRequest::isCompleted const):
+        (WebCore::CurlRequest::isCancelled const):
+        (WebCore::CurlRequest::isCompletedOrCancelled const):
+
 2017-12-11  Manuel Rego Casasnovas  <rego@igalia.com>
 

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

@@ -537 +537 @@
     ASSERT(!m_didReturnFromNotify);
 
-    if (isCompletedOrCancelled())
+    if (isCancelled())
+        return;
+
+    if (m_actionAfterInvoke != Action::StartTransfer && isCompleted())
         return;
 

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

@@ -61 +61 @@
 
     bool isSyncRequest() const { return m_isSyncRequest; }
-    bool isCompletedOrCancelled() const { return !m_curlHandle || m_cancelled; }
+    bool isCompleted() const { return !m_curlHandle; }
+    bool isCancelled() const { return m_cancelled; }
+    bool isCompletedOrCancelled() const { return isCompleted() || isCancelled(); }