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(); | |
24 ~CompositorFrame(); | 23 ~CompositorFrame(); |
25 | 24 |
25 static std::unique_ptr<CompositorFrame> Create(); | |
danakj
2016/06/23 20:34:41
Please just leave the constructor public and drop
| |
26 | |
26 CompositorFrameMetadata metadata; | 27 CompositorFrameMetadata metadata; |
27 std::unique_ptr<DelegatedFrameData> delegated_frame_data; | 28 std::unique_ptr<DelegatedFrameData> delegated_frame_data; |
28 std::unique_ptr<GLFrameData> gl_frame_data; | 29 std::unique_ptr<GLFrameData> gl_frame_data; |
29 | 30 |
30 void AssignTo(CompositorFrame* target); | 31 protected: |
piman
2016/06/23 19:30:32
How about private? I don't think we want to have c
danakj
2016/06/23 20:34:41
I'd rather just not have a Create() method at all.
Fady Samuel
2016/06/23 23:41:00
Done.
| |
32 CompositorFrame(); | |
31 | 33 |
32 private: | 34 private: |
33 DISALLOW_COPY_AND_ASSIGN(CompositorFrame); | 35 DISALLOW_COPY_AND_ASSIGN(CompositorFrame); |
34 }; | 36 }; |
35 | 37 |
36 } // namespace cc | 38 } // namespace cc |
37 | 39 |
38 #endif // CC_OUTPUT_COMPOSITOR_FRAME_H_ | 40 #endif // CC_OUTPUT_COMPOSITOR_FRAME_H_ |
OLD | NEW |