| 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" | |
| 10 #include "cc/output/gl_frame_data.h" | 9 #include "cc/output/gl_frame_data.h" |
| 11 #include "cc/resources/returned_resource.h" | 10 #include "cc/resources/returned_resource.h" |
| 12 | 11 |
| 13 namespace cc { | 12 namespace cc { |
| 14 | 13 |
| 15 class CC_EXPORT CompositorFrameAck { | 14 class CompositorFrameAck { |
| 16 public: | 15 public: |
| 17 CompositorFrameAck(); | 16 CompositorFrameAck(); |
| 18 ~CompositorFrameAck(); | 17 ~CompositorFrameAck(); |
| 19 | 18 |
| 20 ReturnedResourceArray resources; | 19 ReturnedResourceArray resources; |
| 21 scoped_ptr<GLFrameData> gl_frame_data; | 20 scoped_ptr<GLFrameData> gl_frame_data; |
| 22 unsigned last_software_frame_id; | 21 unsigned last_software_frame_id; |
| 23 | 22 |
| 24 private: | 23 private: |
| 25 DISALLOW_COPY_AND_ASSIGN(CompositorFrameAck); | 24 DISALLOW_COPY_AND_ASSIGN(CompositorFrameAck); |
| 26 }; | 25 }; |
| 27 | 26 |
| 28 } // namespace cc | 27 } // namespace cc |
| 29 | 28 |
| 30 #endif // CC_OUTPUT_COMPOSITOR_FRAME_ACK_H_ | 29 #endif // CC_OUTPUT_COMPOSITOR_FRAME_ACK_H_ |
| OLD | NEW |