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

Unified Diff: Source/core/loader/WorkerThreadableLoader.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.h ('k') | Source/core/xml/XMLHttpRequest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/loader/WorkerThreadableLoader.cpp
diff --git a/Source/core/loader/WorkerThreadableLoader.cpp b/Source/core/loader/WorkerThreadableLoader.cpp
index d8cc18bd35608a6d7d21922c52022ed5e188e2a5..b4ee50843c962ada01edb1c1be031428711ec5e9 100644
--- a/Source/core/loader/WorkerThreadableLoader.cpp
+++ b/Source/core/loader/WorkerThreadableLoader.cpp
@@ -95,11 +95,6 @@ void WorkerThreadableLoader::loadResourceSynchronously(WorkerGlobalScope& worker
clientBridgePtr->run();
}
-void WorkerThreadableLoader::overrideTimeout(unsigned long timeoutMilliseconds)
-{
- m_bridge.overrideTimeout(timeoutMilliseconds);
-}
-
void WorkerThreadableLoader::cancel()
{
m_bridge.cancel();
@@ -159,23 +154,6 @@ void WorkerThreadableLoader::MainThreadBridge::destroy()
createCallbackTask(&MainThreadBridge::mainThreadDestroy, AllowCrossThreadAccess(this)));
}
-void WorkerThreadableLoader::MainThreadBridge::mainThreadOverrideTimeout(ExecutionContext* context, MainThreadBridge* thisPtr, unsigned long timeoutMilliseconds)
-{
- ASSERT(isMainThread());
- ASSERT_UNUSED(context, context->isDocument());
-
- if (!thisPtr->m_mainThreadLoader)
- return;
- thisPtr->m_mainThreadLoader->overrideTimeout(timeoutMilliseconds);
-}
-
-void WorkerThreadableLoader::MainThreadBridge::overrideTimeout(unsigned long timeoutMilliseconds)
-{
- m_loaderProxy.postTaskToLoader(
- createCallbackTask(&MainThreadBridge::mainThreadOverrideTimeout, AllowCrossThreadAccess(this),
- timeoutMilliseconds));
-}
-
void WorkerThreadableLoader::MainThreadBridge::mainThreadCancel(ExecutionContext* context, MainThreadBridge* thisPtr)
{
ASSERT(isMainThread());
« no previous file with comments | « Source/core/loader/WorkerThreadableLoader.h ('k') | Source/core/xml/XMLHttpRequest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698