diff options
Diffstat (limited to 'chromium/content/child/child_shared_bitmap_manager.h')
-rw-r--r-- | chromium/content/child/child_shared_bitmap_manager.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/chromium/content/child/child_shared_bitmap_manager.h b/chromium/content/child/child_shared_bitmap_manager.h index 792ed4591e5..feb065bb92a 100644 --- a/chromium/content/child/child_shared_bitmap_manager.h +++ b/chromium/content/child/child_shared_bitmap_manager.h @@ -7,9 +7,10 @@ #include <stdint.h> +#include <memory> + #include "base/macros.h" #include "base/memory/ref_counted.h" -#include "base/memory/scoped_ptr.h" #include "base/memory/shared_memory.h" #include "cc/resources/shared_bitmap_manager.h" #include "content/child/thread_safe_sender.h" @@ -34,15 +35,15 @@ class ChildSharedBitmapManager : public cc::SharedBitmapManager { ~ChildSharedBitmapManager() override; // cc::SharedBitmapManager implementation. - scoped_ptr<cc::SharedBitmap> AllocateSharedBitmap( + std::unique_ptr<cc::SharedBitmap> AllocateSharedBitmap( const gfx::Size& size) override; - scoped_ptr<cc::SharedBitmap> GetSharedBitmapFromId( + std::unique_ptr<cc::SharedBitmap> GetSharedBitmapFromId( const gfx::Size&, const cc::SharedBitmapId&) override; - scoped_ptr<cc::SharedBitmap> GetBitmapForSharedMemory( + std::unique_ptr<cc::SharedBitmap> GetBitmapForSharedMemory( base::SharedMemory* mem); - scoped_ptr<SharedMemoryBitmap> AllocateSharedMemoryBitmap( + std::unique_ptr<SharedMemoryBitmap> AllocateSharedMemoryBitmap( const gfx::Size& size); private: |