| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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 MEDIA_VIDEO_VIDEO_DECODE_ACCELERATOR_H_ | 5 #ifndef MEDIA_VIDEO_VIDEO_DECODE_ACCELERATOR_H_ |
| 6 #define MEDIA_VIDEO_VIDEO_DECODE_ACCELERATOR_H_ | 6 #define MEDIA_VIDEO_VIDEO_DECODE_ACCELERATOR_H_ |
| 7 | 7 |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <memory> | 10 #include <memory> |
| (...skipping 317 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 328 protected: | 328 protected: |
| 329 // Do not delete directly; use Destroy() or own it with a scoped_ptr, which | 329 // Do not delete directly; use Destroy() or own it with a scoped_ptr, which |
| 330 // will Destroy() it properly by default. | 330 // will Destroy() it properly by default. |
| 331 virtual ~VideoDecodeAccelerator(); | 331 virtual ~VideoDecodeAccelerator(); |
| 332 }; | 332 }; |
| 333 | 333 |
| 334 } // namespace media | 334 } // namespace media |
| 335 | 335 |
| 336 namespace std { | 336 namespace std { |
| 337 | 337 |
| 338 // Specialize std::default_delete so that scoped_ptr<VideoDecodeAccelerator> | 338 // Specialize std::default_delete so that |
| 339 // uses "Destroy()" instead of trying to use the destructor. | 339 // std::unique_ptr<VideoDecodeAccelerator> uses "Destroy()" instead of trying to |
| 340 // use the destructor. |
| 340 template <> | 341 template <> |
| 341 struct MEDIA_EXPORT default_delete<media::VideoDecodeAccelerator> { | 342 struct MEDIA_EXPORT default_delete<media::VideoDecodeAccelerator> { |
| 342 void operator()(media::VideoDecodeAccelerator* vda) const; | 343 void operator()(media::VideoDecodeAccelerator* vda) const; |
| 343 }; | 344 }; |
| 344 | 345 |
| 345 } // namespace std | 346 } // namespace std |
| 346 | 347 |
| 347 #endif // MEDIA_VIDEO_VIDEO_DECODE_ACCELERATOR_H_ | 348 #endif // MEDIA_VIDEO_VIDEO_DECODE_ACCELERATOR_H_ |
| OLD | NEW |