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