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

Side by Side Diff: content/browser/loader/async_resource_handler.cc

Issue 393133002: Migrate HostZoomMap to live in StoragePartition. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix unit tests. Created 6 years, 1 month 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/loader/async_resource_handler.h" 5 #include "content/browser/loader/async_resource_handler.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/command_line.h" 10 #include "base/command_line.h"
11 #include "base/containers/hash_tables.h" 11 #include "base/containers/hash_tables.h"
12 #include "base/debug/alias.h" 12 #include "base/debug/alias.h"
13 #include "base/logging.h" 13 #include "base/logging.h"
14 #include "base/memory/shared_memory.h" 14 #include "base/memory/shared_memory.h"
15 #include "base/metrics/histogram.h" 15 #include "base/metrics/histogram.h"
16 #include "base/strings/string_number_conversions.h" 16 #include "base/strings/string_number_conversions.h"
17 #include "base/time/time.h" 17 #include "base/time/time.h"
18 #include "content/browser/devtools/devtools_netlog_observer.h" 18 #include "content/browser/devtools/devtools_netlog_observer.h"
19 #include "content/browser/host_zoom_map_impl.h" 19 #include "content/browser/host_zoom_map_impl.h"
20 #include "content/browser/loader/resource_buffer.h" 20 #include "content/browser/loader/resource_buffer.h"
21 #include "content/browser/loader/resource_dispatcher_host_impl.h" 21 #include "content/browser/loader/resource_dispatcher_host_impl.h"
22 #include "content/browser/loader/resource_message_filter.h" 22 #include "content/browser/loader/resource_message_filter.h"
23 #include "content/browser/loader/resource_request_info_impl.h" 23 #include "content/browser/loader/resource_request_info_impl.h"
24 #include "content/browser/resource_context_impl.h" 24 #include "content/browser/resource_context_impl.h"
25 #include "content/common/resource_messages.h" 25 #include "content/common/resource_messages.h"
26 #include "content/common/view_messages.h" 26 #include "content/common/view_messages.h"
27 #include "content/public/browser/render_process_host.h"
27 #include "content/public/browser/resource_dispatcher_host_delegate.h" 28 #include "content/public/browser/resource_dispatcher_host_delegate.h"
29 #include "content/public/browser/storage_partition.h"
28 #include "content/public/common/resource_response.h" 30 #include "content/public/common/resource_response.h"
29 #include "net/base/io_buffer.h" 31 #include "net/base/io_buffer.h"
30 #include "net/base/load_flags.h" 32 #include "net/base/load_flags.h"
31 #include "net/base/net_log.h" 33 #include "net/base/net_log.h"
32 #include "net/base/net_util.h" 34 #include "net/base/net_util.h"
33 #include "net/url_request/redirect_info.h" 35 #include "net/url_request/redirect_info.h"
34 36
35 using base::TimeTicks; 37 using base::TimeTicks;
36 38
37 namespace content { 39 namespace content {
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
186 if (!info->filter()) 188 if (!info->filter())
187 return false; 189 return false;
188 190
189 if (rdh_->delegate()) { 191 if (rdh_->delegate()) {
190 rdh_->delegate()->OnResponseStarted( 192 rdh_->delegate()->OnResponseStarted(
191 request(), info->GetContext(), response, info->filter()); 193 request(), info->GetContext(), response, info->filter());
192 } 194 }
193 195
194 DevToolsNetLogObserver::PopulateResponseInfo(request(), response); 196 DevToolsNetLogObserver::PopulateResponseInfo(request(), response);
195 197
196 HostZoomMap* host_zoom_map = 198 HostZoomMap* host_zoom_map = info->filter()->GetHostZoomMap();
197 GetHostZoomMapForResourceContext(info->GetContext());
198 199
199 if (info->GetResourceType() == RESOURCE_TYPE_MAIN_FRAME && host_zoom_map) { 200 if (info->GetResourceType() == RESOURCE_TYPE_MAIN_FRAME && host_zoom_map) {
200 const GURL& request_url = request()->url(); 201 const GURL& request_url = request()->url();
201 info->filter()->Send(new ViewMsg_SetZoomLevelForLoadingURL( 202 info->filter()->Send(new ViewMsg_SetZoomLevelForLoadingURL(
202 info->GetRouteID(), 203 info->GetRouteID(),
203 request_url, host_zoom_map->GetZoomLevelForHostAndScheme( 204 request_url, host_zoom_map->GetZoomLevelForHostAndScheme(
204 request_url.scheme(), 205 request_url.scheme(),
205 net::GetHostOrSpecFromURL(request_url)))); 206 net::GetHostOrSpecFromURL(request_url))));
206 } 207 }
207 208
(...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after
401 request()->LogUnblocked(); 402 request()->LogUnblocked();
402 controller()->Resume(); 403 controller()->Resume();
403 } 404 }
404 } 405 }
405 406
406 void AsyncResourceHandler::OnDefer() { 407 void AsyncResourceHandler::OnDefer() {
407 request()->LogBlockedBy("AsyncResourceHandler"); 408 request()->LogBlockedBy("AsyncResourceHandler");
408 } 409 }
409 410
410 } // namespace content 411 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698