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

Unified Diff: Source/core/platform/network/chromium/ResourceHandle.cpp

Issue 14246006: Implementing timeout support for XHR (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@timeoutResourceHandle
Patch Set: Rebased, cancel method accepting error argument. Created 7 years, 8 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/platform/network/chromium/ResourceHandle.cpp
diff --git a/Source/core/platform/network/chromium/ResourceHandle.cpp b/Source/core/platform/network/chromium/ResourceHandle.cpp
index 54175ef216086b78905b6a56f4874d017cb3f4f1..d5d5420990d9f4a9105c1f2a5e8c640d6f182cf1 100644
--- a/Source/core/platform/network/chromium/ResourceHandle.cpp
+++ b/Source/core/platform/network/chromium/ResourceHandle.cpp
@@ -1,5 +1,6 @@
/*
* Copyright (C) 2009 Google Inc. All rights reserved.
+ * Copyright (C) 2013 Intel Corporation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
@@ -58,6 +59,7 @@ ResourceHandleInternal::ResourceHandleInternal(NetworkingContext* context, const
, m_owner(0)
, m_client(client)
, m_state(ConnectionStateNew)
+ , m_timeoutTimer(this, &ResourceHandleInternal::timerFired)
{
}
@@ -73,13 +75,21 @@ void ResourceHandleInternal::start()
WrappedResourceRequest wrappedRequest(m_request);
wrappedRequest.setAllowStoredCredentials(allowStoredCredentials());
m_loader->loadAsynchronously(wrappedRequest, this);
+
+ if (m_request.timeoutInterval() > 0)
darin (slow to review) 2013/04/22 17:46:39 I'm also curious if we can remove ResourceRequest:
+ m_timeoutTimer.startOneShot(m_request.timeoutInterval());
}
-void ResourceHandleInternal::cancel()
+void ResourceHandleInternal::cancel(const ResourceError& error)
{
m_state = ConnectionStateCanceled;
m_loader->cancel();
+ if (m_client && !error.isNull()) {
+ m_client->didFail(m_owner, error);
Dominik Röttsches 2013/04/22 15:47:45 didFail() here triggers a WebCore::ResourceLoader:
+ return;
+ }
+
// Do not make any further calls to the client.
m_client = 0;
}
@@ -177,6 +187,18 @@ ResourceHandleInternal* ResourceHandleInternal::FromResourceHandle(ResourceHandl
return handle->d.get();
}
+void ResourceHandleInternal::timerFired(Timer<ResourceHandleInternal>* timer)
+{
+ ASSERT_UNUSED(timer, timer == &m_timeoutTimer);
+
+ // Using values from net/base/net_error_list.h ERR_TIMED_OUT.
+ static const int timeoutError = -7;
+ static const char* const errorDomain = "net";
Dominik Röttsches 2013/04/22 15:47:45 Since the cancel() method now checks for isNull(),
+ ResourceError error(errorDomain, timeoutError, m_request.url().string(), String());
+ error.setIsTimeout(true);
+ cancel(error);
+ }
+
// ResourceHandle -------------------------------------------------------------
ResourceHandle::ResourceHandle(NetworkingContext* context, const ResourceRequest& request, ResourceHandleClient* client, bool defersLoading, bool shouldContentSniff)

Powered by Google App Engine
This is Rietveld 408576698