| Index: cc/trees/layer_tree_host.cc
|
| diff --git a/cc/trees/layer_tree_host.cc b/cc/trees/layer_tree_host.cc
|
| index 1b68c4607bc7dda5963cb42886f964f5b69ae5d7..dfacf9e00f171ca238f566a22b205ce6fcc62f9f 100644
|
| --- a/cc/trees/layer_tree_host.cc
|
| +++ b/cc/trees/layer_tree_host.cc
|
| @@ -142,6 +142,7 @@ LayerTreeHost::LayerTreeHost(InitParams* params, CompositorMode mode)
|
| gpu_rasterization_histogram_recorded_(false),
|
| background_color_(SK_ColorWHITE),
|
| has_transparent_background_(false),
|
| + have_wheel_event_handlers_(false),
|
| did_complete_scale_animation_(false),
|
| in_paint_layer_contents_(false),
|
| id_(s_layer_tree_host_sequence_number.GetNext() + 1),
|
| @@ -321,6 +322,7 @@ void LayerTreeHost::FinishCommitOnImplThread(LayerTreeHostImpl* host_impl) {
|
|
|
| sync_tree->set_background_color(background_color_);
|
| sync_tree->set_has_transparent_background(has_transparent_background_);
|
| + sync_tree->set_have_wheel_event_handlers(have_wheel_event_handlers_);
|
|
|
| if (page_scale_layer_.get() && inner_viewport_scroll_layer_.get()) {
|
| sync_tree->SetViewportLayersFromIds(
|
| @@ -1034,6 +1036,14 @@ void LayerTreeHost::RegisterSelection(const LayerSelection& selection) {
|
| SetNeedsCommit();
|
| }
|
|
|
| +void LayerTreeHost::SetHaveWheelEventHandlers(bool have_event_handlers) {
|
| + if (have_wheel_event_handlers_ == have_event_handlers)
|
| + return;
|
| +
|
| + have_wheel_event_handlers_ = have_event_handlers;
|
| + SetNeedsCommit();
|
| +}
|
| +
|
| int LayerTreeHost::ScheduleMicroBenchmark(
|
| const std::string& benchmark_name,
|
| scoped_ptr<base::Value> value,
|
| @@ -1348,6 +1358,7 @@ void LayerTreeHost::ToProtobufForCommit(proto::LayerTreeHost* proto) const {
|
| content_is_suitable_for_gpu_rasterization_);
|
| proto->set_background_color(background_color_);
|
| proto->set_has_transparent_background(has_transparent_background_);
|
| + proto->set_have_wheel_event_handlers(have_wheel_event_handlers_);
|
| proto->set_in_paint_layer_contents(in_paint_layer_contents_);
|
| proto->set_id(id_);
|
| proto->set_next_commit_forces_redraw(next_commit_forces_redraw_);
|
| @@ -1412,6 +1423,7 @@ void LayerTreeHost::FromProtobufForCommit(const proto::LayerTreeHost& proto) {
|
| proto.content_is_suitable_for_gpu_rasterization();
|
| background_color_ = proto.background_color();
|
| has_transparent_background_ = proto.has_transparent_background();
|
| + have_wheel_event_handlers_ = proto.have_wheel_event_handlers();
|
| in_paint_layer_contents_ = proto.in_paint_layer_contents();
|
| id_ = proto.id();
|
| next_commit_forces_redraw_ = proto.next_commit_forces_redraw();
|
|
|