| Index: cc/layer_tree_host.h
|
| diff --git a/cc/layer_tree_host.h b/cc/layer_tree_host.h
|
| index a45c1c1ee1e1941313d8b85a4c1bfaad51a9fd0f..0760f0aad23217224cc8bbfcb4b007cf671ee9fd 100644
|
| --- a/cc/layer_tree_host.h
|
| +++ b/cc/layer_tree_host.h
|
| @@ -89,7 +89,7 @@ public:
|
| // LayerTreeHost interface to Proxy.
|
| void willBeginFrame() { m_client->willBeginFrame(); }
|
| void didBeginFrame();
|
| - void updateAnimations(base::TimeTicks monotonicFrameBeginTime);
|
| + void updateAnimations(base::TimeTicks monotonicFrameBeginTime, base::Time wallClockFrameBeginTime);
|
| void didStopFlinging();
|
| void layout();
|
| void beginCommitOnImplThread(LayerTreeHostImpl*);
|
| @@ -200,6 +200,8 @@ public:
|
|
|
| bool blocksPendingCommit() const;
|
|
|
| + void didUpdateLayout();
|
| +
|
| protected:
|
| LayerTreeHost(LayerTreeHostClient*, const LayerTreeSettings&);
|
| bool initialize(scoped_ptr<Thread> implThread);
|
| @@ -223,7 +225,7 @@ private:
|
| void setPrioritiesForLayers(const LayerList&);
|
| size_t calculateMemoryForRenderSurfaces(const LayerList& updateList);
|
|
|
| - void animateLayers(base::TimeTicks monotonicTime);
|
| + void animateLayers(base::TimeTicks monotonicTime, base::Time wallClockTime);
|
| bool animateLayersRecursive(Layer* current, base::TimeTicks time);
|
| void setAnimationEventsRecursive(const AnimationEventsVector&, Layer*, base::Time wallClockTime);
|
|
|
|
|