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

Unified Diff: content/browser/loader/resource_loader.h

Issue 11270027: Add a ResourceScheduler to ResourceDispatcherHost. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix typo Created 8 years 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: content/browser/loader/resource_loader.h
diff --git a/content/browser/loader/resource_loader.h b/content/browser/loader/resource_loader.h
index 14a67ec9e9c3587f047882a40b0ea27682dfc5c2..fca1c535a88f616c7673d54c8cd0b47f796038ff 100644
--- a/content/browser/loader/resource_loader.h
+++ b/content/browser/loader/resource_loader.h
@@ -8,6 +8,7 @@
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "content/browser/loader/resource_handler.h"
+#include "content/browser/loader/resource_scheduler.h"
#include "content/browser/ssl/ssl_error_handler.h"
#include "content/public/browser/resource_controller.h"
#include "net/url_request/url_request.h"
@@ -23,14 +24,15 @@ class SSLClientAuthHandler;
// chain of ResourceHandlers, and is the ResourceController for its handler.
class ResourceLoader : public net::URLRequest::Delegate,
public SSLErrorHandler::Delegate,
- public ResourceController {
+ public ResourceController,
+ public ResourceScheduler::Loadable {
public:
- ResourceLoader(scoped_ptr<net::URLRequest> request,
- scoped_ptr<ResourceHandler> handler,
- ResourceLoaderDelegate* delegate);
+ CONTENT_EXPORT ResourceLoader(scoped_ptr<net::URLRequest> request,
+ scoped_ptr<ResourceHandler> handler,
+ ResourceLoaderDelegate* delegate);
virtual ~ResourceLoader();
- void StartRequest();
+ void ScheduleRequest(ResourceScheduler* scheduler);
void CancelRequest(bool from_renderer);
void ReportUploadProgress();
@@ -77,6 +79,10 @@ class ResourceLoader : public net::URLRequest::Delegate,
virtual void CancelAndIgnore() OVERRIDE;
virtual void CancelWithError(int error_code) OVERRIDE;
+ // ResourceScheduler::Loadable implementation:
+ virtual void StartRequest() OVERRIDE;
+ virtual const net::URLRequest* url_request() OVERRIDE;
+
void StartRequestInternal();
void CancelRequestInternal(int error, bool from_renderer);
void CompleteResponseStarted();
@@ -101,6 +107,7 @@ class ResourceLoader : public net::URLRequest::Delegate,
scoped_ptr<net::URLRequest> request_;
scoped_ptr<ResourceHandler> handler_;
ResourceLoaderDelegate* delegate_;
+ scoped_ptr<ResourceScheduler::LoadHandle> load_handle_;
scoped_refptr<ResourceDispatcherHostLoginDelegate> login_delegate_;
scoped_refptr<SSLClientAuthHandler> ssl_client_auth_handler_;

Powered by Google App Engine
This is Rietveld 408576698