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

Side by Side Diff: ui/events/blink/web_input_event_unittest.cc

Issue 2786693002: Add PointerDetails to ui::MouseEvent's constructors (Closed)
Patch Set: mouse constructor Created 3 years, 8 months 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
« no previous file with comments | « ui/events/blink/web_input_event_builders_win.cc ('k') | ui/events/event.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 "ui/events/blink/web_input_event.h" 5 #include "ui/events/blink/web_input_event.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 411 matching lines...) Expand 10 before | Expand all | Expand 10 after
422 EXPECT_EQ(0, webkit_event.tilt_y); 422 EXPECT_EQ(0, webkit_event.tilt_y);
423 EXPECT_TRUE(std::isnan(webkit_event.force)); 423 EXPECT_TRUE(std::isnan(webkit_event.force));
424 EXPECT_EQ(0.0f, webkit_event.tangential_pressure); 424 EXPECT_EQ(0.0f, webkit_event.tangential_pressure);
425 EXPECT_EQ(0, webkit_event.twist); 425 EXPECT_EQ(0, webkit_event.twist);
426 EXPECT_EQ(123, webkit_event.PositionInWidget().x); 426 EXPECT_EQ(123, webkit_event.PositionInWidget().x);
427 EXPECT_EQ(321, webkit_event.PositionInWidget().y); 427 EXPECT_EQ(321, webkit_event.PositionInWidget().y);
428 } 428 }
429 { 429 {
430 // Stylus values for PointerDetails. 430 // Stylus values for PointerDetails.
431 base::TimeTicks timestamp = EventTimeForNow(); 431 base::TimeTicks timestamp = EventTimeForNow();
432 MouseEvent ui_event(ET_MOUSE_PRESSED, gfx::Point(123, 321),
433 gfx::Point(123, 321), timestamp, EF_LEFT_MOUSE_BUTTON,
434 EF_LEFT_MOUSE_BUTTON);
435 PointerDetails pointer_details(EventPointerType::POINTER_TYPE_PEN, 432 PointerDetails pointer_details(EventPointerType::POINTER_TYPE_PEN,
436 /* id */ 63, 433 /* id */ 63,
437 /* radius_x */ 0.0f, 434 /* radius_x */ 0.0f,
438 /* radius_y */ 0.0f, 435 /* radius_y */ 0.0f,
439 /* force */ 0.8f, 436 /* force */ 0.8f,
440 /* tilt_x */ 89.5f, 437 /* tilt_x */ 89.5f,
441 /* tilt_y */ -89.5f, 438 /* tilt_y */ -89.5f,
442 /* tangential_pressure */ 0.6f, 439 /* tangential_pressure */ 0.6f,
443 /* twist */ 269); 440 /* twist */ 269);
444 ui_event.set_pointer_details(pointer_details); 441 MouseEvent ui_event(ET_MOUSE_PRESSED, gfx::Point(123, 321),
442 gfx::Point(123, 321), timestamp, EF_LEFT_MOUSE_BUTTON,
443 EF_LEFT_MOUSE_BUTTON, pointer_details);
445 blink::WebMouseEvent webkit_event = 444 blink::WebMouseEvent webkit_event =
446 MakeWebMouseEvent(ui_event, base::Bind(&GetScreenLocationFromEvent)); 445 MakeWebMouseEvent(ui_event, base::Bind(&GetScreenLocationFromEvent));
447 446
448 EXPECT_EQ(blink::WebPointerProperties::PointerType::kPen, 447 EXPECT_EQ(blink::WebPointerProperties::PointerType::kPen,
449 webkit_event.pointer_type); 448 webkit_event.pointer_type);
450 EXPECT_EQ(90, webkit_event.tilt_x); 449 EXPECT_EQ(90, webkit_event.tilt_x);
451 EXPECT_EQ(-90, webkit_event.tilt_y); 450 EXPECT_EQ(-90, webkit_event.tilt_y);
452 EXPECT_FLOAT_EQ(0.8f, webkit_event.force); 451 EXPECT_FLOAT_EQ(0.8f, webkit_event.force);
453 EXPECT_FLOAT_EQ(0.6f, webkit_event.tangential_pressure); 452 EXPECT_FLOAT_EQ(0.6f, webkit_event.tangential_pressure);
454 EXPECT_EQ(269, webkit_event.twist); 453 EXPECT_EQ(269, webkit_event.twist);
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
560 ASSERT_EQ(tests[i].web_type, web_event.GetType()); 559 ASSERT_EQ(tests[i].web_type, web_event.GetType());
561 ASSERT_EQ(tests[i].web_modifiers, web_event.GetModifiers()); 560 ASSERT_EQ(tests[i].web_modifiers, web_event.GetModifiers());
562 ASSERT_EQ(tests[i].location.x(), web_event.PositionInWidget().x); 561 ASSERT_EQ(tests[i].location.x(), web_event.PositionInWidget().x);
563 ASSERT_EQ(tests[i].location.y(), web_event.PositionInWidget().y); 562 ASSERT_EQ(tests[i].location.y(), web_event.PositionInWidget().y);
564 ASSERT_EQ(tests[i].screen_location.x(), web_event.PositionInScreen().x); 563 ASSERT_EQ(tests[i].screen_location.x(), web_event.PositionInScreen().x);
565 ASSERT_EQ(tests[i].screen_location.y(), web_event.PositionInScreen().y); 564 ASSERT_EQ(tests[i].screen_location.y(), web_event.PositionInScreen().y);
566 } 565 }
567 } 566 }
568 567
569 } // namespace ui 568 } // namespace ui
OLDNEW
« no previous file with comments | « ui/events/blink/web_input_event_builders_win.cc ('k') | ui/events/event.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698