diff options
Diffstat (limited to 'content/public/test/test_synchronous_compositor_android.h')
-rw-r--r-- | content/public/test/test_synchronous_compositor_android.h | 24 |
1 files changed, 20 insertions, 4 deletions
diff --git a/content/public/test/test_synchronous_compositor_android.h b/content/public/test/test_synchronous_compositor_android.h index b9f0c85..613eda6 100644 --- a/content/public/test/test_synchronous_compositor_android.h +++ b/content/public/test/test_synchronous_compositor_android.h @@ -7,8 +7,11 @@ #include <stddef.h> +#include <vector> + #include "base/macros.h" #include "base/memory/scoped_ptr.h" +#include "cc/output/compositor_frame_ack.h" #include "content/public/browser/android/synchronous_compositor.h" #include "content/public/browser/android/synchronous_compositor_client.h" @@ -22,14 +25,15 @@ class CONTENT_EXPORT TestSynchronousCompositor : public SynchronousCompositor { void SetClient(SynchronousCompositorClient* client); // SynchronousCompositor overrides. - scoped_ptr<cc::CompositorFrame> DemandDrawHw( + SynchronousCompositor::Frame DemandDrawHw( const gfx::Size& surface_size, const gfx::Transform& transform, const gfx::Rect& viewport, const gfx::Rect& clip, const gfx::Rect& viewport_rect_for_tile_priority, const gfx::Transform& transform_for_tile_priority) override; - void ReturnResources(const cc::CompositorFrameAck& frame_ack) override {} + void ReturnResources(uint32_t output_surface_id, + const cc::CompositorFrameAck& frame_ack) override; bool DemandDrawSw(SkCanvas* canvas) override; void SetMemoryPolicy(size_t bytes_limit) override {} void DidChangeRootLayerScrollOffset( @@ -37,11 +41,23 @@ class CONTENT_EXPORT TestSynchronousCompositor : public SynchronousCompositor { void SetIsActive(bool is_active) override {} void OnComputeScroll(base::TimeTicks animate_time) override {} - void SetHardwareFrame(scoped_ptr<cc::CompositorFrame> frame); + void SetHardwareFrame(uint32_t output_surface_id, + scoped_ptr<cc::CompositorFrame> frame); + + struct ReturnedResources { + ReturnedResources(); + ~ReturnedResources(); + + uint32_t output_surface_id; + cc::ReturnedResourceArray resources; + }; + using FrameAckArray = std::vector<ReturnedResources>; + void SwapReturnedResources(FrameAckArray* array); private: SynchronousCompositorClient* client_; - scoped_ptr<cc::CompositorFrame> hardware_frame_; + SynchronousCompositor::Frame hardware_frame_; + FrameAckArray frame_ack_array_; DISALLOW_COPY_AND_ASSIGN(TestSynchronousCompositor); }; |