Title: [132493] trunk/Source/WebCore
- Revision
- 132493
- Author
- [email protected]
- Date
- 2012-10-25 09:28:48 -0700 (Thu, 25 Oct 2012)
Log Message
Init timeout flag in ResourceErrorCF
https://bugs.webkit.org/show_bug.cgi?id=100349
Reviewed by Alexey Proskuryakov.
Initialize the timeout property to true if the network error was a timeout error.
This is a speculative fix for the XHR timeout test cases failing on Apple Win -
I can't verify this on a local machine.
No new tests, covered by
LayoutTests/http/tests/xmlhttprequest/timeout/*
* platform/network/cf/ResourceErrorCF.cpp:
(WebCore::ResourceError::ResourceError): Init m_timeout from error code.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (132492 => 132493)
--- trunk/Source/WebCore/ChangeLog 2012-10-25 16:09:01 UTC (rev 132492)
+++ trunk/Source/WebCore/ChangeLog 2012-10-25 16:28:48 UTC (rev 132493)
@@ -1,3 +1,20 @@
+2012-10-25 Dominik Röttsches <[email protected]>
+
+ Init timeout flag in ResourceErrorCF
+ https://bugs.webkit.org/show_bug.cgi?id=100349
+
+ Reviewed by Alexey Proskuryakov.
+
+ Initialize the timeout property to true if the network error was a timeout error.
+ This is a speculative fix for the XHR timeout test cases failing on Apple Win -
+ I can't verify this on a local machine.
+
+ No new tests, covered by
+ LayoutTests/http/tests/xmlhttprequest/timeout/*
+
+ * platform/network/cf/ResourceErrorCF.cpp:
+ (WebCore::ResourceError::ResourceError): Init m_timeout from error code.
+
2012-10-25 Kenneth Rohde Christiansen <[email protected]>
'resolution' MQ: Printing should use use high resolution images when available
Modified: trunk/Source/WebCore/platform/network/cf/ResourceErrorCF.cpp (132492 => 132493)
--- trunk/Source/WebCore/platform/network/cf/ResourceErrorCF.cpp 2012-10-25 16:09:01 UTC (rev 132492)
+++ trunk/Source/WebCore/platform/network/cf/ResourceErrorCF.cpp 2012-10-25 16:28:48 UTC (rev 132493)
@@ -45,6 +45,8 @@
, m_platformError(cfError)
{
m_isNull = !cfError;
+ if (!m_isNull)
+ m_isTimeout = CFErrorGetCode(m_platformError.get()) == kCFURLErrorTimedOut;
}
#if PLATFORM(WIN)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
