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

Unified Diff: cc/layers/layer_unittest.cc

Issue 1648293003: Fix smooth scroll jump when switching scroll handling between MT and CC (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: skip irrelevant test on mac Created 4 years, 10 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/layers/layer_impl.h ('k') | third_party/WebKit/LayoutTests/TestExpectations » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layers/layer_unittest.cc
diff --git a/cc/layers/layer_unittest.cc b/cc/layers/layer_unittest.cc
index a1d18ae6771fffcd4436e9c28110feeb6b10d0e4..1b10a914c3441deeeab8f3970345f9b9214a0a78 100644
--- a/cc/layers/layer_unittest.cc
+++ b/cc/layers/layer_unittest.cc
@@ -1547,6 +1547,57 @@ TEST_F(LayerTest, CheckSetNeedsDisplayCausesCorrectBehavior) {
EXPECT_TRUE(test_layer->NeedsDisplayForTesting());
}
+TEST_F(LayerTest, TestSettingMainThreadScrollingReason) {
+ scoped_refptr<Layer> test_layer = Layer::Create(layer_settings_);
+ EXPECT_SET_NEEDS_FULL_TREE_SYNC(1,
+ layer_tree_host_->SetRootLayer(test_layer));
+ EXPECT_SET_NEEDS_COMMIT(1, test_layer->SetIsDrawable(true));
+
+ // sanity check of initial test condition
+ EXPECT_FALSE(test_layer->NeedsDisplayForTesting());
+
+ uint32_t reasons = 0, reasons_to_clear = 0, reasons_after_clearing = 0;
+ reasons |= MainThreadScrollingReason::kEventHandlers;
+ reasons |= MainThreadScrollingReason::kContinuingMainThreadScroll;
+ reasons |= MainThreadScrollingReason::kScrollbarScrolling;
+
+ reasons_to_clear |= MainThreadScrollingReason::kContinuingMainThreadScroll;
+ reasons_to_clear |= MainThreadScrollingReason::kThreadedScrollingDisabled;
+
+ reasons_after_clearing |= MainThreadScrollingReason::kEventHandlers;
+ reasons_after_clearing |= MainThreadScrollingReason::kScrollbarScrolling;
+
+ // Check that the reasons are added correctly.
+ EXPECT_SET_NEEDS_COMMIT(1, test_layer->AddMainThreadScrollingReasons(
+ MainThreadScrollingReason::kEventHandlers));
+ EXPECT_SET_NEEDS_COMMIT(
+ 1, test_layer->AddMainThreadScrollingReasons(
+ MainThreadScrollingReason::kContinuingMainThreadScroll));
+ EXPECT_SET_NEEDS_COMMIT(1,
+ test_layer->AddMainThreadScrollingReasons(
+ MainThreadScrollingReason::kScrollbarScrolling));
+ EXPECT_EQ(reasons, test_layer->main_thread_scrolling_reasons());
+
+ // Check that the reasons can be selectively cleared.
+ EXPECT_SET_NEEDS_COMMIT(
+ 1, test_layer->ClearMainThreadScrollingReasons(reasons_to_clear));
+ EXPECT_EQ(reasons_after_clearing,
+ test_layer->main_thread_scrolling_reasons());
+
+ // Check that clearing non-set reasons doesn't set needs commit.
+ reasons_to_clear = 0;
+ reasons_to_clear |= MainThreadScrollingReason::kThreadedScrollingDisabled;
+ reasons_to_clear |= MainThreadScrollingReason::kNoScrollingLayer;
+ EXPECT_SET_NEEDS_COMMIT(
+ 0, test_layer->ClearMainThreadScrollingReasons(reasons_to_clear));
+ EXPECT_EQ(reasons_after_clearing,
+ test_layer->main_thread_scrolling_reasons());
+
+ // Check that adding an existing condition doesn't set needs commit.
+ EXPECT_SET_NEEDS_COMMIT(0, test_layer->AddMainThreadScrollingReasons(
+ MainThreadScrollingReason::kEventHandlers));
+}
+
TEST_F(LayerTest, CheckPropertyChangeCausesCorrectBehavior) {
scoped_refptr<Layer> test_layer = Layer::Create(layer_settings_);
EXPECT_SET_NEEDS_FULL_TREE_SYNC(
« no previous file with comments | « cc/layers/layer_impl.h ('k') | third_party/WebKit/LayoutTests/TestExpectations » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698