Make PageScaleFactor work for oopif subframes.

content/browser/site_per_process_browsertest.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/browser/site_per_process_browsertest.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 8128 matching lines @@
   // Verify child-RWHI gets TS/TE, GTD/GSB/GSE.
   EXPECT_TRUE(child_frame_monitor.EventWasReceived());
   EXPECT_EQ(blink::WebInputEvent::TouchStart,
             child_frame_monitor.events_received()[0]);
   EXPECT_EQ(blink::WebInputEvent::TouchEnd,
             child_frame_monitor.events_received()[1]);
   EXPECT_EQ(blink::WebInputEvent::GestureTapDown,
             child_frame_monitor.events_received()[2]);
   EXPECT_EQ(blink::WebInputEvent::GestureScrollBegin,
             child_frame_monitor.events_received()[3]);
+  EXPECT_EQ(blink::WebInputEvent::GesturePinchBegin,
+            child_frame_monitor.events_received()[4]);
+  EXPECT_EQ(blink::WebInputEvent::GesturePinchEnd,
+            child_frame_monitor.events_received()[5]);
   EXPECT_EQ(blink::WebInputEvent::GestureScrollEnd,
-            child_frame_monitor.events_received()[4]);
+            child_frame_monitor.events_received()[6]);
 }
 
 IN_PROC_BROWSER_TEST_F(SitePerProcessGestureBrowserTest,
                        MainframeGesturePinchGoesToMainFrame) {
   SetupRootAndChild();
 
   TestInputEventObserver root_frame_monitor(rwhi_root_);
   TestInputEventObserver child_frame_monitor(rwhi_child_);
 
   // Need child rect in main frame coords.
@@ skipping 15 matching lines @@
   EXPECT_EQ(blink::WebInputEvent::GestureScrollBegin,
             root_frame_monitor.events_received()[3]);
   EXPECT_EQ(blink::WebInputEvent::GesturePinchBegin,
             root_frame_monitor.events_received()[4]);
   EXPECT_EQ(blink::WebInputEvent::GesturePinchEnd,
             root_frame_monitor.events_received()[5]);
   EXPECT_EQ(blink::WebInputEvent::GestureScrollEnd,
             root_frame_monitor.events_received()[6]);
 
   // Verify child-RWHI gets no events.
-  EXPECT_FALSE(child_frame_monitor.EventWasReceived());
+  EXPECT_TRUE(child_frame_monitor.EventWasReceived());
+  EXPECT_EQ(blink::WebInputEvent::GesturePinchBegin,
+            child_frame_monitor.events_received()[0]);
+  EXPECT_EQ(blink::WebInputEvent::GesturePinchEnd,
+            child_frame_monitor.events_received()[1]);
 }
 #endif
 
 // Test that the pending RenderFrameHost is canceled and destroyed when its
 // process dies. Previously, reusing a top-level pending RFH which
 // is not live was hitting a CHECK in CreateRenderView due to having neither a
 // main frame routing ID nor a proxy routing ID.  See https://crbug.com/627400
 // for more details.
 IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest,
                        PendingRFHIsCanceledWhenItsProcessDies) {
@@ skipping 974 matching lines @@
       shell(), embedded_test_server()->GetURL("b.com", "/title3.html")));
 
   // Pretend that a.com just requested a context menu. This used to cause a
   // because the RenderWidgetHostView is destroyed when the frame is swapped and
   // added to pending delete list.
   rfh->OnMessageReceived(
       FrameHostMsg_ContextMenu(rfh->GetRoutingID(), ContextMenuParams()));
 }
 
 }  // namespace content