Fix page zoom to be frame-centric for out-of-process frames.

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/bind.h"
 #include "base/command_line.h"
 #include "base/containers/hash_tables.h"
 #include "base/debug/alias.h"
 #include "base/feature_list.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/shared_memory.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/time/time.h"
@@ skipping 287 matching lines @@
   response->head.request_start = request()->creation_time();
   response->head.response_start = TimeTicks::Now();
   // TODO(davidben): Is it necessary to pass the new first party URL for
   // cookies? The only case where it can change is top-level navigation requests
   // and hopefully those will eventually all be owned by the browser. It's
   // possible this is still needed while renderer-owned ones exist.
   return info->filter()->Send(new ResourceMsg_ReceivedRedirect(
       GetRequestID(), redirect_info, response->head));
 }
 
+namespace {
+
+// Defined here to be close to OnResponseStarted(), which is the only caller.
+void SetZoomLevelForViewFromWebContents(
+    ResourceRequestInfo::WebContentsGetter request_web_contents_getter,
+    base::WeakPtr<ResourceMessageFilter> filter,
+    int render_view_id,
+    const GURL request_url) {
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
+
+  WebContents* web_contents = request_web_contents_getter.Run();
+  if (!web_contents)
+    return;
+
+  double zoom_level = HostZoomMap::GetZoomLevel(web_contents);
+
+  if (filter) {
+    filter->Send(new ViewMsg_SetZoomLevelForLoadingURL(
+        render_view_id, request_url, zoom_level));
+  }
+}
+
+}  // namespace anonymous
+
 bool AsyncResourceHandler::OnResponseStarted(ResourceResponse* response,
                                              bool* defer) {
   // For changes to the main frame, inform the renderer of the new URL's
   // per-host settings before the request actually commits.  This way the
   // renderer will be able to set these precisely at the time the
   // request commits, avoiding the possibility of e.g. zooming the old content
   // or of having to layout the new content twice.
 
   response_started_ticks_ = base::TimeTicks::Now();
 
@@ skipping 23 matching lines @@
   if (info->GetResourceType() == RESOURCE_TYPE_MAIN_FRAME && host_zoom_map) {
     const GURL& request_url = request()->url();
     int render_process_id = info->GetChildID();
     int render_view_id = info->GetRouteID();
 
     double zoom_level = host_zoom_map->GetZoomLevelForView(
         request_url, render_process_id, render_view_id);
 
     info->filter()->Send(new ViewMsg_SetZoomLevelForLoadingURL(
         render_view_id, request_url, zoom_level));
+  } else if (info->GetResourceType() == RESOURCE_TYPE_SUB_FRAME &&
+             host_zoom_map) {
+    // Sub-frames should use the zoom level of their web-contents, regardless of
+    // their URL. We must access the WebContents on the UI thread.
+    BrowserThread::PostTask(
+        BrowserThread::UI, FROM_HERE,
+        base::Bind(
+            &SetZoomLevelForViewFromWebContents,
+            info->GetWebContentsGetterForRequest(),
+            info->filter()->GetWeakPtr(),
+            info->GetRouteID(),
+            request()->url()));
   }
 
   // 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 231 matching lines @@
   } else {
     UMA_HISTOGRAM_CUSTOM_COUNTS(
         "Net.ResourceLoader.ResponseStartToEnd.Over_512kB",
         elapsed_time, 1, 100000, 100);
   }
 
   inlining_helper_->RecordHistogram(elapsed_time);
 }
 
 }  // namespace content