| Index: content/browser/android/in_process/synchronous_compositor_output_surface.h
|
| diff --git a/content/browser/android/in_process/synchronous_compositor_output_surface.h b/content/browser/android/in_process/synchronous_compositor_output_surface.h
|
| index 5262b7eeac85d80463312c01ae38ad564e104b23..26934ca02e9eae4eb7f24b77a2f81f341e90bb01 100644
|
| --- a/content/browser/android/in_process/synchronous_compositor_output_surface.h
|
| +++ b/content/browser/android/in_process/synchronous_compositor_output_surface.h
|
| @@ -32,7 +32,6 @@ namespace content {
|
|
|
| class FrameSwapMessageQueue;
|
| class SynchronousCompositorClient;
|
| -class SynchronousCompositorExternalBeginFrameSource;
|
| class SynchronousCompositorOutputSurface;
|
| class WebGraphicsContext3DCommandBufferImpl;
|
|
|
| @@ -56,9 +55,7 @@ class SynchronousCompositorOutputSurface
|
| virtual bool BindToClient(cc::OutputSurfaceClient* surface_client) override;
|
| virtual void Reshape(const gfx::Size& size, float scale_factor) override;
|
| virtual void SwapBuffers(cc::CompositorFrame* frame) override;
|
| -
|
| - void SetBeginFrameSource(
|
| - SynchronousCompositorExternalBeginFrameSource* begin_frame_source);
|
| + virtual void Invalidate() override;
|
|
|
| // Partial SynchronousCompositor API implementation.
|
| bool InitializeHwDraw(
|
| @@ -74,6 +71,7 @@ class SynchronousCompositorOutputSurface
|
| void ReturnResources(const cc::CompositorFrameAck& frame_ack);
|
| scoped_ptr<cc::CompositorFrame> DemandDrawSw(SkCanvas* canvas);
|
| void SetMemoryPolicy(size_t bytes_limit);
|
| + void SetInvalidateCallback(const base::Closure& callback);
|
| void SetTreeActivationCallback(const base::Closure& callback);
|
| void GetMessagesToDeliver(ScopedVector<IPC::Message>* messages);
|
|
|
| @@ -103,12 +101,11 @@ class SynchronousCompositorOutputSurface
|
|
|
| cc::ManagedMemoryPolicy memory_policy_;
|
|
|
| - cc::OutputSurfaceClient* output_surface_client_;
|
| scoped_ptr<cc::CompositorFrame> frame_holder_;
|
|
|
| scoped_refptr<FrameSwapMessageQueue> frame_swap_message_queue_;
|
|
|
| - SynchronousCompositorExternalBeginFrameSource* begin_frame_source_;
|
| + base::Closure invalidate_callback_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(SynchronousCompositorOutputSurface);
|
| };
|
|
|