| Index: content/browser/site_per_process_browsertest.cc
|
| diff --git a/content/browser/site_per_process_browsertest.cc b/content/browser/site_per_process_browsertest.cc
|
| index d2b7fb214392b681fc0b5d28866f984eaad98829..5378826f7e9186c18b6a3b26b41d5411c948e2ea 100644
|
| --- a/content/browser/site_per_process_browsertest.cc
|
| +++ b/content/browser/site_per_process_browsertest.cc
|
| @@ -64,6 +64,7 @@
|
| #include "ui/display/screen.h"
|
| #include "ui/events/event.h"
|
| #include "ui/events/event_utils.h"
|
| +#include "ui/events/latency_info.h"
|
| #include "ui/gfx/geometry/point.h"
|
|
|
| #if defined(USE_AURA)
|
| @@ -255,7 +256,7 @@ void SurfaceHitTestTestHelper(
|
| child_event.clickCount = 1;
|
| main_frame_monitor.ResetEventReceived();
|
| child_frame_monitor.ResetEventReceived();
|
| - router->RouteMouseEvent(root_view, &child_event);
|
| + router->RouteMouseEvent(root_view, &child_event, ui::LatencyInfo());
|
|
|
| EXPECT_TRUE(child_frame_monitor.EventWasReceived());
|
| EXPECT_EQ(23, child_frame_monitor.event().x);
|
| @@ -273,7 +274,7 @@ void SurfaceHitTestTestHelper(
|
| main_event.y = 1;
|
| main_event.clickCount = 1;
|
| // Ladies and gentlemen, THIS is the main_event!
|
| - router->RouteMouseEvent(root_view, &main_event);
|
| + router->RouteMouseEvent(root_view, &main_event, ui::LatencyInfo());
|
|
|
| EXPECT_FALSE(child_frame_monitor.EventWasReceived());
|
| EXPECT_TRUE(main_frame_monitor.EventWasReceived());
|
| @@ -1225,7 +1226,7 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest,
|
| nested_event.clickCount = 1;
|
| nested_frame_monitor.ResetEventReceived();
|
| main_frame_monitor.ResetEventReceived();
|
| - router->RouteMouseEvent(root_view, &nested_event);
|
| + router->RouteMouseEvent(root_view, &nested_event, ui::LatencyInfo());
|
|
|
| EXPECT_TRUE(nested_frame_monitor.EventWasReceived());
|
| EXPECT_EQ(21, nested_frame_monitor.event().x);
|
| @@ -1290,7 +1291,7 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest,
|
| child_event.clickCount = 1;
|
| main_frame_monitor.ResetEventReceived();
|
| child_frame_monitor.ResetEventReceived();
|
| - router->RouteMouseEvent(root_view, &child_event);
|
| + router->RouteMouseEvent(root_view, &child_event, ui::LatencyInfo());
|
|
|
| EXPECT_TRUE(main_frame_monitor.EventWasReceived());
|
| EXPECT_EQ(75, main_frame_monitor.event().x);
|
| @@ -1377,7 +1378,8 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest,
|
|
|
| // Send an initial MouseMove to the root view, which shouldn't affect the
|
| // other renderers.
|
| - web_contents()->GetInputEventRouter()->RouteMouseEvent(rwhv_a, &mouse_event);
|
| + web_contents()->GetInputEventRouter()->RouteMouseEvent(rwhv_a, &mouse_event,
|
| + ui::LatencyInfo());
|
| EXPECT_TRUE(a_frame_monitor.EventWasReceived());
|
| a_frame_monitor.ResetEventReceived();
|
| EXPECT_FALSE(b_frame_monitor.EventWasReceived());
|
| @@ -1388,7 +1390,8 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest,
|
| // A should receive a MouseMove event.
|
| mouse_event.x = point_in_b_frame.x();
|
| mouse_event.y = point_in_b_frame.y();
|
| - web_contents()->GetInputEventRouter()->RouteMouseEvent(rwhv_a, &mouse_event);
|
| + web_contents()->GetInputEventRouter()->RouteMouseEvent(rwhv_a, &mouse_event,
|
| + ui::LatencyInfo());
|
| EXPECT_TRUE(a_frame_monitor.EventWasReceived());
|
| EXPECT_EQ(a_frame_monitor.event().type, blink::WebInputEvent::MouseMove);
|
| a_frame_monitor.ResetEventReceived();
|
| @@ -1401,7 +1404,8 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest,
|
| // other RenderWidgetHostView.
|
| mouse_event.x = point_in_d_frame.x();
|
| mouse_event.y = point_in_d_frame.y();
|
| - web_contents()->GetInputEventRouter()->RouteMouseEvent(rwhv_a, &mouse_event);
|
| + web_contents()->GetInputEventRouter()->RouteMouseEvent(rwhv_a, &mouse_event,
|
| + ui::LatencyInfo());
|
| EXPECT_TRUE(a_frame_monitor.EventWasReceived());
|
| EXPECT_EQ(a_frame_monitor.event().type, blink::WebInputEvent::MouseMove);
|
| EXPECT_TRUE(b_frame_monitor.EventWasReceived());
|
| @@ -4973,8 +4977,8 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest,
|
| root->child_at(0)->current_frame_host()->GetRenderWidgetHost();
|
| RenderWidgetHostViewBase* root_view = static_cast<RenderWidgetHostViewBase*>(
|
| root->current_frame_host()->GetRenderWidgetHost()->GetView());
|
| - web_contents()->GetInputEventRouter()->RouteMouseEvent(root_view,
|
| - &mouse_event);
|
| + web_contents()->GetInputEventRouter()->RouteMouseEvent(
|
| + root_view, &mouse_event, ui::LatencyInfo());
|
|
|
| // CursorMessageFilter::Wait() implicitly tests whether we receive a
|
| // ViewHostMsg_SetCursor message from the renderer process, because it does
|
| @@ -5499,13 +5503,13 @@ void CreateContextMenuTestHelper(
|
| click_event.x = point.x();
|
| click_event.y = point.y();
|
| click_event.clickCount = 1;
|
| - router->RouteMouseEvent(root_view, &click_event);
|
| + router->RouteMouseEvent(root_view, &click_event, ui::LatencyInfo());
|
|
|
| // We also need a MouseUp event, needed by Windows.
|
| click_event.type = blink::WebInputEvent::MouseUp;
|
| click_event.x = point.x();
|
| click_event.y = point.y();
|
| - router->RouteMouseEvent(root_view, &click_event);
|
| + router->RouteMouseEvent(root_view, &click_event, ui::LatencyInfo());
|
|
|
| context_menu_delegate.Wait();
|
|
|
|
|