| Index: cc/test/layer_tree_test_common.h
|
| diff --git a/cc/test/layer_tree_test_common.h b/cc/test/layer_tree_test_common.h
|
| index 6a61a1198ad98461850e6e245cab1cda01ebfb0b..ac9534e3d1eaa0397e58f7bf0aebc83a1e556f6f 100644
|
| --- a/cc/test/layer_tree_test_common.h
|
| +++ b/cc/test/layer_tree_test_common.h
|
| @@ -35,7 +35,7 @@ public:
|
| virtual void treeActivatedOnThread(LayerTreeHostImpl*) { }
|
| virtual void initializedRendererOnThread(LayerTreeHostImpl*, bool success) { }
|
| virtual bool prepareToDrawOnThread(
|
| - LayerTreeHostImpl*, LayerTreeHostImpl::FrameData&, bool result);
|
| + LayerTreeHostImpl*, LayerTreeHostImpl::FrameData*, bool result);
|
| virtual void drawLayersOnThread(LayerTreeHostImpl*) { }
|
| virtual void animateLayers(LayerTreeHostImpl*, base::TimeTicks monotonicTime) { }
|
| virtual void updateAnimationState(LayerTreeHostImpl*, bool hasUnfinishedAnimation) { }
|
| @@ -163,21 +163,21 @@ class MockLayerTreeHostImpl : public LayerTreeHostImpl {
|
| public:
|
| static scoped_ptr<MockLayerTreeHostImpl> create(TestHooks*, const LayerTreeSettings&, LayerTreeHostImplClient*, Proxy*);
|
|
|
| - virtual void beginCommit() OVERRIDE;
|
| - virtual void commitComplete() OVERRIDE;
|
| - virtual bool prepareToDraw(FrameData&) OVERRIDE;
|
| - virtual void drawLayers(FrameData&) OVERRIDE;
|
| - virtual bool activatePendingTreeIfNeeded() OVERRIDE;
|
| - virtual bool initializeRenderer(scoped_ptr<OutputSurface> outputSurface) OVERRIDE;
|
| - virtual void setVisible(bool visible) OVERRIDE;
|
| + virtual void BeginCommit() OVERRIDE;
|
| + virtual void CommitComplete() OVERRIDE;
|
| + virtual bool PrepareToDraw(FrameData* frame) OVERRIDE;
|
| + virtual void DrawLayers(FrameData* frame) OVERRIDE;
|
| + virtual bool ActivatePendingTreeIfNeeded() OVERRIDE;
|
| + virtual bool InitializeRenderer(scoped_ptr<OutputSurface> outputSurface) OVERRIDE;
|
| + virtual void SetVisible(bool visible) OVERRIDE;
|
|
|
| // Make these public.
|
| typedef std::vector<LayerImpl*> LayerList;
|
|
|
| protected:
|
| - virtual void animateLayers(base::TimeTicks monotonicTime, base::Time wallClockTime) OVERRIDE;
|
| - virtual void updateAnimationState() OVERRIDE;
|
| - virtual base::TimeDelta lowFrequencyAnimationInterval() const OVERRIDE;
|
| + virtual void AnimateLayers(base::TimeTicks monotonicTime, base::Time wallClockTime) OVERRIDE;
|
| + virtual void UpdateAnimationState() OVERRIDE;
|
| + virtual base::TimeDelta LowFrequencyAnimationInterval() const OVERRIDE;
|
|
|
| private:
|
| MockLayerTreeHostImpl(TestHooks*, const LayerTreeSettings&, LayerTreeHostImplClient*, Proxy*);
|
|
|