Move compositor InputHandler from RenderViewImpl to RenderWidget.

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(

[dcheng, 2016/11/04 21:00:02]

Nit: auto observer = base::MakeUnique<MTFO>(...);

[wjmaclean, 2016/11/07 15:57:27]

Done.

+        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);
 }
 
+// This test verifies that the test in
+// SitePerProcessBrowserTest.SubframeTouchEventRouting also works properly for
+// the main frame. Prior to the CL in which this test is introduced, use of
+// MainThreadFrameObserver in SubframeTouchEventRouting was not necessary since
+// the touch events were handled on the main thread. Now they are handled on the
+// compositor thread, hence the need to synchronize.
+IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest,
+                       MainframeTouchEventRouting) {
+  GURL main_url(embedded_test_server()->GetURL(
+      "/page_with_touch_handler.html"));
+  EXPECT_TRUE(NavigateToURL(shell(), main_url));
+
+  WebContentsImpl* contents = web_contents();
+  FrameTreeNode* root = contents->GetFrameTree()->root();
+
+  // Synchronize with the renderers to guarantee that the
+  // surface information required for event hit testing is ready.
+  auto* rwhv = static_cast<RenderWidgetHostViewAura*>(
+      contents->GetRenderWidgetHostView());
+
+  // Simulate touch event to sub-frame.
+  gfx::Point frame_center(150, 150);
+
+  // Wait until renderer's compositor thread is synced.
+  RenderWidgetHost* render_widget_host = rwhv->GetRenderWidgetHost();
+  {
+    std::unique_ptr<MainThreadFrameObserver> observer(
+        new MainThreadFrameObserver(render_widget_host));
+    observer->Wait();
+  }
+
+  ui::TouchEvent touch_event(ui::ET_TOUCH_PRESSED, frame_center, 0, 0,
+                             ui::EventTimeForNow(), 30.f, 30.f, 0.f, 0.f);
+  rwhv->OnTouchEvent(&touch_event);
+  {
+    std::unique_ptr<MainThreadFrameObserver> observer(
+        new MainThreadFrameObserver(render_widget_host));
+    observer->Wait();
+  }
+
+  // Verify touch handler in subframe was invoked
+  std::string result;
+  EXPECT_TRUE(ExecuteScriptAndExtractString(
+      root, "window.domAutomationController.send(getLastTouchEvent());",
+      &result));
+  EXPECT_EQ("touchstart", result);
+}
+
 namespace {
 
 // Declared here to be close to the SubframeGestureEventRouting test.
 void OnSyntheticGestureCompleted(scoped_refptr<MessageLoopRunner> runner,
                                  SyntheticGesture::Result result) {
   EXPECT_EQ(SyntheticGesture::GESTURE_FINISHED, result);
   runner->Quit();
 }
 
 }  // namespace anonymous
@@ skipping 3259 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