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_ACK_H_ | 5 #ifndef CC_OUTPUT_COMPOSITOR_FRAME_ACK_H_ |
6 #define CC_OUTPUT_COMPOSITOR_FRAME_ACK_H_ | 6 #define CC_OUTPUT_COMPOSITOR_FRAME_ACK_H_ |
7 | 7 |
8 #include "base/memory/scoped_ptr.h" | 8 #include "base/memory/scoped_ptr.h" |
9 #include "cc/base/cc_export.h" | 9 #include "cc/base/cc_export.h" |
10 #include "cc/output/gl_frame_data.h" | 10 #include "cc/output/gl_frame_data.h" |
11 #include "cc/resources/transferable_resource.h" | 11 #include "cc/resources/transferable_resource.h" |
12 #include "ui/surface/transport_dib.h" | |
13 | 12 |
14 namespace cc { | 13 namespace cc { |
15 | 14 |
16 class CC_EXPORT CompositorFrameAck { | 15 class CC_EXPORT CompositorFrameAck { |
17 public: | 16 public: |
18 CompositorFrameAck(); | 17 CompositorFrameAck(); |
19 ~CompositorFrameAck(); | 18 ~CompositorFrameAck(); |
20 | 19 |
21 TransferableResourceArray resources; | 20 TransferableResourceArray resources; |
22 scoped_ptr<GLFrameData> gl_frame_data; | 21 scoped_ptr<GLFrameData> gl_frame_data; |
23 TransportDIB::Id last_dib_id; | 22 unsigned last_software_frame_id; |
24 | 23 |
25 private: | 24 private: |
26 DISALLOW_COPY_AND_ASSIGN(CompositorFrameAck); | 25 DISALLOW_COPY_AND_ASSIGN(CompositorFrameAck); |
27 }; | 26 }; |
28 | 27 |
29 } // namespace cc | 28 } // namespace cc |
30 | 29 |
31 #endif // CC_OUTPUT_COMPOSITOR_FRAME_ACK_H_ | 30 #endif // CC_OUTPUT_COMPOSITOR_FRAME_ACK_H_ |
OLD | NEW |