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

Unified Diff: cc/trees/layer_tree_host_impl.h

Issue 13844021: Move compositor thread input handling logic into content (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 7 years, 7 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
« no previous file with comments | « cc/trees/layer_tree_host_client.h ('k') | cc/trees/layer_tree_host_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/trees/layer_tree_host_impl.h
diff --git a/cc/trees/layer_tree_host_impl.h b/cc/trees/layer_tree_host_impl.h
index ab83d99c46a0bd88fe56092a0e569aa1565ffdd6..b4d9757c4e8ea12088076485eaa688f6960df4c5 100644
--- a/cc/trees/layer_tree_host_impl.h
+++ b/cc/trees/layer_tree_host_impl.h
@@ -83,11 +83,13 @@ class LayerTreeHostImplClient {
// LayerTreeHostImpl owns the LayerImpl trees as well as associated rendering
// state.
-class CC_EXPORT LayerTreeHostImpl : public InputHandler,
- public RendererClient,
- public TileManagerClient,
- public OutputSurfaceClient,
- public TopControlsManagerClient {
+class CC_EXPORT LayerTreeHostImpl
+ : public InputHandler,
+ public RendererClient,
+ public TileManagerClient,
+ public OutputSurfaceClient,
+ public TopControlsManagerClient,
+ public base::SupportsWeakPtr<LayerTreeHostImpl> {
public:
static scoped_ptr<LayerTreeHostImpl> Create(
const LayerTreeSettings& settings,
@@ -97,6 +99,7 @@ class CC_EXPORT LayerTreeHostImpl : public InputHandler,
virtual ~LayerTreeHostImpl();
// InputHandler implementation
+ virtual void BindToClient(InputHandlerClient* client) OVERRIDE;
virtual InputHandler::ScrollStatus ScrollBegin(
gfx::Point viewport_point,
InputHandler::ScrollInputType type) OVERRIDE;
@@ -154,6 +157,7 @@ class CC_EXPORT LayerTreeHostImpl : public InputHandler,
virtual void Animate(base::TimeTicks monotonic_time,
base::Time wall_clock_time);
virtual void UpdateAnimationState(bool start_ready_animations);
+ void MainThreadHasStoppedFlinging();
void UpdateBackgroundAnimateTicking(bool should_background_tick);
void SetViewportDamage(gfx::Rect damage_rect);
@@ -436,6 +440,7 @@ class CC_EXPORT LayerTreeHostImpl : public InputHandler,
// by the next sync from the main thread.
scoped_ptr<LayerTreeImpl> recycle_tree_;
+ InputHandlerClient* input_handler_client_;
bool did_lock_scrolling_layer_;
bool should_bubble_scrolls_;
bool wheel_scrolling_;
« no previous file with comments | « cc/trees/layer_tree_host_client.h ('k') | cc/trees/layer_tree_host_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698