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

Unified Diff: Source/core/xml/XMLHttpRequest.cpp

Issue 333823006: Revert "Allow XHR timeout attribute to be overridden after send(), per spec" (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 6 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
« no previous file with comments | « Source/core/loader/WorkerThreadableLoader.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/xml/XMLHttpRequest.cpp
diff --git a/Source/core/xml/XMLHttpRequest.cpp b/Source/core/xml/XMLHttpRequest.cpp
index 076a7ea07f209af1911bf08b61ed232724933cc7..305774dd0cfad72816dff90796dfd41f87cea206 100644
--- a/Source/core/xml/XMLHttpRequest.cpp
+++ b/Source/core/xml/XMLHttpRequest.cpp
@@ -346,16 +346,7 @@ void XMLHttpRequest::setTimeout(unsigned long timeout, ExceptionState& exception
exceptionState.throwDOMException(InvalidAccessError, "Timeouts cannot be set for synchronous requests made from a document.");
return;
}
-
m_timeoutMilliseconds = timeout;
-
- // From http://www.w3.org/TR/XMLHttpRequest/#the-timeout-attribute:
- // Note: This implies that the timeout attribute can be set while fetching is in progress. If
- // that occurs it will still be measured relative to the start of fetching.
- //
- // The timeout may be overridden after send.
- if (m_loader)
- m_loader->overrideTimeout(timeout);
}
void XMLHttpRequest::setResponseType(const String& responseType, ExceptionState& exceptionState)
« no previous file with comments | « Source/core/loader/WorkerThreadableLoader.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698