| 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 dcc61ce738b1175e86d50048a733277364b3894e..71b647c491a08fcdcce9d0cbd81c5b79465aacb0 100644
|
| --- a/content/browser/renderer_host/render_view_host_impl.cc
|
| +++ b/content/browser/renderer_host/render_view_host_impl.cc
|
| @@ -1741,17 +1741,20 @@ void RenderViewHostImpl::OnAccessibilityLocationChanges(
|
| }
|
| }
|
|
|
| -void RenderViewHostImpl::OnDidZoomURL(double zoom_level,
|
| +void RenderViewHostImpl::OnDidZoomURL(int zoom_id,
|
| + double zoom_level,
|
| bool remember,
|
| const GURL& url) {
|
| HostZoomMapImpl* host_zoom_map = static_cast<HostZoomMapImpl*>(
|
| HostZoomMap::GetForBrowserContext(GetProcess()->GetBrowserContext()));
|
| if (remember) {
|
| host_zoom_map->
|
| - SetZoomLevelForHost(net::GetHostOrSpecFromURL(url), zoom_level);
|
| + SetZoomLevelForHost(net::GetHostOrSpecFromURL(url), zoom_id,
|
| + zoom_level);
|
| } else {
|
| host_zoom_map->SetTemporaryZoomLevel(
|
| - GetProcess()->GetID(), GetRoutingID(), zoom_level);
|
| + GetProcess()->GetID(), GetRoutingID(), net::GetHostOrSpecFromURL(url),
|
| + zoom_id, zoom_level);
|
| }
|
| }
|
|
|
|
|