| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef CC_COMPOSITOR_FRAME_H_ | 5 #ifndef CC_COMPOSITOR_FRAME_H_ |
| 6 #define CC_COMPOSITOR_FRAME_H_ | 6 #define CC_COMPOSITOR_FRAME_H_ |
| 7 | 7 |
| 8 #include "base/memory/scoped_ptr.h" |
| 8 #include "cc/cc_export.h" | 9 #include "cc/cc_export.h" |
| 9 #include "cc/render_pass.h" | 10 #include "cc/compositor_frame_metadata.h" |
| 10 #include "cc/scoped_ptr_vector.h" | 11 #include "cc/delegated_frame_data.h" |
| 11 #include "cc/transferable_resource.h" | 12 #include "cc/gl_frame_data.h" |
| 12 #include "ui/gfx/size.h" | |
| 13 | 13 |
| 14 namespace cc { | 14 namespace cc { |
| 15 | 15 |
| 16 class CC_EXPORT CompositorFrame { | 16 class CC_EXPORT CompositorFrame { |
| 17 public: | 17 public: |
| 18 CompositorFrame(); | 18 CompositorFrame(); |
| 19 ~CompositorFrame(); | 19 ~CompositorFrame(); |
| 20 | 20 |
| 21 gfx::Size size; | 21 CompositorFrameMetadata metadata; |
| 22 TransferableResourceList resource_list; | 22 scoped_ptr<DelegatedFrameData> delegated_frame_data; |
| 23 ScopedPtrVector<RenderPass> render_pass_list; | 23 scoped_ptr<GLFrameData> gl_frame_data; |
| 24 }; | 24 }; |
| 25 | 25 |
| 26 } // namespace cc | 26 } // namespace cc |
| 27 | 27 |
| 28 #endif // CC_COMPOSITOR_FRAME_H_ | 28 #endif // CC_COMPOSITOR_FRAME_H_ |
| OLD | NEW |