Check temporary zoom status when sending zoom level in navigation.

content/browser/loader/async_resource_handler.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/loader/async_resource_handler.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/command_line.h"
@@ skipping 179 matching lines @@
     rdh_->delegate()->OnResponseStarted(
         request(), info->GetContext(), response, info->filter());
   }
 
   DevToolsNetLogObserver::PopulateResponseInfo(request(), response);
 
   const HostZoomMap* host_zoom_map = info->filter()->GetHostZoomMap();
 
   if (info->GetResourceType() == RESOURCE_TYPE_MAIN_FRAME && host_zoom_map) {
     const GURL& request_url = request()->url();
+    // TODO(wjmaclean): It would be nice if the AsyncResourceHandler didn't
+    // need to worry about whether a zoom level is temporary or not. Presumably
+    // this logic could move into HostZoomMap, in a function that is given

[Charlie Reis, 2015/02/11 18:34:31]

+1 to moving this into a HostZoomMapImpl function.  As it stands, we're making
calls into two separate AutoLock functions, which means we're releasing the lock
and having to reacquire it (on every OnResponseStarted).  That seems
unnecessary.

[wjmaclean, 2015/02/11 20:29:34]

Certainly. I wasn't sure about how much willingness there would be to add
interfaces for this one case, but that's a better solution.

Done.

+    // all the necessary inputs. An alternative would be if we could pass the
+    // WebContents* for the navigating page from here, though that may change

[Charlie Reis, 2015/02/11 18:34:31]

We can't pass a WebContents here, since this is on the IO thread.

[wjmaclean, 2015/02/11 20:29:34]

Hadn't thought of that, so thanks for pointing it out. This comment is going
away in any case, so no worries (or web_contentses either ...).

+    // the behaviour (e.g. navigations to a new origin will be handled
+    // properly too in that case).
+    int render_process_id = info->GetChildID();
+    int render_view_id = info->GetRouteID();
+    double zoom_level;

[Charlie Reis, 2015/02/11 18:34:31]

nit: Initialize this.

[wjmaclean, 2015/02/11 20:29:34]

Done.

+    if (host_zoom_map->UsesTemporaryZoomLevel(render_process_id,
+                                              render_view_id)) {
+      zoom_level = host_zoom_map->GetTemporaryZoomLevel(render_process_id,

[Charlie Reis, 2015/02/11 18:34:31]

Can we cast this to HostZoomMapImpl so that we don't expose this (or the
alternative method discussed above) in the public API?

[wjmaclean, 2015/02/11 20:29:34]

Done.

+                                                        render_view_id);
+    } else {
+      zoom_level = host_zoom_map->GetZoomLevelForHostAndScheme(
+          request_url.scheme(), net::GetHostOrSpecFromURL(request_url));
+    }
     info->filter()->Send(new ViewMsg_SetZoomLevelForLoadingURL(
-        info->GetRouteID(),
-        request_url, host_zoom_map->GetZoomLevelForHostAndScheme(
-            request_url.scheme(),
-            net::GetHostOrSpecFromURL(request_url))));
+        info->GetRouteID(), request_url, zoom_level));
   }
 
   // If the parent handler downloaded the resource to a file, grant the child
   // read permissions on it.
   if (!response->head.download_file_path.empty()) {
     rdh_->RegisterDownloadedTempFile(
         info->GetChildID(), info->GetRequestID(),
         response->head.download_file_path);
   }
 
@@ skipping 185 matching lines @@
     request()->LogUnblocked();
     controller()->Resume();
   }
 }
 
 void AsyncResourceHandler::OnDefer() {
   request()->LogBlockedBy("AsyncResourceHandler");
 }
 
 }  // namespace content