Fix issue with Virtual vs. real URLs.

content/browser/host_zoom_map_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/host_zoom_map_impl.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/strings/string_piece.h"
@@ skipping 203 matching lines @@
 }
 
 double HostZoomMapImpl::GetZoomLevelForWebContents(
     const WebContentsImpl& web_contents_impl) const {
   int render_process_id = web_contents_impl.GetRenderProcessHost()->GetID();
   int routing_id = web_contents_impl.GetRenderViewHost()->GetRoutingID();
 
   if (UsesTemporaryZoomLevel(render_process_id, routing_id))
     return GetTemporaryZoomLevel(render_process_id, routing_id);
 
-  // Since zoom map is updated using the url as stored in the navigation
-  // controller, we use that URL to get the zoom level.
+  // Get the url from the navigation controller directly, as calling
+  // WebContentsImpl::GetLastCommittedURL() may give us a virtual url that
+  // is different than is stored in the map.
   GURL url;
   NavigationEntry* entry =
       web_contents_impl.GetController().GetLastCommittedEntry();
+  // It is possible for a WebContent's zoom level to be queried before
+  // a navigation has occurred.
   if (entry)
     url =  entry->GetURL();

[Peter Kasting, 2014/06/04 20:03:40]

Nit: You still have an extra space both here and in the next function.

   return GetZoomLevelForHostAndScheme(url.scheme(),
                                       net::GetHostOrSpecFromURL(url));
 }
 
 void HostZoomMapImpl::SetZoomLevelForWebContents(
     const WebContentsImpl& web_contents_impl,
     double level) {
   int render_process_id = web_contents_impl.GetRenderProcessHost()->GetID();
   int render_view_id = web_contents_impl.GetRenderViewHost()->GetRoutingID();
   if (UsesTemporaryZoomLevel(render_process_id, render_view_id)) {
-
     SetTemporaryZoomLevel(render_process_id, render_view_id, level);
   } else {
-    SetZoomLevelForHost(
-        net::GetHostOrSpecFromURL(web_contents_impl.GetLastCommittedURL()),
-        level);
+    // Get the url from the navigation controller directly, as calling
+    // WebContentsImpl::GetLastCommittedURL() may give us a virtual url that
+    // is different than what the render view is using. If the two don't match,
+    // the attempt to set the zoom will fail.
+    GURL url;
+    NavigationEntry* entry =
+        web_contents_impl.GetController().GetLastCommittedEntry();
+    DCHECK(entry);
+    url =  entry->GetURL();
+    SetZoomLevelForHost(net::GetHostOrSpecFromURL(url), level);
   }
 }
 
 void HostZoomMapImpl::SetZoomLevelForView(int render_process_id,
                                           int render_view_id,
                                           double level,
                                           const std::string& host) {
   if (UsesTemporaryZoomLevel(render_process_id, render_view_id))
     SetTemporaryZoomLevel(render_process_id, render_view_id, level);
   else
@@ skipping 118 matching lines @@
       zoom_level(0.0) {
 }
 
 bool HostZoomMapImpl::TemporaryZoomLevel::operator==(
     const TemporaryZoomLevel& other) const {
   return other.render_process_id == render_process_id &&
          other.render_view_id == render_view_id;
 }
 
 }  // namespace content