| Index: cc/surfaces/surface.h
|
| diff --git a/cc/surfaces/surface.h b/cc/surfaces/surface.h
|
| index 600202e2f5aba8df7d9b8a4362b68725e4616b56..718fef4a1fd5782eaeb43a6b474d2a807ce8d302 100644
|
| --- a/cc/surfaces/surface.h
|
| +++ b/cc/surfaces/surface.h
|
| @@ -11,6 +11,8 @@
|
| #include "base/containers/hash_tables.h"
|
| #include "base/macros.h"
|
| #include "base/memory/scoped_ptr.h"
|
| +#include "cc/base/scoped_ptr_vector.h"
|
| +#include "cc/output/copy_output_request.h"
|
| #include "cc/surfaces/surface_id.h"
|
| #include "cc/surfaces/surfaces_export.h"
|
| #include "ui/gfx/size.h"
|
| @@ -37,6 +39,8 @@ class CC_SURFACES_EXPORT Surface {
|
| void QueueFrame(scoped_ptr<CompositorFrame> frame,
|
| const base::Closure& draw_callback);
|
| void RequestCopyOfOutput(scoped_ptr<CopyOutputRequest> copy_request);
|
| + void TakeCopyOutputRequests(
|
| + ScopedPtrVector<CopyOutputRequest>* copy_requests);
|
| // Returns the most recent frame that is eligible to be rendered.
|
| const CompositorFrame* GetEligibleFrame();
|
|
|
| @@ -55,6 +59,7 @@ class CC_SURFACES_EXPORT Surface {
|
| // TODO(jamesr): Support multiple frames in flight.
|
| scoped_ptr<CompositorFrame> current_frame_;
|
| int frame_index_;
|
| + ScopedPtrVector<CopyOutputRequest> copy_requests_;
|
|
|
| base::Closure draw_callback_;
|
|
|
|
|