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

Unified Diff: ash/display/root_window_transformers_unittest.cc

Issue 25373005: Do not transform scroll event ordinal values (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Oops... fix unittest again due to magnifier .. Created 7 years, 2 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/display/display_controller_unittest.cc ('k') | ui/events/event.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/display/root_window_transformers_unittest.cc
diff --git a/ash/display/root_window_transformers_unittest.cc b/ash/display/root_window_transformers_unittest.cc
index d426a63d82f31a330d3f12f0c50ad2ae2de977c0..b30003645cd2a44fc529d3610e5e84157784e031 100644
--- a/ash/display/root_window_transformers_unittest.cc
+++ b/ash/display/root_window_transformers_unittest.cc
@@ -298,11 +298,11 @@ TEST_F(RootWindowTransformersTest, MAYBE_TouchScaleAndMagnify) {
base::TimeDelta::FromMilliseconds(100),
10.0, 1.0, 5, 1);
- // With device scale factor = 2, ordinal_offset * 2 = offset.
+ // ordinal_offset is invariant to the device scale factor.
EXPECT_FLOAT_EQ(event_handler.scroll_x_offset(),
- event_handler.scroll_x_offset_ordinal() * 2 * 2.5f);
+ event_handler.scroll_x_offset_ordinal());
EXPECT_FLOAT_EQ(event_handler.scroll_y_offset(),
- event_handler.scroll_y_offset_ordinal() * 2 * 2.5f);
+ event_handler.scroll_y_offset_ordinal());
magnifier->SetEnabled(false);
Shell::GetInstance()->RemovePreTargetHandler(&event_handler);
« no previous file with comments | « ash/display/display_controller_unittest.cc ('k') | ui/events/event.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698