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

content/renderer/render_frame_impl.cc

 // Copyright 2013 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/renderer/render_frame_impl.h"
 
 #include <map>
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 1425 matching lines @@
     IPC_MESSAGE_HANDLER(FrameMsg_PostMessageEvent, OnPostMessageEvent)
     IPC_MESSAGE_HANDLER(FrameMsg_FailedNavigation, OnFailedNavigation)
     IPC_MESSAGE_HANDLER(FrameMsg_GetSavableResourceLinks,
                         OnGetSavableResourceLinks)
     IPC_MESSAGE_HANDLER(FrameMsg_GetSerializedHtmlWithLocalLinks,
                         OnGetSerializedHtmlWithLocalLinks)
     IPC_MESSAGE_HANDLER(FrameMsg_SerializeAsMHTML, OnSerializeAsMHTML)
     IPC_MESSAGE_HANDLER(FrameMsg_Find, OnFind)
     IPC_MESSAGE_HANDLER(FrameMsg_StopFinding, OnStopFinding)
     IPC_MESSAGE_HANDLER(FrameMsg_EnableViewSourceMode, OnEnableViewSourceMode)
+    IPC_MESSAGE_HANDLER(FrameMsg_SetTemporaryZoomLevel, OnSetTemporaryZoomLevel)
+    IPC_MESSAGE_HANDLER(FrameMsg_SetPageZoomLevel, OnSetPageZoomLevel)
 #if defined(OS_ANDROID)
     IPC_MESSAGE_HANDLER(InputMsg_ActivateNearestFindResult,
                         OnActivateNearestFindResult)
     IPC_MESSAGE_HANDLER(FrameMsg_FindMatchRects, OnFindMatchRects)
     IPC_MESSAGE_HANDLER(FrameMsg_SelectPopupMenuItems, OnSelectPopupMenuItems)
 #elif defined(OS_MACOSX)
     IPC_MESSAGE_HANDLER(FrameMsg_SelectPopupMenuItem, OnSelectPopupMenuItem)
     IPC_MESSAGE_HANDLER(InputMsg_CopyToFindPboard, OnCopyToFindPboard)
 #endif
   IPC_END_MESSAGE_MAP()
@@ skipping 3660 matching lines @@
     }
   }
 }
 
 void RenderFrameImpl::OnEnableViewSourceMode() {
   DCHECK(frame_);
   DCHECK(!frame_->parent());
   frame_->enableViewSourceMode(true);
 }
 
+void RenderFrameImpl::OnSetTemporaryZoomLevel(double zoom_level,
+                                              bool is_temporary) {
+  // Store the temporary status on render_view_ so it is immediately available
+  // to all frames using the same render_view_.
+  render_view_->set_uses_temporary_zoom_level(is_temporary);
+
+  WebView* webview = render_view_->GetWebView();
+  webview->hidePopups();
+  webview->setZoomLevelForFrame(frame_, zoom_level);
+}
+
+void RenderFrameImpl::OnSetPageZoomLevel(double zoom_level) {
+  WebView* webview = render_view_->GetWebView();
+
+  if (render_view_->uses_temporary_zoom_level())
+    return;
+
+  // We don't apply if our RenderView is hosting a full-page plugin, since the
+  // plugin doesn't use the same zoom settings.
+  if (webview->mainFrame()->isWebLocalFrame() &&
+      webview->mainFrame()->document().isPluginDocument()) {
+    return;
+  }
+
+  // Force sending notification to observers.
+  render_view_->SetZoomLevel(zoom_level);
+
+  webview->hidePopups();
+  webview->setZoomLevelForFrame(frame_, zoom_level);
+}
+
 #if defined(OS_ANDROID)
 void RenderFrameImpl::OnActivateNearestFindResult(int request_id,
                                                   float x,
                                                   float y) {
   WebRect selection_rect;
   int ordinal =
       frame_->selectNearestFindMatch(WebFloatPoint(x, y), &selection_rect);
   if (ordinal == -1) {
     // Something went wrong, so send a no-op reply (force the frame to report
     // the current match count) in case the host is waiting for a response due
@@ skipping 896 matching lines @@
                                     int match_count,
                                     int ordinal,
                                     const WebRect& selection_rect,
                                     bool final_status_update) {
   Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count,
                                    selection_rect, ordinal,
                                    final_status_update));
 }
 
 }  // namespace content