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

content/renderer/render_thread_impl.cc

Index: content/renderer/render_thread_impl.cc
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
index d3ee4b8dce527ffa822c17609e5400d8b4f9489a..58cdfe476e8baf0119531eb401b99f174cc49dd4 100644
--- a/content/renderer/render_thread_impl.cc
+++ b/content/renderer/render_thread_impl.cc
@@ -266,51 +266,6 @@ class WebThreadForCompositor : public WebThreadImplForWorkerScheduler {
   DISALLOW_COPY_AND_ASSIGN(WebThreadForCompositor);
 };
 
-class RenderViewZoomer : public RenderViewVisitor {
- public:
-  RenderViewZoomer(const std::string& scheme,
-                   const std::string& host,
-                   double zoom_level) : scheme_(scheme),
-                                        host_(host),
-                                        zoom_level_(zoom_level) {
-  }
-
-  bool Visit(RenderView* render_view) override {
-    WebView* webview = render_view->GetWebView();
-    RenderViewImpl* render_view_impl =
-        static_cast<RenderViewImpl*>(render_view);
-    // Remote frames don't host documents.
-    // TODO(wjmaclean) Although it seems likely that a frame without a
-    // document can safely early-out here, we should confirm this is truly
-    // the case. https://crbug.com/477007
-    if (webview->mainFrame()->isWebRemoteFrame())
-      return true;
-
-    WebDocument document = webview->mainFrame()->document();
-
-    // Don't set zoom level for full-page plugin since they don't use the same
-    // zoom settings.
-    if (document.isPluginDocument())
-      return true;
-    GURL url(document.url());
-    // Empty scheme works as wildcard that matches any scheme,
-    if ((net::GetHostOrSpecFromURL(url) == host_) &&
-        (scheme_.empty() || scheme_ == url.scheme()) &&
-        !render_view_impl->uses_temporary_zoom_level()) {
-      webview->hidePopups();
-      render_view_impl->SetZoomLevel(zoom_level_);
-    }
-    return true;
-  }
-
- private:
-  const std::string scheme_;
-  const std::string host_;
-  const double zoom_level_;
-
-  DISALLOW_COPY_AND_ASSIGN(RenderViewZoomer);
-};
-
 void* CreateHistogram(
     const char *name, int min, int max, size_t buckets) {
   if (min <= 0)
@@ -1775,8 +1730,6 @@ bool RenderThreadImpl::OnControlMessageReceived(const IPC::Message& msg) {
   IPC_BEGIN_MESSAGE_MAP(RenderThreadImpl, msg)
     IPC_MESSAGE_HANDLER(FrameMsg_NewFrame, OnCreateNewFrame)
     IPC_MESSAGE_HANDLER(FrameMsg_NewFrameProxy, OnCreateNewFrameProxy)
-    IPC_MESSAGE_HANDLER(ViewMsg_SetZoomLevelForCurrentURL,
-                        OnSetZoomLevelForCurrentURL)
     // TODO(port): removed from render_messages_internal.h;
     // is there a new non-windows message I should add here?
     IPC_MESSAGE_HANDLER(ViewMsg_New, OnCreateNewView)
@@ -1838,13 +1791,6 @@ void RenderThreadImpl::OnCreateNewFrameProxy(
                                      replicated_state);
 }
 
-void RenderThreadImpl::OnSetZoomLevelForCurrentURL(const std::string& scheme,
-                                                   const std::string& host,
-                                                   double zoom_level) {
-  RenderViewZoomer zoomer(scheme, host, zoom_level);
-  RenderView::ForEach(&zoomer);
-}
-
 void RenderThreadImpl::OnCreateNewView(const ViewMsg_New_Params& params) {
   CompositorDependencies* compositor_deps = this;
   // When bringing in render_view, also bring in webkit's glue and jsbindings.