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

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

Issue 2668603003: Make ResourceHandler::OnWillRead able to complete asynchronously. (Closed)
Patch Set: Response to comments Created 3 years, 9 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: content/browser/loader/detachable_resource_handler.h
diff --git a/content/browser/loader/detachable_resource_handler.h b/content/browser/loader/detachable_resource_handler.h
index c9599a24d8e335082aac0af31af9d17502eea63a..3e7075a1bb0ee51f1e4184c0f6bb5021ef9018c7 100644
--- a/content/browser/loader/detachable_resource_handler.h
+++ b/content/browser/loader/detachable_resource_handler.h
@@ -14,6 +14,7 @@
#include "base/timer/timer.h"
#include "content/browser/loader/resource_controller.h"
#include "content/browser/loader/resource_handler.h"
+#include "content/common/content_export.h"
namespace net {
class IOBuffer;
@@ -34,7 +35,7 @@ class ResourceController;
//
// Note that, once detached, the request continues without the original next
// handler, so any policy decisions in that handler are skipped.
-class DetachableResourceHandler : public ResourceHandler {
+class CONTENT_EXPORT DetachableResourceHandler : public ResourceHandler {
public:
DetachableResourceHandler(net::URLRequest* request,
base::TimeDelta cancel_delay,
@@ -60,8 +61,9 @@ class DetachableResourceHandler : public ResourceHandler {
std::unique_ptr<ResourceController> controller) override;
void OnWillStart(const GURL& url,
std::unique_ptr<ResourceController> controller) override;
- bool OnWillRead(scoped_refptr<net::IOBuffer>* buf,
- int* buf_size) override;
+ void OnWillRead(scoped_refptr<net::IOBuffer>* buf,
+ int* buf_size,
+ std::unique_ptr<ResourceController> controller) override;
void OnReadCompleted(int bytes_read,
std::unique_ptr<ResourceController> controller) override;
void OnResponseCompleted(
@@ -72,6 +74,7 @@ class DetachableResourceHandler : public ResourceHandler {
private:
class Controller;
+ void ResumeInternal();
void OnTimedOut();
std::unique_ptr<ResourceHandler> next_handler_;
@@ -80,6 +83,12 @@ class DetachableResourceHandler : public ResourceHandler {
std::unique_ptr<base::OneShotTimer> detached_timer_;
base::TimeDelta cancel_delay_;
+ // Only non-NULL between a call to |next_handler_|'s OnWillRead and it
+ // resuming the request. Needed so that if detached during that time, can
+ // complete the call.
+ scoped_refptr<net::IOBuffer>* parent_read_buffer_;
+ int* parent_read_buffer_size_;
+
bool is_finished_;
DISALLOW_COPY_AND_ASSIGN(DetachableResourceHandler);
« no previous file with comments | « content/browser/loader/async_resource_handler.cc ('k') | content/browser/loader/detachable_resource_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698