[Master/Overview CL] Make PageScaleFactor work for oopif subframe.

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 5224 matching lines @@
   RenderWidgetHostViewBase* child_rwhv = static_cast<RenderWidgetHostViewBase*>(
       root->child_at(0)->current_frame_host()->GetView());
   SurfaceHitTestReadyNotifier notifier(
       static_cast<RenderWidgetHostViewChildFrame*>(child_rwhv));
   notifier.WaitForSurfaceReady();
 
   // Simulate touch event to sub-frame.
   gfx::Point child_center(150, 150);
   auto* rwhv = static_cast<RenderWidgetHostViewAura*>(
       contents->GetRenderWidgetHostView());
+
+  // Wait until renderer's compositor thread is synced.
+  RenderWidgetHost* child_render_widget_host =
+      root->child_at(0)->current_frame_host()->GetRenderWidgetHost();
+  {
+    std::unique_ptr<MainThreadFrameObserver> observer(
+        new MainThreadFrameObserver(child_render_widget_host));
+    observer->Wait();
+  }
+
   ui::TouchEvent touch_event(ui::ET_TOUCH_PRESSED, child_center, 0, 0,
                              ui::EventTimeForNow(), 30.f, 30.f, 0.f, 0.f);
   rwhv->OnTouchEvent(&touch_event);
+  {
+    std::unique_ptr<MainThreadFrameObserver> observer(
+        new MainThreadFrameObserver(child_render_widget_host));
+    observer->Wait();
+  }
 
   // Verify touch handler in subframe was invoked
   std::string result;
   EXPECT_TRUE(ExecuteScriptAndExtractString(
       root->child_at(0),
       "window.domAutomationController.send(getLastTouchEvent());", &result));
   EXPECT_EQ("touchstart", result);
 }
 
 namespace {
@@ skipping 2636 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 14 matching lines @@
             root_frame_monitor.events_received()[2]);
   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());
+  // Verify child-RWHI also gets events.
+  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 574 matching lines @@
   EXPECT_TRUE(NavigateToURL(shell(), b_url));
 
   base::string16 expected_title(base::UTF8ToUTF16("foo"));
   TitleWatcher title_watcher(popup2->web_contents(), expected_title);
   EXPECT_TRUE(ExecuteScript(
       shell(), "window.open('','popup2').postMessage('foo', '*');"));
   EXPECT_EQ(expected_title, title_watcher.WaitAndGetTitle());
 }
 
 }  // namespace content