Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(73)

Side by Side Diff: cc/output/compositor_frame.h

Issue 2374183006: Remove GLFrameData from CompositorFrame. (Closed)
Patch Set: Rebase + fix includes. Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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"
15 14
16 namespace cc { 15 namespace cc {
17 16
18 // A CompositorFrame struct contains the complete output of a compositor meant 17 // A CompositorFrame struct contains the complete output of a compositor meant
19 // for display. A CompositorFrame consists of a series of DrawQuads that 18 // for display. A CompositorFrame consists of a series of DrawQuads that
20 // describe placement of textures, solid colors, overlays and other 19 // describe placement of textures, solid colors, overlays and other
21 // CompositorFrames within an area specified by the parent compositor. DrawQuads 20 // CompositorFrames within an area specified by the parent compositor. DrawQuads
22 // may share common data referred to as SharedQuadState. A CompositorFrame also 21 // may share common data referred to as SharedQuadState. A CompositorFrame also
23 // has |metadata| that refers to global graphical state associated with this 22 // has |metadata| that refers to global graphical state associated with this
24 // frame. 23 // frame.
25 class CC_EXPORT CompositorFrame { 24 class CC_EXPORT CompositorFrame {
26 public: 25 public:
27 CompositorFrame(); 26 CompositorFrame();
28 CompositorFrame(CompositorFrame&& other); 27 CompositorFrame(CompositorFrame&& other);
29 ~CompositorFrame(); 28 ~CompositorFrame();
30 29
31 CompositorFrame& operator=(CompositorFrame&& other); 30 CompositorFrame& operator=(CompositorFrame&& other);
32 31
33 CompositorFrameMetadata metadata; 32 CompositorFrameMetadata metadata;
34 std::unique_ptr<DelegatedFrameData> delegated_frame_data; 33 std::unique_ptr<DelegatedFrameData> delegated_frame_data;
danakj 2016/10/04 21:58:40 I nice followup would be to merge the fields in De
kylechar 2016/10/05 13:45:53 Acknowledged.
35 std::unique_ptr<GLFrameData> gl_frame_data;
36 34
37 private: 35 private:
38 DISALLOW_COPY_AND_ASSIGN(CompositorFrame); 36 DISALLOW_COPY_AND_ASSIGN(CompositorFrame);
39 }; 37 };
40 38
41 } // namespace cc 39 } // namespace cc
42 40
43 #endif // CC_OUTPUT_COMPOSITOR_FRAME_H_ 41 #endif // CC_OUTPUT_COMPOSITOR_FRAME_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698