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

Unified Diff: cc/trees/layer_tree_host_unittest_scroll.cc

Issue 1775013004: Rename InputHandler::GESTURE to InputHandler::TOUCHSCREEN (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master_wheel_regression_3
Patch Set: Created 4 years, 9 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 | « cc/trees/layer_tree_host_impl_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/trees/layer_tree_host_unittest_scroll.cc
diff --git a/cc/trees/layer_tree_host_unittest_scroll.cc b/cc/trees/layer_tree_host_unittest_scroll.cc
index c3dc75275aae38a18aec8fde3caf87bc671213e8..31f0307be09fd3271017d9ee7ec946a7d890d2ef 100644
--- a/cc/trees/layer_tree_host_unittest_scroll.cc
+++ b/cc/trees/layer_tree_host_unittest_scroll.cc
@@ -619,7 +619,7 @@ class LayerTreeHostScrollTestCaseWithChild : public LayerTreeHostScrollTest {
gfx::ToCeiledPoint(expected_scroll_layer_impl->position() -
gfx::Vector2dF(0.5f, 0.5f));
InputHandler::ScrollStatus status = impl->ScrollBegin(
- BeginState(scroll_point).get(), InputHandler::GESTURE);
+ BeginState(scroll_point).get(), InputHandler::TOUCHSCREEN);
EXPECT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD, status.thread);
impl->ScrollBy(UpdateState(gfx::Point(), scroll_amount_).get());
LayerImpl* scrolling_layer = impl->CurrentlyScrollingLayer();
@@ -1055,7 +1055,7 @@ class LayerTreeHostScrollTestScrollZeroMaxScrollOffset
scroll_tree.Node(scroll_layer->scroll_tree_index());
InputHandler::ScrollStatus status =
- impl->TryScroll(gfx::PointF(0.0f, 1.0f), InputHandler::GESTURE,
+ impl->TryScroll(gfx::PointF(0.0f, 1.0f), InputHandler::TOUCHSCREEN,
scroll_tree, scroll_node);
EXPECT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD, status.thread);
@@ -1068,7 +1068,7 @@ class LayerTreeHostScrollTestScrollZeroMaxScrollOffset
impl->active_tree()->BuildPropertyTreesForTesting();
scroll_tree = impl->active_tree()->property_trees()->scroll_tree;
scroll_node = scroll_tree.Node(scroll_layer->scroll_tree_index());
- status = impl->TryScroll(gfx::PointF(0.0f, 1.0f), InputHandler::GESTURE,
+ status = impl->TryScroll(gfx::PointF(0.0f, 1.0f), InputHandler::TOUCHSCREEN,
scroll_tree, scroll_node);
EXPECT_EQ(InputHandler::SCROLL_IGNORED, status.thread);
EXPECT_EQ(MainThreadScrollingReason::kNotScrollable,
@@ -1080,7 +1080,7 @@ class LayerTreeHostScrollTestScrollZeroMaxScrollOffset
impl->active_tree()->BuildPropertyTreesForTesting();
scroll_tree = impl->active_tree()->property_trees()->scroll_tree;
scroll_node = scroll_tree.Node(scroll_layer->scroll_tree_index());
- status = impl->TryScroll(gfx::PointF(0.0f, 1.0f), InputHandler::GESTURE,
+ status = impl->TryScroll(gfx::PointF(0.0f, 1.0f), InputHandler::TOUCHSCREEN,
scroll_tree, scroll_node);
EXPECT_EQ(InputHandler::SCROLL_IGNORED, status.thread);
EXPECT_EQ(MainThreadScrollingReason::kNotScrollable,
@@ -1124,13 +1124,14 @@ class LayerTreeHostScrollTestScrollNonDrawnLayer
// checking whether the screen space point is inside the non-fast
// scrollable region.
- InputHandler::ScrollStatus status = impl->TryScroll(
- gfx::PointF(1.f, 1.f), InputHandler::GESTURE, scroll_tree, scroll_node);
+ InputHandler::ScrollStatus status =
+ impl->TryScroll(gfx::PointF(1.f, 1.f), InputHandler::TOUCHSCREEN,
+ scroll_tree, scroll_node);
EXPECT_EQ(InputHandler::SCROLL_ON_MAIN_THREAD, status.thread);
EXPECT_EQ(MainThreadScrollingReason::kNonFastScrollableRegion,
status.main_thread_scrolling_reasons);
- status = impl->TryScroll(gfx::PointF(21.f, 21.f), InputHandler::GESTURE,
+ status = impl->TryScroll(gfx::PointF(21.f, 21.f), InputHandler::TOUCHSCREEN,
scroll_tree, scroll_node);
EXPECT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD, status.thread);
EXPECT_EQ(MainThreadScrollingReason::kNotScrollingOnMain,
@@ -1171,13 +1172,13 @@ class LayerTreeHostScrollTestImplScrollUnderMainThreadScrollingParent
scroll_tree.Node(outer_scroll_layer->scroll_tree_index());
InputHandler::ScrollStatus status =
- impl->TryScroll(gfx::PointF(1.f, 1.f), InputHandler::GESTURE,
+ impl->TryScroll(gfx::PointF(1.f, 1.f), InputHandler::TOUCHSCREEN,
scroll_tree, inner_scroll_node);
EXPECT_EQ(InputHandler::SCROLL_ON_MAIN_THREAD, status.thread);
EXPECT_EQ(MainThreadScrollingReason::kEventHandlers,
status.main_thread_scrolling_reasons);
- status = impl->TryScroll(gfx::PointF(1.f, 1.f), InputHandler::GESTURE,
+ status = impl->TryScroll(gfx::PointF(1.f, 1.f), InputHandler::TOUCHSCREEN,
scroll_tree, outer_scroll_node);
EXPECT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD, status.thread);
EXPECT_EQ(MainThreadScrollingReason::kNotScrollingOnMain,
« no previous file with comments | « cc/trees/layer_tree_host_impl_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698