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

Unified Diff: cc/layers/layer_unittest.cc

Issue 2360113003: Remove cc's MainThreadScrollingReason::kEventHandlers (Closed)
Patch Set: Revert change to kMainThreadScrollingReasonCount Created 4 years, 3 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/input/main_thread_scrolling_reason.h ('k') | cc/trees/layer_tree_host_unittest_scroll.cc » ('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 6662c03f345b12ea80401f270fad5e43a6782d29..b29bfec72f4fb590f7da5481f370bbba57ab794b 100644
--- a/cc/layers/layer_unittest.cc
+++ b/cc/layers/layer_unittest.cc
@@ -1664,19 +1664,20 @@ TEST_F(LayerTest, TestSettingMainThreadScrollingReason) {
EXPECT_FALSE(test_layer->NeedsDisplayForTesting());
uint32_t reasons = 0, reasons_to_clear = 0, reasons_after_clearing = 0;
- reasons |= MainThreadScrollingReason::kEventHandlers;
+ reasons |= MainThreadScrollingReason::kNonFastScrollableRegion;
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::kNonFastScrollableRegion;
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::kNonFastScrollableRegion));
EXPECT_SET_NEEDS_COMMIT(
1, test_layer->AddMainThreadScrollingReasons(
MainThreadScrollingReason::kContinuingMainThreadScroll));
@@ -1701,8 +1702,9 @@ TEST_F(LayerTest, TestSettingMainThreadScrollingReason) {
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));
+ EXPECT_SET_NEEDS_COMMIT(
+ 0, test_layer->AddMainThreadScrollingReasons(
+ MainThreadScrollingReason::kNonFastScrollableRegion));
}
TEST_F(LayerTest, CheckPropertyChangeCausesCorrectBehavior) {
@@ -1734,8 +1736,9 @@ TEST_F(LayerTest, CheckPropertyChangeCausesCorrectBehavior) {
EXPECT_SET_NEEDS_COMMIT(1, test_layer->SetUserScrollable(true, false));
EXPECT_SET_NEEDS_COMMIT(1, test_layer->SetScrollOffset(
gfx::ScrollOffset(10, 10)));
- EXPECT_SET_NEEDS_COMMIT(1, test_layer->AddMainThreadScrollingReasons(
- MainThreadScrollingReason::kEventHandlers));
+ EXPECT_SET_NEEDS_COMMIT(
+ 1, test_layer->AddMainThreadScrollingReasons(
+ MainThreadScrollingReason::kNonFastScrollableRegion));
EXPECT_SET_NEEDS_COMMIT(1, test_layer->SetNonFastScrollableRegion(
Region(gfx::Rect(1, 1, 2, 2))));
EXPECT_SET_NEEDS_COMMIT(1, test_layer->SetTransform(
« no previous file with comments | « cc/input/main_thread_scrolling_reason.h ('k') | cc/trees/layer_tree_host_unittest_scroll.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698