Make PageScaleFactor work for oopif subframes.

content/browser/renderer_host/render_widget_host_input_event_router.cc

 // Copyright 2015 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/browser/renderer_host/render_widget_host_input_event_router.h"
 
 #include <vector>
 
 #include "base/metrics/histogram_macros.h"
 
@@ skipping 17 matching lines @@
      event->touches[i].position.y += delta.y();
   }
 }
 
 blink::WebGestureEvent DummyGestureScrollUpdate(double timeStampSeconds) {
   return blink::WebGestureEvent(blink::WebInputEvent::GestureScrollUpdate,
                                 blink::WebInputEvent::NoModifiers,
                                 timeStampSeconds);
 }
 
+bool IsGesturePinchEvent(const blink::WebGestureEvent* event) {
+  return event->type() == blink::WebInputEvent::GesturePinchBegin ||
+         event->type() == blink::WebInputEvent::GesturePinchUpdate ||
+         event->type() == blink::WebInputEvent::GesturePinchEnd;
+}
+
 }  // anonymous namespace
 
 namespace content {
 
 void RenderWidgetHostInputEventRouter::OnRenderWidgetHostViewBaseDestroyed(
     RenderWidgetHostViewBase* view) {
   view->RemoveObserver(this);
 
   // Remove this view from the owner_map.
   for (auto entry : owner_map_) {
@@ skipping 634 matching lines @@
     // should have been one.
     if (root_view != touchscreen_gesture_target_.target &&
         !rwhi->is_in_touchscreen_gesture_scroll()) {
       gesture_pinch_did_send_scroll_begin_ = true;
       SendGestureScrollBegin(root_view, *event);
     }
   }
 
   if (in_touchscreen_gesture_pinch_) {
     root_view->ProcessGestureEvent(*event, latency);
+    if (IsGesturePinchEvent(event)) {
+      // Broadcast the pinch events to all subframes so they can update their
+      // PageScales with the deltas in the events. We don't broadcast to
+      // RenderWidgetHostViewGuest as it has a separate mechanism for
+      // propagating page scaleg

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

nit: Typo.

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

Done.

+      for (auto entry : owner_map_) {
+        if (entry.second != root_view &&
+            !entry.second->IsRenderWidgetHostViewGuest()) {
+          entry.second->ProcessGestureEvent(*event, latency);

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

Will this eventually get removed? It feels weird to be dispatching these events
to every process, but it would be fine if this won't be necessary after
Salamander ships.

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

Yes, this will disappear with Salamander.

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

This warrants a TODO, marking it as temporary, then.

+        }
+      }
+    }
     if (event->type() == blink::WebInputEvent::GesturePinchEnd) {
       in_touchscreen_gesture_pinch_ = false;
       // If the root view wasn't already receiving the gesture stream, then we
       // need to wrap the diverted pinch events in a GestureScrollBegin/End.
       auto rwhi =
           static_cast<RenderWidgetHostImpl*>(root_view->GetRenderWidgetHost());
       if (root_view != touchscreen_gesture_target_.target &&
           gesture_pinch_did_send_scroll_begin_ &&
           rwhi->is_in_touchscreen_gesture_scroll()) {
         SendGestureScrollEnd(root_view, *event);
@@ skipping 77 matching lines @@
   if (!touchpad_gesture_target_.target)
     return;
 
   // TODO(mohsen): Add tests to check event location.
   event->x += touchpad_gesture_target_.delta.x();
   event->y += touchpad_gesture_target_.delta.y();
   touchpad_gesture_target_.target->ProcessGestureEvent(*event, latency);
 }
 
 }  // namespace content