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

Side by Side Diff: cc/surfaces/surface.h

Issue 2854163003: [cc] Plumb BeginFrameAcks through SurfaceManager to DisplayScheduler. (Closed)
Patch Set: track state in DisplayScheduler rather than Surface Created 3 years, 7 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_SURFACES_SURFACE_H_ 5 #ifndef CC_SURFACES_SURFACE_H_
6 #define CC_SURFACES_SURFACE_H_ 6 #define CC_SURFACES_SURFACE_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 10
11 #include <map> 11 #include <map>
12 #include <memory> 12 #include <memory>
13 #include <set> 13 #include <set>
14 #include <unordered_set> 14 #include <unordered_set>
15 #include <vector> 15 #include <vector>
16 16
17 #include "base/callback.h" 17 #include "base/callback.h"
18 #include "base/macros.h" 18 #include "base/macros.h"
19 #include "base/memory/weak_ptr.h" 19 #include "base/memory/weak_ptr.h"
20 #include "base/optional.h" 20 #include "base/optional.h"
21 #include "cc/output/compositor_frame.h"
21 #include "cc/output/copy_output_request.h" 22 #include "cc/output/copy_output_request.h"
22 #include "cc/surfaces/compositor_frame_sink_support.h"
23 #include "cc/surfaces/frame_sink_id.h" 23 #include "cc/surfaces/frame_sink_id.h"
24 #include "cc/surfaces/surface_id.h" 24 #include "cc/surfaces/surface_id.h"
25 #include "cc/surfaces/surface_sequence.h" 25 #include "cc/surfaces/surface_sequence.h"
26 #include "cc/surfaces/surfaces_export.h" 26 #include "cc/surfaces/surfaces_export.h"
27 #include "ui/gfx/geometry/size.h" 27 #include "ui/gfx/geometry/size.h"
28 28
29 namespace ui { 29 namespace ui {
30 class LatencyInfo; 30 class LatencyInfo;
31 } 31 }
32 32
33 namespace cc { 33 namespace cc {
34 34
35 class CompositorFrame; 35 class CompositorFrameSinkSupport;
36 class CopyOutputRequest; 36 class CopyOutputRequest;
37 class SurfaceManager;
37 38
38 class CC_SURFACES_EXPORT Surface { 39 class CC_SURFACES_EXPORT Surface {
39 public: 40 public:
40 using WillDrawCallback = 41 using WillDrawCallback =
41 base::RepeatingCallback<void(const LocalSurfaceId&, const gfx::Rect&)>; 42 base::RepeatingCallback<void(const LocalSurfaceId&, const gfx::Rect&)>;
42 43
43 Surface( 44 Surface(
44 const SurfaceId& id, 45 const SurfaceId& id,
45 base::WeakPtr<CompositorFrameSinkSupport> compositor_frame_sink_support); 46 base::WeakPtr<CompositorFrameSinkSupport> compositor_frame_sink_support);
46 ~Surface(); 47 ~Surface();
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 ? &active_frame_data_->frame.metadata.referenced_surfaces 113 ? &active_frame_data_->frame.metadata.referenced_surfaces
113 : nullptr; 114 : nullptr;
114 } 115 }
115 116
116 const base::flat_set<SurfaceId>& blocking_surfaces() const { 117 const base::flat_set<SurfaceId>& blocking_surfaces() const {
117 return blocking_surfaces_; 118 return blocking_surfaces_;
118 } 119 }
119 120
120 bool HasActiveFrame() const { return active_frame_data_.has_value(); } 121 bool HasActiveFrame() const { return active_frame_data_.has_value(); }
121 bool HasPendingFrame() const { return pending_frame_data_.has_value(); } 122 bool HasPendingFrame() const { return pending_frame_data_.has_value(); }
123 bool HasUndrawnFrame() const {
124 return HasPendingFrame() ||
125 (HasActiveFrame() && active_frame_data_->draw_callback);
126 }
122 127
123 bool destroyed() const { return destroyed_; } 128 bool destroyed() const { return destroyed_; }
124 void set_destroyed(bool destroyed) { destroyed_ = destroyed; } 129 void set_destroyed(bool destroyed) { destroyed_ = destroyed; }
125 130
126 private: 131 private:
127 struct FrameData { 132 struct FrameData {
128 FrameData(CompositorFrame&& frame, 133 FrameData(CompositorFrame&& frame,
129 const base::Closure& draw_callback, 134 const base::Closure& draw_callback,
130 const WillDrawCallback& will_draw_callback); 135 const WillDrawCallback& will_draw_callback);
131 FrameData(FrameData&& other); 136 FrameData(FrameData&& other);
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 std::vector<SurfaceSequence> destruction_dependencies_; 174 std::vector<SurfaceSequence> destruction_dependencies_;
170 175
171 base::flat_set<SurfaceId> blocking_surfaces_; 176 base::flat_set<SurfaceId> blocking_surfaces_;
172 177
173 DISALLOW_COPY_AND_ASSIGN(Surface); 178 DISALLOW_COPY_AND_ASSIGN(Surface);
174 }; 179 };
175 180
176 } // namespace cc 181 } // namespace cc
177 182
178 #endif // CC_SURFACES_SURFACE_H_ 183 #endif // CC_SURFACES_SURFACE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698