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

Unified Diff: cc/layers/layer_unittest.cc

Issue 1639363002: Move have_wheel_event_handlers to WebLayerTreeView. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase (resolve scroll blocks removal) conflicts Created 4 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/layer_unittest.cc
diff --git a/cc/layers/layer_unittest.cc b/cc/layers/layer_unittest.cc
index aa794b9d89939bac859ca5c1cb1be00c986897bf..c071596f87d57579664134533831ad76558282f7 100644
--- a/cc/layers/layer_unittest.cc
+++ b/cc/layers/layer_unittest.cc
@@ -134,8 +134,6 @@ class LayerSerializationTest : public testing::Test {
EXPECT_EQ(src->masks_to_bounds_, dest->masks_to_bounds_);
EXPECT_EQ(src->main_thread_scrolling_reasons_,
dest->main_thread_scrolling_reasons_);
- EXPECT_EQ(src->have_wheel_event_handlers_,
- dest->have_wheel_event_handlers_);
EXPECT_EQ(src->have_scroll_event_handlers_,
dest->have_scroll_event_handlers_);
EXPECT_EQ(src->non_fast_scrollable_region_,
@@ -251,7 +249,6 @@ class LayerSerializationTest : public testing::Test {
layer->masks_to_bounds_ = true;
layer->main_thread_scrolling_reasons_ =
MainThreadScrollingReason::kNotScrollingOnMain;
- layer->have_wheel_event_handlers_ = true;
layer->have_scroll_event_handlers_ = false;
layer->non_fast_scrollable_region_ = Region(gfx::Rect(5, 1, 14, 3));
layer->touch_event_handler_region_ = Region(gfx::Rect(3, 14, 1, 5));
@@ -301,7 +298,6 @@ class LayerSerializationTest : public testing::Test {
layer->masks_to_bounds_ = !layer->masks_to_bounds_;
layer->main_thread_scrolling_reasons_ =
MainThreadScrollingReason::kHasBackgroundAttachmentFixedObjects;
- layer->have_wheel_event_handlers_ = !layer->have_wheel_event_handlers_;
layer->have_scroll_event_handlers_ = !layer->have_scroll_event_handlers_;
layer->non_fast_scrollable_region_ = Region(gfx::Rect(5, 1, 14, 3));
layer->touch_event_handler_region_ = Region(gfx::Rect(3, 14, 1, 5));
@@ -970,7 +966,6 @@ TEST_F(LayerTest, CheckPropertyChangeCausesCorrectBehavior) {
MainThreadScrollingReason::kEventHandlers));
EXPECT_SET_NEEDS_COMMIT(1, test_layer->SetNonFastScrollableRegion(
Region(gfx::Rect(1, 1, 2, 2))));
- EXPECT_SET_NEEDS_COMMIT(1, test_layer->SetHaveWheelEventHandlers(true));
EXPECT_SET_NEEDS_COMMIT(1, test_layer->SetHaveScrollEventHandlers(true));
EXPECT_SET_NEEDS_COMMIT(1, test_layer->SetTransform(
gfx::Transform(0.0, 0.0, 0.0, 0.0, 0.0, 0.0)));

Powered by Google App Engine
This is Rietveld 408576698