content/browser/web_contents/web_contents_impl.cc - Issue 11866004: Add scheme to HostZoomMap

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/web_contents/web_contents_impl.cc

Issue 11866004: Add scheme to HostZoomMap (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Fix alignment, add comment Created 7 years, 10 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:

Index: content/browser/web_contents/web_contents_impl.cc

diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc

index fa0eccf3836666c1e4b60eb9dec3fd07c41f6f8d..b1811639bf8238752e70fff633c00a5d8ec52fba 100644

--- a/content/browser/web_contents/web_contents_impl.cc

+++ b/content/browser/web_contents/web_contents_impl.cc

@@ -1935,7 +1935,8 @@ double WebContentsImpl::GetZoomLevel() const {

// Since zoom map is updated using rewritten URL, use rewritten URL

// to get the zoom level.

url = active_entry ? active_entry->GetURL() : GURL::EmptyGURL();

- zoom_level = zoom_map->GetZoomLevel(net::GetHostOrSpecFromURL(url));

+ zoom_level = zoom_map->GetZoomLevelForHostAndScheme(url.scheme(),

+ net::GetHostOrSpecFromURL(url));

}

return zoom_level;

}