Index: cc/trees/layer_tree_host_impl.cc |
diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc |
index a3cf0d3f288c4128fcd1d3ec83beb3236a6dc610..5cc8628f56bce0b8163c96b8128498949d1a7e21 100644 |
--- a/cc/trees/layer_tree_host_impl.cc |
+++ b/cc/trees/layer_tree_host_impl.cc |
@@ -165,6 +165,7 @@ LayerTreeHostImpl::LayerTreeHostImpl( |
RenderingStatsInstrumentation* rendering_stats_instrumentation) |
: client_(client), |
proxy_(proxy), |
+ input_handler_client_(NULL), |
did_lock_scrolling_layer_(false), |
should_bubble_scrolls_(false), |
wheel_scrolling_(false), |
@@ -278,6 +279,8 @@ bool LayerTreeHostImpl::CanDraw() { |
void LayerTreeHostImpl::Animate(base::TimeTicks monotonic_time, |
base::Time wall_clock_time) { |
+ if (input_handler_client_) |
+ input_handler_client_->Animate(monotonic_time); |
AnimatePageScale(monotonic_time); |
AnimateLayers(monotonic_time, wall_clock_time); |
AnimateScrollbars(monotonic_time); |
@@ -721,6 +724,11 @@ bool LayerTreeHostImpl::CalculateRenderPasses(FrameData* frame) { |
return draw_frame; |
} |
+void LayerTreeHostImpl::MainThreadHasStoppedFlinging() { |
+ if (input_handler_client_) |
+ input_handler_client_->MainThreadHasStoppedFlinging(); |
+} |
+ |
void LayerTreeHostImpl::UpdateBackgroundAnimateTicking( |
bool should_background_tick) { |
bool enabled = should_background_tick && |
@@ -1458,6 +1466,10 @@ bool LayerTreeHostImpl::EnsureRenderSurfaceLayerList() { |
return !active_tree_->RenderSurfaceLayerList().empty(); |
} |
+void LayerTreeHostImpl::BindToClient(InputHandlerClient* client) { |
+ input_handler_client_ = client; |
danakj
2013/05/01 19:20:43
DCHECK(input_handler_client_ == NULL) ?
|
+} |
+ |
InputHandler::ScrollStatus LayerTreeHostImpl::ScrollBegin( |
gfx::Point viewport_point, InputHandler::ScrollInputType type) { |
TRACE_EVENT0("cc", "LayerTreeHostImpl::ScrollBegin"); |