OLD | NEW |
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 420 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
431 gfx::Point(123, 321), timestamp, EF_LEFT_MOUSE_BUTTON, | 431 gfx::Point(123, 321), timestamp, EF_LEFT_MOUSE_BUTTON, |
432 EF_LEFT_MOUSE_BUTTON); | 432 EF_LEFT_MOUSE_BUTTON); |
433 blink::WebMouseEvent webkit_event = | 433 blink::WebMouseEvent webkit_event = |
434 MakeWebMouseEvent(ui_event, base::Bind(&GetScreenLocationFromEvent)); | 434 MakeWebMouseEvent(ui_event, base::Bind(&GetScreenLocationFromEvent)); |
435 | 435 |
436 EXPECT_EQ(blink::WebPointerProperties::PointerType::Mouse, | 436 EXPECT_EQ(blink::WebPointerProperties::PointerType::Mouse, |
437 webkit_event.pointerType); | 437 webkit_event.pointerType); |
438 EXPECT_EQ(0, webkit_event.tiltX); | 438 EXPECT_EQ(0, webkit_event.tiltX); |
439 EXPECT_EQ(0, webkit_event.tiltY); | 439 EXPECT_EQ(0, webkit_event.tiltY); |
440 EXPECT_TRUE(std::isnan(webkit_event.force)); | 440 EXPECT_TRUE(std::isnan(webkit_event.force)); |
| 441 EXPECT_EQ(0.0f, webkit_event.tangentialPressure); |
| 442 EXPECT_EQ(0, webkit_event.twist); |
441 EXPECT_EQ(123, webkit_event.x); | 443 EXPECT_EQ(123, webkit_event.x); |
442 EXPECT_EQ(123, webkit_event.windowX); | 444 EXPECT_EQ(123, webkit_event.windowX); |
443 EXPECT_EQ(321, webkit_event.y); | 445 EXPECT_EQ(321, webkit_event.y); |
444 EXPECT_EQ(321, webkit_event.windowY); | 446 EXPECT_EQ(321, webkit_event.windowY); |
445 } | 447 } |
446 { | 448 { |
447 // Stylus values for PointerDetails. | 449 // Stylus values for PointerDetails. |
448 base::TimeTicks timestamp = EventTimeForNow(); | 450 base::TimeTicks timestamp = EventTimeForNow(); |
449 MouseEvent ui_event(ET_MOUSE_PRESSED, gfx::Point(123, 321), | 451 MouseEvent ui_event(ET_MOUSE_PRESSED, gfx::Point(123, 321), |
450 gfx::Point(123, 321), timestamp, EF_LEFT_MOUSE_BUTTON, | 452 gfx::Point(123, 321), timestamp, EF_LEFT_MOUSE_BUTTON, |
451 EF_LEFT_MOUSE_BUTTON); | 453 EF_LEFT_MOUSE_BUTTON); |
452 ui_event.set_pointer_details( | 454 ui_event.set_pointer_details( |
453 PointerDetails(EventPointerType::POINTER_TYPE_PEN, | 455 PointerDetails(EventPointerType::POINTER_TYPE_PEN, |
454 /* radius_x */ 0.0f, | 456 /* radius_x */ 0.0f, |
455 /* radius_y */ 0.0f, | 457 /* radius_y */ 0.0f, |
456 /* force */ 0.8f, | 458 /* force */ 0.8f, |
457 /* tilt_x */ 89.5f, | 459 /* tilt_x */ 89.5f, |
458 /* tilt_y */ -89.5f)); | 460 /* tilt_y */ -89.5f)); |
459 blink::WebMouseEvent webkit_event = | 461 blink::WebMouseEvent webkit_event = |
460 MakeWebMouseEvent(ui_event, base::Bind(&GetScreenLocationFromEvent)); | 462 MakeWebMouseEvent(ui_event, base::Bind(&GetScreenLocationFromEvent)); |
461 | 463 |
462 EXPECT_EQ(blink::WebPointerProperties::PointerType::Pen, | 464 EXPECT_EQ(blink::WebPointerProperties::PointerType::Pen, |
463 webkit_event.pointerType); | 465 webkit_event.pointerType); |
464 EXPECT_EQ(90, webkit_event.tiltX); | 466 EXPECT_EQ(90, webkit_event.tiltX); |
465 EXPECT_EQ(-90, webkit_event.tiltY); | 467 EXPECT_EQ(-90, webkit_event.tiltY); |
466 EXPECT_FLOAT_EQ(0.8f, webkit_event.force); | 468 EXPECT_FLOAT_EQ(0.8f, webkit_event.force); |
| 469 EXPECT_EQ(0.0f, webkit_event.tangentialPressure); |
| 470 EXPECT_EQ(0, webkit_event.twist); |
467 EXPECT_EQ(123, webkit_event.x); | 471 EXPECT_EQ(123, webkit_event.x); |
468 EXPECT_EQ(123, webkit_event.windowX); | 472 EXPECT_EQ(123, webkit_event.windowX); |
469 EXPECT_EQ(321, webkit_event.y); | 473 EXPECT_EQ(321, webkit_event.y); |
470 EXPECT_EQ(321, webkit_event.windowY); | 474 EXPECT_EQ(321, webkit_event.windowY); |
471 } | 475 } |
472 } | 476 } |
473 | 477 |
474 TEST(WebInputEventTest, TestMakeWebMouseWheelEvent) { | 478 TEST(WebInputEventTest, TestMakeWebMouseWheelEvent) { |
475 { | 479 { |
476 // Mouse wheel. | 480 // Mouse wheel. |
(...skipping 12 matching lines...) Expand all Loading... |
489 EXPECT_EQ(blink::WebInputEvent::MouseWheel, webkit_event.type); | 493 EXPECT_EQ(blink::WebInputEvent::MouseWheel, webkit_event.type); |
490 EXPECT_FLOAT_EQ(ui_event.x_offset() / MouseWheelEvent::kWheelDelta, | 494 EXPECT_FLOAT_EQ(ui_event.x_offset() / MouseWheelEvent::kWheelDelta, |
491 webkit_event.wheelTicksX); | 495 webkit_event.wheelTicksX); |
492 EXPECT_FLOAT_EQ(ui_event.y_offset() / MouseWheelEvent::kWheelDelta, | 496 EXPECT_FLOAT_EQ(ui_event.y_offset() / MouseWheelEvent::kWheelDelta, |
493 webkit_event.wheelTicksY); | 497 webkit_event.wheelTicksY); |
494 EXPECT_EQ(blink::WebPointerProperties::PointerType::Mouse, | 498 EXPECT_EQ(blink::WebPointerProperties::PointerType::Mouse, |
495 webkit_event.pointerType); | 499 webkit_event.pointerType); |
496 EXPECT_EQ(0, webkit_event.tiltX); | 500 EXPECT_EQ(0, webkit_event.tiltX); |
497 EXPECT_EQ(0, webkit_event.tiltY); | 501 EXPECT_EQ(0, webkit_event.tiltY); |
498 EXPECT_TRUE(std::isnan(webkit_event.force)); | 502 EXPECT_TRUE(std::isnan(webkit_event.force)); |
| 503 EXPECT_EQ(0.0f, webkit_event.tangentialPressure); |
| 504 EXPECT_EQ(0, webkit_event.twist); |
499 EXPECT_EQ(123, webkit_event.x); | 505 EXPECT_EQ(123, webkit_event.x); |
500 EXPECT_EQ(123, webkit_event.windowX); | 506 EXPECT_EQ(123, webkit_event.windowX); |
501 EXPECT_EQ(321, webkit_event.y); | 507 EXPECT_EQ(321, webkit_event.y); |
502 EXPECT_EQ(321, webkit_event.windowY); | 508 EXPECT_EQ(321, webkit_event.windowY); |
503 } | 509 } |
504 } | 510 } |
505 | 511 |
506 TEST(WebInputEventTest, KeyEvent) { | 512 TEST(WebInputEventTest, KeyEvent) { |
507 struct { | 513 struct { |
508 ui::KeyEvent event; | 514 ui::KeyEvent event; |
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
573 ASSERT_EQ(tests[i].web_type, web_event.type); | 579 ASSERT_EQ(tests[i].web_type, web_event.type); |
574 ASSERT_EQ(tests[i].web_modifiers, web_event.modifiers); | 580 ASSERT_EQ(tests[i].web_modifiers, web_event.modifiers); |
575 ASSERT_EQ(tests[i].location.x(), web_event.x); | 581 ASSERT_EQ(tests[i].location.x(), web_event.x); |
576 ASSERT_EQ(tests[i].location.y(), web_event.y); | 582 ASSERT_EQ(tests[i].location.y(), web_event.y); |
577 ASSERT_EQ(tests[i].screen_location.x(), web_event.globalX); | 583 ASSERT_EQ(tests[i].screen_location.x(), web_event.globalX); |
578 ASSERT_EQ(tests[i].screen_location.y(), web_event.globalY); | 584 ASSERT_EQ(tests[i].screen_location.y(), web_event.globalY); |
579 } | 585 } |
580 } | 586 } |
581 | 587 |
582 } // namespace ui | 588 } // namespace ui |
OLD | NEW |