Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1109)

Unified Diff: Source/core/loader/DocumentThreadableLoader.cpp

Issue 273993002: Allow XHR timeout attribute to be overridden after send(), per spec (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fixed accuracy issues with removed Timer methods Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/core/loader/DocumentThreadableLoader.cpp
diff --git a/Source/core/loader/DocumentThreadableLoader.cpp b/Source/core/loader/DocumentThreadableLoader.cpp
index 2840dce77f4d9e26c4eae1e3c59f20864f715df6..055d71cd9ad3de3f6aeb8a32b98d2876c25b612c 100644
--- a/Source/core/loader/DocumentThreadableLoader.cpp
+++ b/Source/core/loader/DocumentThreadableLoader.cpp
@@ -76,6 +76,7 @@ DocumentThreadableLoader::DocumentThreadableLoader(Document& document, Threadabl
, m_simpleRequest(true)
, m_async(blockingBehavior == LoadAsynchronously)
, m_timeoutTimer(this, &DocumentThreadableLoader::didTimeout)
+ , m_requestStarted(0.0)
{
ASSERT(client);
// Setting an outgoing referer is only supported in the async code path.
@@ -138,6 +139,26 @@ DocumentThreadableLoader::~DocumentThreadableLoader()
{
}
+void DocumentThreadableLoader::overrideTimeout(unsigned long timeoutMilliseconds)
+{
+ if (!m_async)
+ return;
+ m_timeoutTimer.stop();
+ // At the time of this method's implementation, it is only ever called by
+ // XMLHttpRequest, when the timeout attribute is set after sending the
+ // request.
+ //
+ // The XHR request says to resolve the time relative to when the request
+ // was initially sent, however other uses of this method may need to
+ // behave differently, in which case this should be re-arranged somehow.
+ if (timeoutMilliseconds) {
+ double elapsedTime = (monotonicallyIncreasingTime() - m_requestStarted);
tyoshino (SeeGerritForStatus) 2014/05/12 09:21:17 remove parentheses
+ double nextFire = timeoutMilliseconds / 1000.0;
+ double resolvedTime = nextFire > elapsedTime ? nextFire - elapsedTime : 0.0;
+ m_timeoutTimer.startOneShot(resolvedTime, FROM_HERE);
+ }
+}
+
void DocumentThreadableLoader::cancel()
{
cancelWithError(ResourceError());
@@ -396,6 +417,7 @@ void DocumentThreadableLoader::loadRequest(const ResourceRequest& request)
if (m_options.timeoutMilliseconds > 0)
m_timeoutTimer.startOneShot(m_options.timeoutMilliseconds / 1000.0, FROM_HERE);
+ m_requestStarted = monotonicallyIncreasingTime();
FetchRequest newRequest(request, m_options.initiator, options);
ASSERT(!resource());

Powered by Google App Engine
This is Rietveld 408576698