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

Unified Diff: cc/layers/scrollbar_layer_unittest.cc

Issue 784463002: Add initial CC support for scroll-blocks-on (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Merge with trunk Created 5 years, 11 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: cc/layers/scrollbar_layer_unittest.cc
diff --git a/cc/layers/scrollbar_layer_unittest.cc b/cc/layers/scrollbar_layer_unittest.cc
index 09de7d02cd634dfe9d01fa2958cf9d52d99e05f4..b24dcb1d1eecdabbd9043a5c08fd88b188efabdc 100644
--- a/cc/layers/scrollbar_layer_unittest.cc
+++ b/cc/layers/scrollbar_layer_unittest.cc
@@ -107,8 +107,8 @@ TEST(ScrollbarLayerTest, ShouldScrollNonOverlayOnMainThread) {
// responded to on the main thread as the compositor does not yet implement
// scrollbar scrolling.
EXPECT_EQ(InputHandler::ScrollOnMainThread,
- scrollbar_layer_impl->TryScroll(gfx::Point(0, 0),
- InputHandler::Gesture));
+ scrollbar_layer_impl->TryScroll(
+ gfx::Point(0, 0), InputHandler::Gesture, ScrollBlocksOnNone));
// Create and attach an overlay scrollbar.
scrollbar.reset(new FakeScrollbar(false, false, true));
@@ -121,8 +121,8 @@ TEST(ScrollbarLayerTest, ShouldScrollNonOverlayOnMainThread) {
// The user shouldn't be able to drag an overlay scrollbar and the scroll
// may be handled in the compositor.
EXPECT_EQ(InputHandler::ScrollIgnored,
- scrollbar_layer_impl->TryScroll(gfx::Point(0, 0),
- InputHandler::Gesture));
+ scrollbar_layer_impl->TryScroll(
+ gfx::Point(0, 0), InputHandler::Gesture, ScrollBlocksOnNone));
}
TEST(PaintedScrollbarLayerTest, ScrollOffsetSynchronization) {

Powered by Google App Engine
This is Rietveld 408576698