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

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: Fix ash/display unittests 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
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..faa982525fed35f4fe97a953f8ef59842eef6fbf 100644
--- a/ash/display/root_window_transformers_unittest.cc
+++ b/ash/display/root_window_transformers_unittest.cc
@@ -300,9 +300,9 @@ TEST_F(RootWindowTransformersTest, MAYBE_TouchScaleAndMagnify) {
// With device scale factor = 2, ordinal_offset * 2 = offset.
oshima 2013/10/03 09:23:43 ditto
EXPECT_FLOAT_EQ(event_handler.scroll_x_offset(),
- event_handler.scroll_x_offset_ordinal() * 2 * 2.5f);
+ event_handler.scroll_x_offset_ordinal() * 2.5f);
EXPECT_FLOAT_EQ(event_handler.scroll_y_offset(),
- event_handler.scroll_y_offset_ordinal() * 2 * 2.5f);
+ event_handler.scroll_y_offset_ordinal() * 2.5f);
magnifier->SetEnabled(false);
Shell::GetInstance()->RemovePreTargetHandler(&event_handler);

Powered by Google App Engine
This is Rietveld 408576698