Title: [225743] trunk/Source/WebCore
- Revision
- 225743
- Author
- [email protected]
- Date
- 2017-12-11 09:38:57 -0800 (Mon, 11 Dec 2017)
Log Message
[WinCairo] DumpRenderTree times out for all non-http tests
https://bugs.webkit.org/show_bug.cgi?id=180571
Patch by Basuke Suzuki <[email protected]> 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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (225742 => 225743)
--- trunk/Source/WebCore/ChangeLog 2017-12-11 10:16:55 UTC (rev 225742)
+++ trunk/Source/WebCore/ChangeLog 2017-12-11 17:38:57 UTC (rev 225743)
@@ -1,3 +1,21 @@
+2017-12-11 Basuke Suzuki <[email protected]>
+
+ [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 <[email protected]>
REGRESSION(r221931): Row stretch doesn't work for grid container with min-height
Modified: trunk/Source/WebCore/platform/network/curl/CurlRequest.cpp (225742 => 225743)
--- trunk/Source/WebCore/platform/network/curl/CurlRequest.cpp 2017-12-11 10:16:55 UTC (rev 225742)
+++ trunk/Source/WebCore/platform/network/curl/CurlRequest.cpp 2017-12-11 17:38:57 UTC (rev 225743)
@@ -536,9 +536,12 @@
ASSERT(m_didNotifyResponse);
ASSERT(!m_didReturnFromNotify);
- if (isCompletedOrCancelled())
+ if (isCancelled())
return;
+ if (m_actionAfterInvoke != Action::StartTransfer && isCompleted())
+ return;
+
m_didReturnFromNotify = true;
if (m_actionAfterInvoke == Action::ReceiveData) {
Modified: trunk/Source/WebCore/platform/network/curl/CurlRequest.h (225742 => 225743)
--- trunk/Source/WebCore/platform/network/curl/CurlRequest.h 2017-12-11 10:16:55 UTC (rev 225742)
+++ trunk/Source/WebCore/platform/network/curl/CurlRequest.h 2017-12-11 17:38:57 UTC (rev 225743)
@@ -60,7 +60,9 @@
void resume();
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(); }
// Processing for DidReceiveResponse
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
