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

Unified Diff: cc/trees/layer_tree_host_unittest_scroll.cc

Issue 22567004: Ignore should-scroll-on-main-thread if main frame is not scrollable (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 4 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 303e92496b4d39551075827a01b34f0af87f19c8..bd14a13c77d738c97edb02e4f9f4071fa508f4f6 100644
--- a/cc/trees/layer_tree_host_unittest_scroll.cc
+++ b/cc/trees/layer_tree_host_unittest_scroll.cc
@@ -846,15 +846,21 @@ class LayerTreeHostScrollTestScrollZeroMaxScrollOffset
root->SetMaxScrollOffset(gfx::Vector2d(100, 100));
EXPECT_EQ(InputHandler::ScrollStarted,
- root->TryScroll(gfx::PointF(0.0f, 1.0f), InputHandler::Gesture));
+ root->TryScroll(gfx::PointF(0.0f, 1.0f),
+ InputHandler::Gesture,
+ true));
root->SetMaxScrollOffset(gfx::Vector2d(0, 0));
EXPECT_EQ(InputHandler::ScrollIgnored,
- root->TryScroll(gfx::PointF(0.0f, 1.0f), InputHandler::Gesture));
+ root->TryScroll(gfx::PointF(0.0f, 1.0f),
+ InputHandler::Gesture,
+ true));
root->SetMaxScrollOffset(gfx::Vector2d(-100, -100));
EXPECT_EQ(InputHandler::ScrollIgnored,
- root->TryScroll(gfx::PointF(0.0f, 1.0f), InputHandler::Gesture));
+ root->TryScroll(gfx::PointF(0.0f, 1.0f),
+ InputHandler::Gesture,
+ true));
EndTest();
}
« 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