diff options
| author | sheckylin@chromium.org <sheckylin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-03 15:51:21 +0000 |
|---|---|---|
| committer | sheckylin@chromium.org <sheckylin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-03 15:51:21 +0000 |
| commit | fbe62501a48145e5619c915f8a61b4bb4a9c1564 (patch) | |
| tree | f3b2778aa829012b58ffb69b7bb41df4a6a5cb56 /ash/display | |
| parent | b4c6d81da9c57bce3b2385cc3b3cad447a1bc5aa (diff) | |
| download | chromium_src-fbe62501a48145e5619c915f8a61b4bb4a9c1564.zip chromium_src-fbe62501a48145e5619c915f8a61b4bb4a9c1564.tar.gz chromium_src-fbe62501a48145e5619c915f8a61b4bb4a9c1564.tar.bz2 | |
Do not transform scroll event ordinal values
We don't need to transform scroll event ordinal values anymore as
we now interpret them as DIPs across the whole stack. Otherwise,
high-DPI devices (e.g. Pixel) would see the overscroll sensitivity
downscaled by the device scale factor.
Contributed by sheckylin@chromium.org
BUG=300059
TEST=Make sure it takes roughly the same distance to scroll on the
touchpad to trigger the back/forward history navigation gesture on
both Pixel and other low-res devices.
Review URL: https://codereview.chromium.org/25373005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@226767 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/display')
| -rw-r--r-- | ash/display/display_controller_unittest.cc | 6 | ||||
| -rw-r--r-- | ash/display/root_window_transformers_unittest.cc | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/ash/display/display_controller_unittest.cc b/ash/display/display_controller_unittest.cc index 287b0e4..c2e3e7d 100644 --- a/ash/display/display_controller_unittest.cc +++ b/ash/display/display_controller_unittest.cc @@ -1148,11 +1148,11 @@ TEST_F(DisplayControllerTest, TouchScale) { 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_EQ(event_handler.scroll_x_offset(), - event_handler.scroll_x_offset_ordinal() * 2); + event_handler.scroll_x_offset_ordinal()); EXPECT_EQ(event_handler.scroll_y_offset(), - event_handler.scroll_y_offset_ordinal() * 2); + event_handler.scroll_y_offset_ordinal()); Shell::GetInstance()->RemovePreTargetHandler(&event_handler); } diff --git a/ash/display/root_window_transformers_unittest.cc b/ash/display/root_window_transformers_unittest.cc index d426a63..b300036 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); |