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

Unified Diff: cc/trees/layer_tree_host_impl.cc

Issue 13844021: Move compositor thread input handling logic into content (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix win component build Created 7 years, 8 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/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 f8230e79175d46bfa92ffaab7b8143c01889e6dd..718095d46ba65f14c81c1b3ad14eb75a505416b9 100644
--- a/cc/trees/layer_tree_host_impl.cc
+++ b/cc/trees/layer_tree_host_impl.cc
@@ -279,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);
@@ -722,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 &&
@@ -1468,6 +1475,11 @@ bool LayerTreeHostImpl::EnsureRenderSurfaceLayerList() {
return !active_tree_->RenderSurfaceLayerList().empty();
}
+void LayerTreeHostImpl::BindToClient(InputHandlerClient* client) {
danakj 2013/05/06 16:33:39 If this is going to take ownership of the client*,
+ DCHECK(input_handler_client_ == NULL);
+ input_handler_client_.reset(client);
+}
+
InputHandler::ScrollStatus LayerTreeHostImpl::ScrollBegin(
gfx::Point viewport_point, InputHandler::ScrollInputType type) {
TRACE_EVENT0("cc", "LayerTreeHostImpl::ScrollBegin");

Powered by Google App Engine
This is Rietveld 408576698