Make PageScaleFactor work for oopif subframes.

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 <memory>
 
@@ skipping 1223 matching lines @@
     IPC_MESSAGE_HANDLER(ViewMsg_ReleaseDisambiguationPopupBitmap,
                         OnReleaseDisambiguationPopupBitmap)
     IPC_MESSAGE_HANDLER(ViewMsg_ForceRedraw, OnForceRedraw)
     IPC_MESSAGE_HANDLER(ViewMsg_SelectWordAroundCaret, OnSelectWordAroundCaret)
 
     // Page messages.
     IPC_MESSAGE_HANDLER(PageMsg_UpdateWindowScreenRect,
                         OnUpdateWindowScreenRect)
     IPC_MESSAGE_HANDLER(PageMsg_SetZoomLevel, OnSetZoomLevel)
     IPC_MESSAGE_HANDLER(PageMsg_SetDeviceScaleFactor, OnSetDeviceScaleFactor);
+  IPC_MESSAGE_HANDLER(PageMsg_SetPageScaleFactor,
+                      OnSetPageScaleFactorForSubframes);
     IPC_MESSAGE_HANDLER(PageMsg_WasHidden, OnPageWasHidden)
     IPC_MESSAGE_HANDLER(PageMsg_WasShown, OnPageWasShown)
     IPC_MESSAGE_HANDLER(PageMsg_SetHistoryOffsetAndLength,
                         OnSetHistoryOffsetAndLength)
     IPC_MESSAGE_HANDLER(PageMsg_AudioStateChanged, OnAudioStateChanged)
 
 #if defined(OS_ANDROID)
     IPC_MESSAGE_HANDLER(ViewMsg_UpdateBrowserControlsState,
                         OnUpdateBrowserControlsState)
     IPC_MESSAGE_HANDLER(ViewMsg_ExtractSmartClipData, OnExtractSmartClipData)
@@ skipping 1115 matching lines @@
   GetWidget()->FocusChangeComplete();
 }
 
 void RenderViewImpl::OnDeviceScaleFactorChanged() {
   RenderWidget::OnDeviceScaleFactorChanged();
   UpdateWebViewWithDeviceScaleFactor();
   if (auto_resize_mode_)
     AutoResizeCompositor();
 }
 
+void RenderViewImpl::OnSetPageScaleFactorForSubframes(double page_scale) {
+  if (webview() && webview()->mainFrame() &&
+      !webview()->mainFrame()->isWebLocalFrame()) {

[kenrb, 2017/01/24 17:13:27]

It's cleaner to test the inverted conditions, and return early if they aren't
met.

[wjmaclean, 2017/01/24 18:24:26]

Done.

+    // TODO(wjmaclean): Find a better way to identify the local roots in the
+    // frame tree. Still, this is likely better than sending a separate IPC for
+    // every frame in a renderer.

[kenrb, 2017/01/24 17:13:27]

That is technically true, but an alternative is to send a message individually
just to local frame roots. WebContentsImpl::GetRenderWidgetHostViewsInTree()
facilitates doing that. That is likely a better approach since there is no state
getting attached to a page-level object in the renderer.

[wjmaclean, 2017/01/24 18:24:26]

Ok, I didn't know about that ... I'll look into that. Would this handler move to
RenderWidget in that case? I'm guessing 'yes' ...

[kenrb, 2017/01/24 18:47:30]

Yes. Hypothetically it could go on RenderFrameImpl but RenderWidget makes more
sense.

+    for (WebFrame* frame = webview()->mainFrame(); frame;
+         frame = frame->traverseNext()) {
+      if (frame->isWebLocalFrame() && !frame->parent()->isWebLocalFrame()) {
+        RenderFrameImpl* rfi = RenderFrameImpl::FromWebFrame(frame);
+        RenderWidgetCompositor* widget_compositor =
+            rfi->GetRenderWidget()->compositor();
+        widget_compositor->SetPageScaleFactorForSubframe(page_scale);
+      }
+    }
+  }
+}
+
 void RenderViewImpl::SetScreenMetricsEmulationParameters(
     bool enabled,
     const blink::WebDeviceEmulationParams& params) {
   if (webview() && compositor()) {
     if (enabled)
       webview()->enableDeviceEmulation(params);
     else
       webview()->disableDeviceEmulation();
   }
 }
@@ skipping 338 matching lines @@
                             INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
   }
 
   std::unique_ptr<InputEventAck> ack(
       new InputEventAck(InputEventAckSource::MAIN_THREAD, input_event->type(),
                         INPUT_EVENT_ACK_STATE_NOT_CONSUMED));
   OnInputEventAck(std::move(ack));
 }
 
 }  // namespace content