| Index: cc/trees/single_thread_proxy.h
|
| diff --git a/cc/trees/single_thread_proxy.h b/cc/trees/single_thread_proxy.h
|
| index 14960b7416f3aee41b425f1faa960b2c61a8557d..ce33114b1fe7a32ad1e01fcaa72d961dac412404 100644
|
| --- a/cc/trees/single_thread_proxy.h
|
| +++ b/cc/trees/single_thread_proxy.h
|
| @@ -75,20 +75,19 @@ class SingleThreadProxy : public Proxy, LayerTreeHostImplClient {
|
| virtual void DidActivatePendingTree() OVERRIDE {}
|
|
|
| // Called by the legacy path where RenderWidget does the scheduling.
|
| - void CompositeImmediately(base::TimeTicks frame_begin_time);
|
| + void CompositeImmediately(gfx::FrameTime frame_begin_time);
|
|
|
| private:
|
| explicit SingleThreadProxy(LayerTreeHost* layer_tree_host);
|
|
|
| void OnOutputSurfaceInitializeAttempted(bool success);
|
| - bool CommitAndComposite(base::TimeTicks frame_begin_time,
|
| + bool CommitAndComposite(gfx::FrameTime frame_begin_time,
|
| gfx::Rect device_viewport_damage_rect,
|
| bool for_readback,
|
| LayerTreeHostImpl::FrameData* frame);
|
| void DoCommit(scoped_ptr<ResourceUpdateQueue> queue);
|
| - bool DoComposite(
|
| - scoped_refptr<cc::ContextProvider> offscreen_context_provider,
|
| - base::TimeTicks frame_begin_time,
|
| + bool DoComposite(scoped_refptr<cc::ContextProvider> offscreen_context_provider,
|
| + gfx::FrameTime frame_begin_time,
|
| gfx::Rect device_viewport_damage_rect,
|
| bool for_readback,
|
| LayerTreeHostImpl::FrameData* frame);
|
|
|