| 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_OUTPUT_COMPOSITOR_FRAME_H_ | 5 #ifndef CC_OUTPUT_COMPOSITOR_FRAME_H_ |
| 6 #define CC_OUTPUT_COMPOSITOR_FRAME_H_ | 6 #define CC_OUTPUT_COMPOSITOR_FRAME_H_ |
| 7 | 7 |
| 8 #include "base/memory/scoped_ptr.h" | 8 #include "base/memory/scoped_ptr.h" |
| 9 #include "cc/base/cc_export.h" | |
| 10 #include "cc/output/compositor_frame_metadata.h" | 9 #include "cc/output/compositor_frame_metadata.h" |
| 11 #include "cc/output/delegated_frame_data.h" | 10 #include "cc/output/delegated_frame_data.h" |
| 12 #include "cc/output/gl_frame_data.h" | 11 #include "cc/output/gl_frame_data.h" |
| 13 #include "cc/output/software_frame_data.h" | 12 #include "cc/output/software_frame_data.h" |
| 14 | 13 |
| 15 namespace cc { | 14 namespace cc { |
| 16 | 15 |
| 17 class CC_EXPORT CompositorFrame { | 16 class CompositorFrame { |
| 18 public: | 17 public: |
| 19 CompositorFrame(); | 18 CompositorFrame(); |
| 20 ~CompositorFrame(); | 19 ~CompositorFrame(); |
| 21 | 20 |
| 22 CompositorFrameMetadata metadata; | 21 CompositorFrameMetadata metadata; |
| 23 scoped_ptr<DelegatedFrameData> delegated_frame_data; | 22 scoped_ptr<DelegatedFrameData> delegated_frame_data; |
| 24 scoped_ptr<GLFrameData> gl_frame_data; | 23 scoped_ptr<GLFrameData> gl_frame_data; |
| 25 scoped_ptr<SoftwareFrameData> software_frame_data; | 24 scoped_ptr<SoftwareFrameData> software_frame_data; |
| 26 | 25 |
| 27 void AssignTo(CompositorFrame* target); | 26 void AssignTo(CompositorFrame* target); |
| 28 | 27 |
| 29 private: | 28 private: |
| 30 DISALLOW_COPY_AND_ASSIGN(CompositorFrame); | 29 DISALLOW_COPY_AND_ASSIGN(CompositorFrame); |
| 31 }; | 30 }; |
| 32 | 31 |
| 33 } // namespace cc | 32 } // namespace cc |
| 34 | 33 |
| 35 #endif // CC_OUTPUT_COMPOSITOR_FRAME_H_ | 34 #endif // CC_OUTPUT_COMPOSITOR_FRAME_H_ |
| OLD | NEW |