| OLD | NEW | 
|    1 // Copyright 2013 The Chromium Authors. All rights reserved. |    1 // Copyright 2013 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_ENCODE_ACCELERATOR_H_ |    5 #ifndef MEDIA_VIDEO_VIDEO_ENCODE_ACCELERATOR_H_ | 
|    6 #define MEDIA_VIDEO_VIDEO_ENCODE_ACCELERATOR_H_ |    6 #define MEDIA_VIDEO_VIDEO_ENCODE_ACCELERATOR_H_ | 
|    7  |    7  | 
|    8 #include <stddef.h> |    8 #include <stddef.h> | 
|    9 #include <stdint.h> |    9 #include <stdint.h> | 
|   10  |   10  | 
| (...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  153  protected: |  153  protected: | 
|  154   // Do not delete directly; use Destroy() or own it with a scoped_ptr, which |  154   // Do not delete directly; use Destroy() or own it with a scoped_ptr, which | 
|  155   // will Destroy() it properly by default. |  155   // will Destroy() it properly by default. | 
|  156   virtual ~VideoEncodeAccelerator(); |  156   virtual ~VideoEncodeAccelerator(); | 
|  157 }; |  157 }; | 
|  158  |  158  | 
|  159 }  // namespace media |  159 }  // namespace media | 
|  160  |  160  | 
|  161 namespace std { |  161 namespace std { | 
|  162  |  162  | 
|  163 // Specialize std::default_delete so that scoped_ptr<VideoEncodeAccelerator> |  163 // Specialize std::default_delete so that | 
|  164 // uses "Destroy()" instead of trying to use the destructor. |  164 // std::unique_ptr<VideoEncodeAccelerator> uses "Destroy()" instead of trying to | 
 |  165 // use the destructor. | 
|  165 template <> |  166 template <> | 
|  166 struct MEDIA_EXPORT default_delete<media::VideoEncodeAccelerator> { |  167 struct MEDIA_EXPORT default_delete<media::VideoEncodeAccelerator> { | 
|  167   void operator()(media::VideoEncodeAccelerator* vea) const; |  168   void operator()(media::VideoEncodeAccelerator* vea) const; | 
|  168 }; |  169 }; | 
|  169  |  170  | 
|  170 }  // namespace std |  171 }  // namespace std | 
|  171  |  172  | 
|  172 #endif  // MEDIA_VIDEO_VIDEO_ENCODE_ACCELERATOR_H_ |  173 #endif  // MEDIA_VIDEO_VIDEO_ENCODE_ACCELERATOR_H_ | 
| OLD | NEW |