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