content/browser/renderer_host/render_view_host_impl.cc - Issue 393133002: Migrate HostZoomMap to live in StoragePartition.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/renderer_host/render_view_host_impl.cc

Issue 393133002: Migrate HostZoomMap to live in StoragePartition. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Address comments; patch for landing. 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:

Index: content/browser/renderer_host/render_view_host_impl.cc

diff --git a/content/browser/renderer_host/render_view_host_impl.cc b/content/browser/renderer_host/render_view_host_impl.cc

index 8bafdab90c90cc650130cc2983c044e9151b604d..e704fb6821c65a286f4c9ca91edb6e04e15e6420 100644

--- a/content/browser/renderer_host/render_view_host_impl.cc

+++ b/content/browser/renderer_host/render_view_host_impl.cc

@@ -1104,8 +1104,7 @@ void RenderViewHostImpl::OnDocumentAvailableInMainFrame(

return;

HostZoomMapImpl* host_zoom_map =

- static_cast<HostZoomMapImpl*>(HostZoomMap::GetDefaultForBrowserContext(

- GetProcess()->GetBrowserContext()));

+ static_cast<HostZoomMapImpl*>(HostZoomMap::Get(GetSiteInstance()));

host_zoom_map->SetTemporaryZoomLevel(GetProcess()->GetID(),

GetRoutingID(),

host_zoom_map->GetDefaultZoomLevel());

@@ -1420,8 +1419,7 @@ void RenderViewHostImpl::NotifyMoveOrResizeStarted() {

void RenderViewHostImpl::OnDidZoomURL(double zoom_level,

const GURL& url) {

HostZoomMapImpl* host_zoom_map =

- static_cast<HostZoomMapImpl*>(HostZoomMap::GetDefaultForBrowserContext(

- GetProcess()->GetBrowserContext()));

+ static_cast<HostZoomMapImpl*>(HostZoomMap::Get(GetSiteInstance()));

host_zoom_map->SetZoomLevelForView(GetProcess()->GetID(),

GetRoutingID(),