| 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 <memory> |
| 9 |
| 8 #include "base/macros.h" | 10 #include "base/macros.h" |
| 9 #include "base/memory/scoped_ptr.h" | |
| 10 #include "cc/base/cc_export.h" | 11 #include "cc/base/cc_export.h" |
| 11 #include "cc/output/compositor_frame_metadata.h" | 12 #include "cc/output/compositor_frame_metadata.h" |
| 12 #include "cc/output/delegated_frame_data.h" | 13 #include "cc/output/delegated_frame_data.h" |
| 13 #include "cc/output/gl_frame_data.h" | 14 #include "cc/output/gl_frame_data.h" |
| 14 | 15 |
| 15 namespace cc { | 16 namespace cc { |
| 16 | 17 |
| 17 // A CompositorFrame struct contains the complete output of a compositor meant | 18 // A CompositorFrame struct contains the complete output of a compositor meant |
| 18 // for display. | 19 // for display. |
| 19 // TODO(fsamuel): Write more here. | 20 // TODO(fsamuel): Write more here. |
| 20 class CC_EXPORT CompositorFrame { | 21 class CC_EXPORT CompositorFrame { |
| 21 public: | 22 public: |
| 22 CompositorFrame(); | 23 CompositorFrame(); |
| 23 ~CompositorFrame(); | 24 ~CompositorFrame(); |
| 24 | 25 |
| 25 CompositorFrameMetadata metadata; | 26 CompositorFrameMetadata metadata; |
| 26 scoped_ptr<DelegatedFrameData> delegated_frame_data; | 27 std::unique_ptr<DelegatedFrameData> delegated_frame_data; |
| 27 scoped_ptr<GLFrameData> gl_frame_data; | 28 std::unique_ptr<GLFrameData> gl_frame_data; |
| 28 | 29 |
| 29 void AssignTo(CompositorFrame* target); | 30 void AssignTo(CompositorFrame* target); |
| 30 | 31 |
| 31 private: | 32 private: |
| 32 DISALLOW_COPY_AND_ASSIGN(CompositorFrame); | 33 DISALLOW_COPY_AND_ASSIGN(CompositorFrame); |
| 33 }; | 34 }; |
| 34 | 35 |
| 35 } // namespace cc | 36 } // namespace cc |
| 36 | 37 |
| 37 #endif // CC_OUTPUT_COMPOSITOR_FRAME_H_ | 38 #endif // CC_OUTPUT_COMPOSITOR_FRAME_H_ |
| OLD | NEW |