| 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 2c04ed2b26ad9bb3d843eaa7c3a3836c9c1093ce..01898e06f1e5865581211741d1faa72ed5d6d320 100644
|
| --- a/content/browser/android/in_process/synchronous_compositor_output_surface.h
|
| +++ b/content/browser/android/in_process/synchronous_compositor_output_surface.h
|
| @@ -64,10 +64,13 @@ class SynchronousCompositorOutputSurface
|
| bool InitializeHwDraw(
|
| scoped_refptr<cc::ContextProvider> onscreen_context_provider);
|
| void ReleaseHwDraw();
|
| - scoped_ptr<cc::CompositorFrame> DemandDrawHw(gfx::Size surface_size,
|
| - const gfx::Transform& transform,
|
| - gfx::Rect viewport,
|
| - gfx::Rect clip);
|
| + scoped_ptr<cc::CompositorFrame> DemandDrawHw(
|
| + gfx::Size surface_size,
|
| + const gfx::Transform& transform,
|
| + gfx::Rect viewport,
|
| + gfx::Rect clip,
|
| + gfx::Rect external_tiling_rect,
|
| + gfx::Transform external_tiling_transform);
|
| void ReturnResources(const cc::CompositorFrameAck& frame_ack);
|
| scoped_ptr<cc::CompositorFrame> DemandDrawSw(SkCanvas* canvas);
|
| void SetMemoryPolicy(const SynchronousCompositorMemoryPolicy& policy);
|
| @@ -79,6 +82,8 @@ class SynchronousCompositorOutputSurface
|
| void InvokeComposite(const gfx::Transform& transform,
|
| gfx::Rect viewport,
|
| gfx::Rect clip,
|
| + gfx::Rect external_tiling_rect,
|
| + gfx::Transform external_tiling_transform,
|
| bool hardware_draw);
|
| bool CalledOnValidThread() const;
|
| SynchronousCompositorOutputSurfaceDelegate* GetDelegate();
|
| @@ -90,6 +95,8 @@ class SynchronousCompositorOutputSurface
|
| gfx::Transform cached_hw_transform_;
|
| gfx::Rect cached_hw_viewport_;
|
| gfx::Rect cached_hw_clip_;
|
| + gfx::Rect cached_hw_external_tiling_rect_;
|
| + gfx::Transform cached_hw_external_tiling_transform_;
|
|
|
| // Only valid (non-NULL) during a DemandDrawSw() call.
|
| SkCanvas* current_sw_canvas_;
|
|
|