OLD | NEW |
---|---|
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 "base/macros.h" | 8 #include "base/macros.h" |
9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
10 #include "cc/surfaces/surfaces_export.h" | 10 #include "cc/surfaces/surfaces_export.h" |
(...skipping 11 matching lines...) Expand all Loading... | |
22 const gfx::Size& size); | 22 const gfx::Size& size); |
23 ~Surface(); | 23 ~Surface(); |
24 | 24 |
25 const gfx::Size& size() const { return size_; } | 25 const gfx::Size& size() const { return size_; } |
26 int surface_id() const { return surface_id_; } | 26 int surface_id() const { return surface_id_; } |
27 | 27 |
28 void QueueFrame(scoped_ptr<CompositorFrame> frame); | 28 void QueueFrame(scoped_ptr<CompositorFrame> frame); |
29 // Returns the most recent frame that is eligible to be rendered. | 29 // Returns the most recent frame that is eligible to be rendered. |
30 CompositorFrame* GetEligibleFrame(); | 30 CompositorFrame* GetEligibleFrame(); |
31 | 31 |
32 scoped_ptr<CompositorFrame> TakeFrame(); | |
jamesr
2014/05/28 22:01:28
this isn't right - a surface retains ownership of
| |
33 | |
32 private: | 34 private: |
33 SurfaceManager* manager_; | 35 SurfaceManager* manager_; |
34 SurfaceClient* client_; | 36 SurfaceClient* client_; |
35 gfx::Size size_; | 37 gfx::Size size_; |
36 int surface_id_; | 38 int surface_id_; |
37 // TODO(jamesr): Support multiple frames in flight. | 39 // TODO(jamesr): Support multiple frames in flight. |
38 scoped_ptr<CompositorFrame> current_frame_; | 40 scoped_ptr<CompositorFrame> current_frame_; |
39 | 41 |
40 DISALLOW_COPY_AND_ASSIGN(Surface); | 42 DISALLOW_COPY_AND_ASSIGN(Surface); |
41 }; | 43 }; |
42 | 44 |
43 } // namespace cc | 45 } // namespace cc |
44 | 46 |
45 #endif // CC_SURFACES_SURFACE_H_ | 47 #endif // CC_SURFACES_SURFACE_H_ |
OLD | NEW |