Remove ViewMsg_SetZoomLevel

content/renderer/render_view_impl.cc

Index: content/renderer/render_view_impl.cc
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 31627982081c0611192b691eef5bb38477d8eb29..c8cc055f075b6527166ee52d30a9c881ac739d02 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -940,6 +940,13 @@ RenderViewImpl* RenderViewImpl::Create(
     render_view = new RenderViewImpl(&params);
 
   render_view->Initialize(&params);
+  // For now, don't remember plugin zoom values.  We don't want to mix them with
+  // normal web content (i.e. a fixed layout plugin would usually want them
+  // different).
+  bool uses_temporary_zoom_level =
+      render_view->webview()->mainFrame()->document().isPluginDocument();
+  render_view->Send(new ViewHostMsg_DidCreateDocument(

[fsamuel, 2014/05/29 20:28:57]

Given you pass this information about plugin documents in render_frame_impl, do
you need this?

[wjmaclean, 2014/05/29 20:52:29]

We can try without ... PDFs don't seem to need it.

+      render_view->GetRoutingID(), uses_temporary_zoom_level));
   return render_view;
 }
 
@@ -1072,7 +1079,6 @@ bool RenderViewImpl::OnMessageReceived(const IPC::Message& message) {
     IPC_MESSAGE_HANDLER(ViewMsg_Find, OnFind)
     IPC_MESSAGE_HANDLER(ViewMsg_StopFinding, OnStopFinding)
     IPC_MESSAGE_HANDLER(ViewMsg_Zoom, OnZoom)
-    IPC_MESSAGE_HANDLER(ViewMsg_SetZoomLevel, OnSetZoomLevel)
     IPC_MESSAGE_HANDLER(ViewMsg_SetZoomLevelForLoadingURL,
                         OnSetZoomLevelForLoadingURL)
     IPC_MESSAGE_HANDLER(ViewMsg_SetPageEncoding, OnSetPageEncoding)
@@ -2652,12 +2658,6 @@ void RenderViewImpl::OnZoom(PageZoom zoom) {
   zoomLevelChanged();
 }
 
-void RenderViewImpl::OnSetZoomLevel(double zoom_level) {
-  webview()->hidePopups();
-  webview()->setZoomLevel(zoom_level);
-  zoomLevelChanged();
-}
-
 void RenderViewImpl::OnSetZoomLevelForLoadingURL(const GURL& url,
                                                  double zoom_level) {
 #if !defined(OS_ANDROID)
@@ -3657,22 +3657,16 @@ blink::WebSpeechRecognizer* RenderViewImpl::speechRecognizer() {
 
 void RenderViewImpl::zoomLimitsChanged(double minimum_level,
                                        double maximum_level) {
-  // For now, don't remember plugin zoom values.  We don't want to mix them with
-  // normal web content (i.e. a fixed layout plugin would usually want them
-  // different).
-  bool remember = !webview()->mainFrame()->document().isPluginDocument();
-
   int minimum_percent = static_cast<int>(
       ZoomLevelToZoomFactor(minimum_level) * 100);
   int maximum_percent = static_cast<int>(
       ZoomLevelToZoomFactor(maximum_level) * 100);
 
   Send(new ViewHostMsg_UpdateZoomLimits(
-      routing_id_, minimum_percent, maximum_percent, remember));
+      routing_id_, minimum_percent, maximum_percent));
 }
 
 void RenderViewImpl::zoomLevelChanged() {
-  bool remember = !webview()->mainFrame()->document().isPluginDocument();
   double zoom_level = webview()->zoomLevel();
 
   FOR_EACH_OBSERVER(RenderViewObserver, observers_, ZoomLevelChanged());
@@ -3683,7 +3677,7 @@ void RenderViewImpl::zoomLevelChanged() {
     // Tell the browser which url got zoomed so it can update the menu and the
     // saved values if necessary
     Send(new ViewHostMsg_DidZoomURL(
-        routing_id_, zoom_level, remember,
+        routing_id_, zoom_level,
         GURL(webview()->mainFrame()->document().url())));
   }
 }