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

Side by Side Diff: content/browser/renderer_host/web_input_event_aura_unittest.cc

Issue 1617863002: Set the correct pressure for pointer events based on force (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove a typo Created 4 years, 10 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "content/browser/renderer_host/web_input_event_aura.h" 5 #include "content/browser/renderer_host/web_input_event_aura.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 407 matching lines...) Expand 10 before | Expand all | Expand 10 after
418 base::TimeDelta timestamp = ui::EventTimeForNow(); 418 base::TimeDelta timestamp = ui::EventTimeForNow();
419 ui::MouseEvent aura_event( 419 ui::MouseEvent aura_event(
420 ui::ET_MOUSE_PRESSED, gfx::Point(123, 321), gfx::Point(123, 321), 420 ui::ET_MOUSE_PRESSED, gfx::Point(123, 321), gfx::Point(123, 321),
421 timestamp, ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON); 421 timestamp, ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON);
422 blink::WebMouseEvent webkit_event = MakeWebMouseEvent(aura_event); 422 blink::WebMouseEvent webkit_event = MakeWebMouseEvent(aura_event);
423 423
424 EXPECT_EQ(blink::WebPointerProperties::PointerType::Mouse, 424 EXPECT_EQ(blink::WebPointerProperties::PointerType::Mouse,
425 webkit_event.pointerType); 425 webkit_event.pointerType);
426 EXPECT_EQ(0, webkit_event.tiltX); 426 EXPECT_EQ(0, webkit_event.tiltX);
427 EXPECT_EQ(0, webkit_event.tiltY); 427 EXPECT_EQ(0, webkit_event.tiltY);
428 EXPECT_FLOAT_EQ(0.0f, webkit_event.force); 428 EXPECT_TRUE(isnan(webkit_event.force));
429 EXPECT_EQ(123, webkit_event.x); 429 EXPECT_EQ(123, webkit_event.x);
430 EXPECT_EQ(123, webkit_event.windowX); 430 EXPECT_EQ(123, webkit_event.windowX);
431 EXPECT_EQ(321, webkit_event.y); 431 EXPECT_EQ(321, webkit_event.y);
432 EXPECT_EQ(321, webkit_event.windowY); 432 EXPECT_EQ(321, webkit_event.windowY);
433 } 433 }
434 { 434 {
435 // Stylus values for PointerDetails. 435 // Stylus values for PointerDetails.
436 base::TimeDelta timestamp = ui::EventTimeForNow(); 436 base::TimeDelta timestamp = ui::EventTimeForNow();
437 ui::MouseEvent aura_event( 437 ui::MouseEvent aura_event(
438 ui::ET_MOUSE_PRESSED, gfx::Point(123, 321), gfx::Point(123, 321), 438 ui::ET_MOUSE_PRESSED, gfx::Point(123, 321), gfx::Point(123, 321),
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
471 webkit_event.modifiers); 471 webkit_event.modifiers);
472 EXPECT_FLOAT_EQ(timestamp.InSecondsF(), webkit_event.timeStampSeconds); 472 EXPECT_FLOAT_EQ(timestamp.InSecondsF(), webkit_event.timeStampSeconds);
473 EXPECT_EQ(blink::WebMouseEvent::ButtonNone, webkit_event.button); 473 EXPECT_EQ(blink::WebMouseEvent::ButtonNone, webkit_event.button);
474 EXPECT_EQ(blink::WebInputEvent::MouseWheel, webkit_event.type); 474 EXPECT_EQ(blink::WebInputEvent::MouseWheel, webkit_event.type);
475 EXPECT_FLOAT_EQ(aura_event.x_offset() / 53.0f, webkit_event.wheelTicksX); 475 EXPECT_FLOAT_EQ(aura_event.x_offset() / 53.0f, webkit_event.wheelTicksX);
476 EXPECT_FLOAT_EQ(aura_event.y_offset() / 53.0f, webkit_event.wheelTicksY); 476 EXPECT_FLOAT_EQ(aura_event.y_offset() / 53.0f, webkit_event.wheelTicksY);
477 EXPECT_EQ(blink::WebPointerProperties::PointerType::Mouse, 477 EXPECT_EQ(blink::WebPointerProperties::PointerType::Mouse,
478 webkit_event.pointerType); 478 webkit_event.pointerType);
479 EXPECT_EQ(0, webkit_event.tiltX); 479 EXPECT_EQ(0, webkit_event.tiltX);
480 EXPECT_EQ(0, webkit_event.tiltY); 480 EXPECT_EQ(0, webkit_event.tiltY);
481 EXPECT_FLOAT_EQ(0.0f, webkit_event.force); 481 EXPECT_TRUE(isnan(webkit_event.force));
482 EXPECT_EQ(123, webkit_event.x); 482 EXPECT_EQ(123, webkit_event.x);
483 EXPECT_EQ(123, webkit_event.windowX); 483 EXPECT_EQ(123, webkit_event.windowX);
484 EXPECT_EQ(321, webkit_event.y); 484 EXPECT_EQ(321, webkit_event.y);
485 EXPECT_EQ(321, webkit_event.windowY); 485 EXPECT_EQ(321, webkit_event.windowY);
486 } 486 }
487 { 487 {
488 // Mouse wheel with shift and no x offset. 488 // Mouse wheel with shift and no x offset.
489 base::TimeDelta timestamp = ui::EventTimeForNow(); 489 base::TimeDelta timestamp = ui::EventTimeForNow();
490 ui::MouseWheelEvent aura_event( 490 ui::MouseWheelEvent aura_event(
491 gfx::Vector2d(0, -ui::MouseWheelEvent::kWheelDelta * 2), 491 gfx::Vector2d(0, -ui::MouseWheelEvent::kWheelDelta * 2),
492 gfx::Point(123, 321), gfx::Point(123, 321), timestamp, 492 gfx::Point(123, 321), gfx::Point(123, 321), timestamp,
493 ui::EF_SHIFT_DOWN, 0); 493 ui::EF_SHIFT_DOWN, 0);
494 blink::WebMouseWheelEvent webkit_event = MakeWebMouseWheelEvent(aura_event); 494 blink::WebMouseWheelEvent webkit_event = MakeWebMouseWheelEvent(aura_event);
495 EXPECT_EQ(ui::EventFlagsToWebEventModifiers(aura_event.flags()), 495 EXPECT_EQ(ui::EventFlagsToWebEventModifiers(aura_event.flags()),
496 webkit_event.modifiers); 496 webkit_event.modifiers);
497 EXPECT_FLOAT_EQ(timestamp.InSecondsF(), webkit_event.timeStampSeconds); 497 EXPECT_FLOAT_EQ(timestamp.InSecondsF(), webkit_event.timeStampSeconds);
498 EXPECT_EQ(blink::WebMouseEvent::ButtonNone, webkit_event.button); 498 EXPECT_EQ(blink::WebMouseEvent::ButtonNone, webkit_event.button);
499 EXPECT_EQ(blink::WebInputEvent::MouseWheel, webkit_event.type); 499 EXPECT_EQ(blink::WebInputEvent::MouseWheel, webkit_event.type);
500 EXPECT_FLOAT_EQ(aura_event.y_offset() / 53.0f, webkit_event.wheelTicksX); 500 EXPECT_FLOAT_EQ(aura_event.y_offset() / 53.0f, webkit_event.wheelTicksX);
501 EXPECT_FLOAT_EQ(0, webkit_event.wheelTicksY); 501 EXPECT_FLOAT_EQ(0, webkit_event.wheelTicksY);
502 EXPECT_EQ(blink::WebPointerProperties::PointerType::Mouse, 502 EXPECT_EQ(blink::WebPointerProperties::PointerType::Mouse,
503 webkit_event.pointerType); 503 webkit_event.pointerType);
504 EXPECT_EQ(0, webkit_event.tiltX); 504 EXPECT_EQ(0, webkit_event.tiltX);
505 EXPECT_EQ(0, webkit_event.tiltY); 505 EXPECT_EQ(0, webkit_event.tiltY);
506 EXPECT_FLOAT_EQ(0.0f, webkit_event.force); 506 EXPECT_TRUE(isnan(webkit_event.force));
507 EXPECT_EQ(123, webkit_event.x); 507 EXPECT_EQ(123, webkit_event.x);
508 EXPECT_EQ(123, webkit_event.windowX); 508 EXPECT_EQ(123, webkit_event.windowX);
509 EXPECT_EQ(321, webkit_event.y); 509 EXPECT_EQ(321, webkit_event.y);
510 EXPECT_EQ(321, webkit_event.windowY); 510 EXPECT_EQ(321, webkit_event.windowY);
511 } 511 }
512 } 512 }
513 513
514 } // namespace content 514 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698