Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(640)

Side by Side Diff: components/html_viewer/input_events_unittest.cc

Issue 1372253002: gfx: Make conversions from gfx::Point to PointF explicit. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: pointfconvert-event: mandol_line Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/memory/scoped_ptr.h" 5 #include "base/memory/scoped_ptr.h"
6 #include "components/html_viewer/blink_input_events_type_converters.h" 6 #include "components/html_viewer/blink_input_events_type_converters.h"
7 #include "mojo/converters/input_events/input_events_type_converters.h" 7 #include "mojo/converters/input_events/input_events_type_converters.h"
8 #include "testing/gtest/include/gtest/gtest.h" 8 #include "testing/gtest/include/gtest/gtest.h"
9 #include "third_party/WebKit/public/web/WebInputEvent.h" 9 #include "third_party/WebKit/public/web/WebInputEvent.h"
10 #include "ui/events/event.h" 10 #include "ui/events/event.h"
(...skipping 28 matching lines...) Expand all
39 static_cast<WebMouseEvent*>(webevent.release())); 39 static_cast<WebMouseEvent*>(webevent.release()));
40 40
41 EXPECT_EQ(1, web_mouse_event->x); 41 EXPECT_EQ(1, web_mouse_event->x);
42 EXPECT_EQ(2, web_mouse_event->y); 42 EXPECT_EQ(2, web_mouse_event->y);
43 EXPECT_EQ(3, web_mouse_event->globalX); 43 EXPECT_EQ(3, web_mouse_event->globalX);
44 EXPECT_EQ(4, web_mouse_event->globalY); 44 EXPECT_EQ(4, web_mouse_event->globalY);
45 } 45 }
46 46
47 TEST(InputEventLibTest, MouseWheelEventConversionNonPrecise) { 47 TEST(InputEventLibTest, MouseWheelEventConversionNonPrecise) {
48 scoped_ptr<ui::Event> original_wheel(new ui::MouseWheelEvent( 48 scoped_ptr<ui::Event> original_wheel(new ui::MouseWheelEvent(
49 gfx::Vector2d(-1.0 * ui::MouseWheelEvent::kWheelDelta, 49 gfx::Vector2d(-1 * ui::MouseWheelEvent::kWheelDelta,
50 -2.0 * ui::MouseWheelEvent::kWheelDelta), 50 -2 * ui::MouseWheelEvent::kWheelDelta),
51 gfx::PointF(1.0, 2.0), gfx::PointF(3.0, 4.0), EventTimeForNow(), 0, 0)); 51 gfx::Point(1, 2), gfx::Point(3, 4), EventTimeForNow(), 0, 0));
52 52
53 mus::mojom::EventPtr mojo_event(mus::mojom::Event::From(*original_wheel)); 53 mus::mojom::EventPtr mojo_event(mus::mojom::Event::From(*original_wheel));
54 54
55 EXPECT_EQ(mus::mojom::EVENT_TYPE_WHEEL, mojo_event->action); 55 EXPECT_EQ(mus::mojom::EVENT_TYPE_WHEEL, mojo_event->action);
56 56
57 // Exercise the blink converter. 57 // Exercise the blink converter.
58 scoped_ptr<blink::WebInputEvent> webevent = 58 scoped_ptr<blink::WebInputEvent> webevent =
59 mojo_event.To<scoped_ptr<blink::WebInputEvent>>(); 59 mojo_event.To<scoped_ptr<blink::WebInputEvent>>();
60 60
61 ASSERT_TRUE(webevent); 61 ASSERT_TRUE(webevent);
(...skipping 26 matching lines...) Expand all
88 88
89 scoped_ptr<ui::MouseWheelEvent> ui_wheel( 89 scoped_ptr<ui::MouseWheelEvent> ui_wheel(
90 static_cast<ui::MouseWheelEvent*>(new_event.release())); 90 static_cast<ui::MouseWheelEvent*>(new_event.release()));
91 91
92 EXPECT_EQ(-1 * ui::MouseWheelEvent::kWheelDelta, ui_wheel->x_offset()); 92 EXPECT_EQ(-1 * ui::MouseWheelEvent::kWheelDelta, ui_wheel->x_offset());
93 EXPECT_EQ(-2 * ui::MouseWheelEvent::kWheelDelta, ui_wheel->y_offset()); 93 EXPECT_EQ(-2 * ui::MouseWheelEvent::kWheelDelta, ui_wheel->y_offset());
94 } 94 }
95 95
96 } // namespace 96 } // namespace
97 } // namespace mojo 97 } // namespace mojo
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698