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

Unified Diff: content/browser/loader/async_resource_handler.cc

Issue 23851010: Modify ResourceMessageFilter so that it can support attaching to PluginProcessHost. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: sync Created 7 years, 3 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/async_resource_handler.cc
===================================================================
--- content/browser/loader/async_resource_handler.cc (revision 222038)
+++ content/browser/loader/async_resource_handler.cc (working copy)
@@ -78,10 +78,12 @@
AsyncResourceHandler::AsyncResourceHandler(
ResourceMessageFilter* filter,
+ ResourceContext* resource_context,
net::URLRequest* request,
ResourceDispatcherHostImpl* rdh)
: ResourceMessageDelegate(request),
filter_(filter),
+ resource_context_(resource_context),
request_(request),
rdh_(rdh),
pending_data_count_(0),
@@ -148,9 +150,8 @@
*defer = did_defer_ = true;
if (rdh_->delegate()) {
- rdh_->delegate()->OnRequestRedirected(new_url, request_,
- filter_->resource_context(),
- response);
+ rdh_->delegate()->OnRequestRedirected(
+ new_url, request_, resource_context_, response);
}
DevToolsNetLogObserver::PopulateResponseInfo(request_, response);
@@ -169,16 +170,15 @@
// request commits, avoiding the possibility of e.g. zooming the old content
// or of having to layout the new content twice.
- ResourceContext* resource_context = filter_->resource_context();
if (rdh_->delegate()) {
rdh_->delegate()->OnResponseStarted(
- request_, resource_context, response, filter_.get());
+ request_, resource_context_, response, filter_.get());
}
DevToolsNetLogObserver::PopulateResponseInfo(request_, response);
HostZoomMap* host_zoom_map =
- GetHostZoomMapForResourceContext(resource_context);
+ GetHostZoomMapForResourceContext(resource_context_);
const ResourceRequestInfo* info = ResourceRequestInfo::ForRequest(request_);
if (info->GetResourceType() == ResourceType::MAIN_FRAME && host_zoom_map) {
« no previous file with comments | « content/browser/loader/async_resource_handler.h ('k') | content/browser/loader/resource_dispatcher_host_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698