Propagate pageScaleFactor to GuestViews

content/renderer/render_view_impl.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/renderer/render_view_impl.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/auto_reset.h"
@@ skipping 1281 matching lines @@
     IPC_MESSAGE_HANDLER(InputMsg_ExecuteEditCommand, OnExecuteEditCommand)
     IPC_MESSAGE_HANDLER(InputMsg_MoveCaret, OnMoveCaret)
     IPC_MESSAGE_HANDLER(InputMsg_ScrollFocusedEditableNodeIntoRect,
                         OnScrollFocusedEditableNodeIntoRect)
     IPC_MESSAGE_HANDLER(InputMsg_SetEditCommandsForNextKeyEvent,
                         OnSetEditCommandsForNextKeyEvent)
     IPC_MESSAGE_HANDLER(ViewMsg_CopyImageAt, OnCopyImageAt)
     IPC_MESSAGE_HANDLER(ViewMsg_SaveImageAt, OnSaveImageAt)
     IPC_MESSAGE_HANDLER(ViewMsg_Find, OnFind)
     IPC_MESSAGE_HANDLER(ViewMsg_StopFinding, OnStopFinding)
+    IPC_MESSAGE_HANDLER(ViewMsg_SetPageScale, OnSetPageScale)
     IPC_MESSAGE_HANDLER(ViewMsg_ResetPageScale, OnResetPageScale)

[wjmaclean, 2015/10/19 15:43:28]

Ditto, perhaps we can remove this.

[Kevin McNee - google account, 2015/10/20 15:13:43]

Done.

     IPC_MESSAGE_HANDLER(ViewMsg_Zoom, OnZoom)
     IPC_MESSAGE_HANDLER(ViewMsg_SetZoomLevelForLoadingURL,
                         OnSetZoomLevelForLoadingURL)
     IPC_MESSAGE_HANDLER(ViewMsg_SetZoomLevelForView,
                         OnSetZoomLevelForView)
     IPC_MESSAGE_HANDLER(ViewMsg_SetPageEncoding, OnSetPageEncoding)
     IPC_MESSAGE_HANDLER(ViewMsg_ResetPageEncodingToDefault,
                         OnResetPageEncodingToDefault)
     IPC_MESSAGE_HANDLER(DragMsg_TargetDragEnter, OnDragTargetDragEnter)
     IPC_MESSAGE_HANDLER(DragMsg_TargetDragOver, OnDragTargetDragOver)
@@ skipping 1145 matching lines @@
   }
 
   gfx::RectF active_rect = main_frame->activeFindMatchRect();
   Send(new ViewHostMsg_FindMatchRects_Reply(routing_id_,
                                                rects_version,
                                                match_rects,
                                                active_rect));
 }
 #endif
 
+void RenderViewImpl::OnSetPageScale(float page_scale_factor) {
+  // TODO(mcnee): RenderViewImpl deprecated, move to RenderFrameImpl?
+  if (!webview())
+    return;
+  webview()->setPageScaleFactor(page_scale_factor);
+}
+
 void RenderViewImpl::OnResetPageScale() {

[wjmaclean, 2015/10/19 15:43:28]

This can probably go away too ...

[Kevin McNee - google account, 2015/10/20 15:13:43]

Done.

   if (!webview())
     return;
   webview()->setPageScaleFactor(1);
 }
 
 void RenderViewImpl::OnZoom(PageZoom zoom) {
   if (!webview())  // Not sure if this can happen, but no harm in being safe.
     return;
 
   webview()->hidePopups();
@@ skipping 890 matching lines @@
     // saved values if necessary
     Send(new ViewHostMsg_DidZoomURL(
         routing_id_, zoom_level,
         GURL(webview()->mainFrame()->document().url())));
   }
 }
 
 void RenderViewImpl::pageScaleFactorChanged() {
   if (!webview())
     return;
+
+  // TODO(mcnee): RenderViewImpl deprecated, move to RenderFrameImpl?
+  Send(new ViewHostMsg_PageScaleFactorChanged(routing_id_,

[wjmaclean, 2015/10/19 15:43:29]

Yeah, but for now this is here, so I guess we modify it here.

[Kevin McNee - google account, 2015/10/20 15:13:43]

Acknowledged.

+                                              webview()->pageScaleFactor()));
+
+  // TODO(mcnee): now that we send all changes, should we get rid of this msg
+  // and have the browser handle this logic?

[wjmaclean, 2015/10/19 15:43:28]

Yes, remove the extra message.

[Kevin McNee - google account, 2015/10/20 15:13:43]

Done.

   bool page_scale_factor_is_one = webview()->pageScaleFactor() == 1;
   if (page_scale_factor_is_one == page_scale_factor_is_one_)
     return;
   page_scale_factor_is_one_ = page_scale_factor_is_one;
   Send(new ViewHostMsg_PageScaleFactorIsOneChanged(routing_id_,
                                                    page_scale_factor_is_one_));
 }
 
 double RenderViewImpl::zoomLevelToZoomFactor(double zoom_level) const {
   return ZoomLevelToZoomFactor(zoom_level);
@@ skipping 301 matching lines @@
     std::vector<gfx::Size> sizes;
     ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes);
     if (!url.isEmpty())
       urls.push_back(
           FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes));
   }
   SendUpdateFaviconURL(urls);
 }
 
 }  // namespace content