summaryrefslogtreecommitdiff
path: root/chromium/ui/aura/window_targeter_unittest.cc
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2015-06-18 14:10:49 +0200
committerOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2015-06-18 13:53:24 +0000
commit813fbf95af77a531c57a8c497345ad2c61d475b3 (patch)
tree821b2c8de8365f21b6c9ba17a236fb3006a1d506 /chromium/ui/aura/window_targeter_unittest.cc
parentaf6588f8d723931a298c995fa97259bb7f7deb55 (diff)
downloadqtwebengine-chromium-813fbf95af77a531c57a8c497345ad2c61d475b3.tar.gz
BASELINE: Update chromium to 44.0.2403.47
Change-Id: Ie056fedba95cf5e5c76b30c4b2c80fca4764aa2f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'chromium/ui/aura/window_targeter_unittest.cc')
-rw-r--r--chromium/ui/aura/window_targeter_unittest.cc19
1 files changed, 9 insertions, 10 deletions
diff --git a/chromium/ui/aura/window_targeter_unittest.cc b/chromium/ui/aura/window_targeter_unittest.cc
index 922b021117f..02217271a16 100644
--- a/chromium/ui/aura/window_targeter_unittest.cc
+++ b/chromium/ui/aura/window_targeter_unittest.cc
@@ -8,6 +8,7 @@
#include "ui/aura/test/aura_test_base.h"
#include "ui/aura/test/test_window_delegate.h"
#include "ui/aura/window.h"
+#include "ui/events/event_utils.h"
#include "ui/events/test/test_event_handler.h"
namespace aura {
@@ -66,10 +67,8 @@ TEST_F(WindowTargeterTest, Basic) {
ui::test::TestEventHandler handler;
one->AddPreTargetHandler(&handler);
- ui::MouseEvent press(ui::ET_MOUSE_PRESSED,
- gfx::Point(20, 20),
- gfx::Point(20, 20),
- ui::EF_NONE,
+ ui::MouseEvent press(ui::ET_MOUSE_PRESSED, gfx::Point(20, 20),
+ gfx::Point(20, 20), ui::EventTimeForNow(), ui::EF_NONE,
ui::EF_NONE);
DispatchEventUsingWindowDispatcher(&press);
EXPECT_EQ(1, handler.num_mouse_events());
@@ -96,7 +95,7 @@ TEST_F(WindowTargeterTest, ScopedWindowTargeter) {
gfx::Point event_location(60, 60);
{
ui::MouseEvent mouse(ui::ET_MOUSE_MOVED, event_location, event_location,
- ui::EF_NONE, ui::EF_NONE);
+ ui::EventTimeForNow(), ui::EF_NONE, ui::EF_NONE);
EXPECT_EQ(child, targeter->FindTargetForEvent(root, &mouse));
}
@@ -106,13 +105,13 @@ TEST_F(WindowTargeterTest, ScopedWindowTargeter) {
new StaticWindowTargeter(window.get()))));
{
ui::MouseEvent mouse(ui::ET_MOUSE_MOVED, event_location, event_location,
- ui::EF_NONE, ui::EF_NONE);
+ ui::EventTimeForNow(), ui::EF_NONE, ui::EF_NONE);
EXPECT_EQ(window.get(), targeter->FindTargetForEvent(root, &mouse));
}
scoped_targeter.reset();
{
ui::MouseEvent mouse(ui::ET_MOUSE_MOVED, event_location, event_location,
- ui::EF_NONE, ui::EF_NONE);
+ ui::EventTimeForNow(), ui::EF_NONE, ui::EF_NONE);
EXPECT_EQ(child, targeter->FindTargetForEvent(root, &mouse));
}
}
@@ -146,7 +145,7 @@ TEST_F(WindowTargeterTest, TargetTransformedWindow) {
gfx::Point event_location(490, 50);
{
ui::MouseEvent mouse(ui::ET_MOUSE_MOVED, event_location, event_location,
- ui::EF_NONE, ui::EF_NONE);
+ ui::EventTimeForNow(), ui::EF_NONE, ui::EF_NONE);
EXPECT_EQ(window.get(), targeter->FindTargetForEvent(root_target, &mouse));
}
@@ -159,7 +158,7 @@ TEST_F(WindowTargeterTest, TargetTransformedWindow) {
GetEffectiveVisibleBoundsInRootWindow(window.get()).ToString());
{
ui::MouseEvent mouse(ui::ET_MOUSE_MOVED, event_location, event_location,
- ui::EF_NONE, ui::EF_NONE);
+ ui::EventTimeForNow(), ui::EF_NONE, ui::EF_NONE);
EXPECT_EQ(root_window(), targeter->FindTargetForEvent(root_target, &mouse));
}
@@ -171,7 +170,7 @@ TEST_F(WindowTargeterTest, TargetTransformedWindow) {
GetEffectiveVisibleBoundsInRootWindow(window.get()).ToString());
{
ui::MouseEvent mouse(ui::ET_MOUSE_MOVED, event_location, event_location,
- ui::EF_NONE, ui::EF_NONE);
+ ui::EventTimeForNow(), ui::EF_NONE, ui::EF_NONE);
EXPECT_EQ(window.get(), targeter->FindTargetForEvent(root_target, &mouse));
}
}