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

Unified Diff: cc/layers/layer.h

Issue 1010663002: CC Animations: Redirect all compositor animation requests to AnimationHost. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@introduce
Patch Set: Add ported unittests. Created 5 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/layers/layer.h
diff --git a/cc/layers/layer.h b/cc/layers/layer.h
index 4eb5e8173a6580bb152dec52c87a7ca359e12ab9..b25fd74d9892a657cb21ba275e2503278fecdf04 100644
--- a/cc/layers/layer.h
+++ b/cc/layers/layer.h
@@ -62,6 +62,7 @@ class LayerImpl;
class LayerTreeHost;
class LayerTreeHostCommon;
class LayerTreeImpl;
+class LayerTreeSettings;
class PriorityCalculator;
class RenderingStatsInstrumentation;
class ResourceUpdateQueue;
@@ -417,7 +418,6 @@ class CC_EXPORT Layer : public base::RefCounted<Layer>,
void PauseAnimation(int animation_id, double time_offset);
void RemoveAnimation(int animation_id);
void RemoveAnimation(int animation_id, Animation::TargetProperty property);
-
LayerAnimationController* layer_animation_controller() {
return layer_animation_controller_.get();
}
@@ -425,10 +425,13 @@ class CC_EXPORT Layer : public base::RefCounted<Layer>,
scoped_refptr<LayerAnimationController> controller);
void set_layer_animation_delegate(AnimationDelegate* delegate) {
+ DCHECK(layer_animation_controller_);
layer_animation_controller_->set_layer_animation_delegate(delegate);
}
bool HasActiveAnimation() const;
+ void RegisterForAnimations(AnimationRegistrar* registrar,
+ const LayerTreeSettings& settings);
void AddLayerAnimationEventObserver(
LayerAnimationEventObserver* animation_observer);

Powered by Google App Engine
This is Rietveld 408576698