| 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 786dbb2fca21f18d1218de4a9d9605228d28ebb2..20223dc01e09aaaa28deda5ebbaa96eba7c45f70 100644
|
| --- a/content/browser/site_per_process_browsertest.cc
|
| +++ b/content/browser/site_per_process_browsertest.cc
|
| @@ -65,6 +65,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)
|
| @@ -256,7 +257,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);
|
| @@ -274,7 +275,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());
|
| @@ -1253,7 +1254,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);
|
| @@ -1318,7 +1319,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);
|
| @@ -4888,8 +4889,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
|
| @@ -5414,13 +5415,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();
|
|
|
|
|