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

Unified Diff: cc/layers/layer.cc

Issue 1639363002: Move have_wheel_event_handlers to WebLayerTreeView. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix tests 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.cc
diff --git a/cc/layers/layer.cc b/cc/layers/layer.cc
index 2519daa55636f354fdef38a564a7d21d0b868dcf..efd44a2419f5a3a67a19a00971993b0735b15e3e 100644
--- a/cc/layers/layer.cc
+++ b/cc/layers/layer.cc
@@ -70,7 +70,6 @@ Layer::Layer(const LayerSettings& settings)
main_thread_scrolling_reasons_(
MainThreadScrollingReason::kNotScrollingOnMain),
should_flatten_transform_from_property_tree_(false),
- have_wheel_event_handlers_(false),
have_scroll_event_handlers_(false),
user_scrollable_horizontal_(true),
user_scrollable_vertical_(true),
@@ -968,15 +967,6 @@ void Layer::ClearMainThreadScrollingReasons() {
SetNeedsCommit();
}
-void Layer::SetHaveWheelEventHandlers(bool have_wheel_event_handlers) {
- DCHECK(IsPropertyChangeAllowed());
- if (have_wheel_event_handlers_ == have_wheel_event_handlers)
- return;
-
- have_wheel_event_handlers_ = have_wheel_event_handlers;
- SetNeedsCommit();
-}
-
void Layer::SetHaveScrollEventHandlers(bool have_scroll_event_handlers) {
DCHECK(IsPropertyChangeAllowed());
if (have_scroll_event_handlers_ == have_scroll_event_handlers)
@@ -1210,7 +1200,6 @@ void Layer::PushPropertiesTo(LayerImpl* layer) {
layer->SetBackgroundFilters(background_filters());
layer->SetMasksToBounds(masks_to_bounds_);
layer->set_main_thread_scrolling_reasons(main_thread_scrolling_reasons_);
- layer->SetHaveWheelEventHandlers(have_wheel_event_handlers_);
layer->SetHaveScrollEventHandlers(have_scroll_event_handlers_);
layer->SetNonFastScrollableRegion(non_fast_scrollable_region_);
layer->SetTouchEventHandlerRegion(touch_event_handler_region_);
@@ -1481,7 +1470,6 @@ void Layer::LayerSpecificPropertiesToProto(proto::LayerProperties* proto) {
base->set_masks_to_bounds(masks_to_bounds_);
base->set_main_thread_scrolling_reasons(main_thread_scrolling_reasons_);
- base->set_have_wheel_event_handlers(have_wheel_event_handlers_);
base->set_have_scroll_event_handlers(have_scroll_event_handlers_);
RegionToProto(non_fast_scrollable_region_,
base->mutable_non_fast_scrollable_region());
@@ -1567,7 +1555,6 @@ void Layer::FromLayerSpecificPropertiesProto(
has_render_surface_ = base.has_render_surface();
masks_to_bounds_ = base.masks_to_bounds();
main_thread_scrolling_reasons_ = base.main_thread_scrolling_reasons();
- have_wheel_event_handlers_ = base.have_wheel_event_handlers();
have_scroll_event_handlers_ = base.have_scroll_event_handlers();
non_fast_scrollable_region_ =
RegionFromProto(base.non_fast_scrollable_region());

Powered by Google App Engine
This is Rietveld 408576698