| Index: content/public/test/browser_test_utils.cc
|
| diff --git a/content/public/test/browser_test_utils.cc b/content/public/test/browser_test_utils.cc
|
| index 01620c8a7b8f5ae3e0998534f42919a75cd6a900..b5c05d330d0b7266bbef4e41e3725343c01887da 100644
|
| --- a/content/public/test/browser_test_utils.cc
|
| +++ b/content/public/test/browser_test_utils.cc
|
| @@ -531,12 +531,12 @@ void SimulateMouseClickAt(WebContents* web_contents,
|
| blink::WebInputEvent::MouseDown, modifiers,
|
| ui::EventTimeStampToSeconds(ui::EventTimeForNow()));
|
| mouse_event.button = button;
|
| - mouse_event.x = point.x();
|
| - mouse_event.y = point.y();
|
| - // Mac needs globalX/globalY for events to plugins.
|
| + mouse_event.position.x = point.x();
|
| + mouse_event.position.y = point.y();
|
| + // Mac needs screenPosition for events to plugins.
|
| gfx::Rect offset = web_contents->GetContainerBounds();
|
| - mouse_event.globalX = point.x() + offset.x();
|
| - mouse_event.globalY = point.y() + offset.y();
|
| + mouse_event.screenPosition.x = point.x() + offset.x();
|
| + mouse_event.screenPosition.y = point.y() + offset.y();
|
| mouse_event.clickCount = 1;
|
| web_contents->GetRenderViewHost()->GetWidget()->ForwardMouseEvent(
|
| mouse_event);
|
| @@ -551,8 +551,8 @@ void SimulateMouseEvent(WebContents* web_contents,
|
| blink::WebMouseEvent mouse_event(
|
| type, blink::WebInputEvent::NoModifiers,
|
| ui::EventTimeStampToSeconds(ui::EventTimeForNow()));
|
| - mouse_event.x = point.x();
|
| - mouse_event.y = point.y();
|
| + mouse_event.position.x = point.x();
|
| + mouse_event.position.y = point.y();
|
| web_contents->GetRenderViewHost()->GetWidget()->ForwardMouseEvent(
|
| mouse_event);
|
| }
|
| @@ -564,8 +564,8 @@ void SimulateMouseWheelEvent(WebContents* web_contents,
|
| blink::WebInputEvent::MouseWheel, blink::WebInputEvent::NoModifiers,
|
| ui::EventTimeStampToSeconds(ui::EventTimeForNow()));
|
|
|
| - wheel_event.x = point.x();
|
| - wheel_event.y = point.y();
|
| + wheel_event.position.x = point.x();
|
| + wheel_event.position.y = point.y();
|
| wheel_event.deltaX = delta.x();
|
| wheel_event.deltaY = delta.y();
|
| RenderWidgetHostImpl* widget_host = RenderWidgetHostImpl::From(
|
|
|