| Index: cc/output/compositor_frame.h
|
| diff --git a/cc/output/compositor_frame.h b/cc/output/compositor_frame.h
|
| index e5e0c660f6faeb3930d5f3339bb686b380e605bd..127685598e6db560a2b4cfcd9bd9cd9f62f6f08c 100644
|
| --- a/cc/output/compositor_frame.h
|
| +++ b/cc/output/compositor_frame.h
|
| @@ -16,19 +16,24 @@
|
| namespace cc {
|
|
|
| // A CompositorFrame struct contains the complete output of a compositor meant
|
| -// for display.
|
| -// TODO(fsamuel): Write more here.
|
| +// for display. A CompositorFrame consists of a series of DrawQuads that
|
| +// describe placement of textures, solid colors, overlays and other
|
| +// CompositorFrames within an area specified by the parent compositor. DrawQuads
|
| +// may share common data referred to as SharedQuadState. A CompositorFrame also
|
| +// has |metadata| that refers to global graphical state associated with this
|
| +// frame.
|
| class CC_EXPORT CompositorFrame {
|
| public:
|
| CompositorFrame();
|
| + CompositorFrame(CompositorFrame&& other);
|
| ~CompositorFrame();
|
|
|
| + CompositorFrame& operator=(CompositorFrame&& other);
|
| +
|
| CompositorFrameMetadata metadata;
|
| std::unique_ptr<DelegatedFrameData> delegated_frame_data;
|
| std::unique_ptr<GLFrameData> gl_frame_data;
|
|
|
| - void AssignTo(CompositorFrame* target);
|
| -
|
| private:
|
| DISALLOW_COPY_AND_ASSIGN(CompositorFrame);
|
| };
|
|
|