Propagate pageScaleFactor to GuestViews

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 ace7f67609514df4088e3a3c6cfba25ee5253a8a..22c3757c89feeaad43b209c3498ab6897763a995 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -1299,6 +1299,7 @@ bool RenderViewImpl::OnMessageReceived(const IPC::Message& message) {
     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,
@@ -2465,6 +2466,13 @@ void RenderViewImpl::OnFindMatchRects(int current_version) {
 }
 #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;
@@ -3376,6 +3384,13 @@ void RenderViewImpl::zoomLevelChanged() {
 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;