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

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

Issue 2359463002: Send the WebMouseWheelEvents unconverted if Shift is down. (Closed)
Patch Set: Add comemnt Created 4 years, 3 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') | no next file » | 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 483 matching lines...) Expand 10 before | Expand all | Expand 10 after
494 EXPECT_EQ(blink::WebPointerProperties::PointerType::Mouse, 494 EXPECT_EQ(blink::WebPointerProperties::PointerType::Mouse,
495 webkit_event.pointerType); 495 webkit_event.pointerType);
496 EXPECT_EQ(0, webkit_event.tiltX); 496 EXPECT_EQ(0, webkit_event.tiltX);
497 EXPECT_EQ(0, webkit_event.tiltY); 497 EXPECT_EQ(0, webkit_event.tiltY);
498 EXPECT_TRUE(std::isnan(webkit_event.force)); 498 EXPECT_TRUE(std::isnan(webkit_event.force));
499 EXPECT_EQ(123, webkit_event.x); 499 EXPECT_EQ(123, webkit_event.x);
500 EXPECT_EQ(123, webkit_event.windowX); 500 EXPECT_EQ(123, webkit_event.windowX);
501 EXPECT_EQ(321, webkit_event.y); 501 EXPECT_EQ(321, webkit_event.y);
502 EXPECT_EQ(321, webkit_event.windowY); 502 EXPECT_EQ(321, webkit_event.windowY);
503 } 503 }
504 {
505 // Mouse wheel with shift and no x offset.
506 base::TimeTicks timestamp = EventTimeForNow();
507 MouseWheelEvent ui_event(
508 gfx::Vector2d(0, -MouseWheelEvent::kWheelDelta * 2),
509 gfx::Point(123, 321), gfx::Point(123, 321), timestamp, EF_SHIFT_DOWN,
510 0);
511 blink::WebMouseWheelEvent webkit_event = MakeWebMouseWheelEvent(
512 ui_event, base::Bind(&GetScreenLocationFromEvent));
513 EXPECT_EQ(EventFlagsToWebEventModifiers(ui_event.flags()),
514 webkit_event.modifiers);
515 EXPECT_FLOAT_EQ(EventTimeStampToSeconds(timestamp),
516 webkit_event.timeStampSeconds);
517 EXPECT_EQ(blink::WebMouseEvent::Button::NoButton, webkit_event.button);
518 EXPECT_EQ(blink::WebInputEvent::MouseWheel, webkit_event.type);
519 EXPECT_FLOAT_EQ(ui_event.y_offset() / MouseWheelEvent::kWheelDelta,
520 webkit_event.wheelTicksX);
521 EXPECT_FLOAT_EQ(0, webkit_event.wheelTicksY);
522 EXPECT_EQ(blink::WebPointerProperties::PointerType::Mouse,
523 webkit_event.pointerType);
524 EXPECT_EQ(0, webkit_event.tiltX);
525 EXPECT_EQ(0, webkit_event.tiltY);
526 EXPECT_TRUE(std::isnan(webkit_event.force));
527 EXPECT_EQ(123, webkit_event.x);
528 EXPECT_EQ(123, webkit_event.windowX);
529 EXPECT_EQ(321, webkit_event.y);
530 EXPECT_EQ(321, webkit_event.windowY);
531 }
532 } 504 }
533 505
534 TEST(WebInputEventTest, KeyEvent) { 506 TEST(WebInputEventTest, KeyEvent) {
535 struct { 507 struct {
536 ui::KeyEvent event; 508 ui::KeyEvent event;
537 blink::WebInputEvent::Type web_type; 509 blink::WebInputEvent::Type web_type;
538 int web_modifiers; 510 int web_modifiers;
539 } tests[] = { 511 } tests[] = {
540 {ui::KeyEvent(ui::ET_KEY_PRESSED, ui::VKEY_A, ui::EF_NONE), 512 {ui::KeyEvent(ui::ET_KEY_PRESSED, ui::VKEY_A, ui::EF_NONE),
541 blink::WebInputEvent::RawKeyDown, 0x0}, 513 blink::WebInputEvent::RawKeyDown, 0x0},
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
601 ASSERT_EQ(tests[i].web_type, web_event.type); 573 ASSERT_EQ(tests[i].web_type, web_event.type);
602 ASSERT_EQ(tests[i].web_modifiers, web_event.modifiers); 574 ASSERT_EQ(tests[i].web_modifiers, web_event.modifiers);
603 ASSERT_EQ(tests[i].location.x(), web_event.x); 575 ASSERT_EQ(tests[i].location.x(), web_event.x);
604 ASSERT_EQ(tests[i].location.y(), web_event.y); 576 ASSERT_EQ(tests[i].location.y(), web_event.y);
605 ASSERT_EQ(tests[i].screen_location.x(), web_event.globalX); 577 ASSERT_EQ(tests[i].screen_location.x(), web_event.globalX);
606 ASSERT_EQ(tests[i].screen_location.y(), web_event.globalY); 578 ASSERT_EQ(tests[i].screen_location.y(), web_event.globalY);
607 } 579 }
608 } 580 }
609 581
610 } // namespace ui 582 } // namespace ui
OLDNEW
« no previous file with comments | « ui/events/blink/web_input_event_builders_win.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698