Chromium Code Reviews| Index: cc/compositor_frame.h |
| diff --git a/cc/compositor_frame.h b/cc/compositor_frame.h |
| index b9f09c14e66f14cb5a02a4e539538938cce20b96..206a8ce4cf5bd962ca7d64ce4cc55f720aecc72b 100644 |
| --- a/cc/compositor_frame.h |
| +++ b/cc/compositor_frame.h |
| @@ -6,10 +6,7 @@ |
| #define CC_COMPOSITOR_FRAME_H_ |
| #include "cc/cc_export.h" |
| -#include "cc/render_pass.h" |
| -#include "cc/scoped_ptr_vector.h" |
| -#include "cc/transferable_resource.h" |
| -#include "ui/gfx/size.h" |
| +#include "cc/compositor_frame_metadata.h" |
| namespace cc { |
| @@ -18,9 +15,15 @@ class CC_EXPORT CompositorFrame { |
| CompositorFrame(); |
| ~CompositorFrame(); |
|
piman
2012/12/14 22:02:22
Don't we need a virtual destructor?
aelias_OOO_until_Jul13
2012/12/15 00:06:17
Done.
|
| - gfx::Size size; |
| - TransferableResourceList resource_list; |
| - ScopedPtrVector<RenderPass> render_pass_list; |
| + enum FrameType { |
| + INVALID, |
| + DELEGATED, |
| + GL, |
| + }; |
| + |
| + FrameType type; |
|
danakj
2012/12/14 22:23:34
Can we set the type in the constructor and make th
|
| + |
| + CompositorFrameMetadata metadata; |
| }; |
| } // namespace cc |