| Index: content/child/child_shared_bitmap_manager.h
|
| diff --git a/content/child/child_shared_bitmap_manager.h b/content/child/child_shared_bitmap_manager.h
|
| index e4d6b4989fd1772d47d37d881108f8dc90be97df..0d3bc10793a9b754348777d68b68307418a76f93 100644
|
| --- a/content/child/child_shared_bitmap_manager.h
|
| +++ b/content/child/child_shared_bitmap_manager.h
|
| @@ -18,13 +18,15 @@ class ChildSharedBitmapManager : public cc::SharedBitmapManager {
|
| ChildSharedBitmapManager(scoped_refptr<ThreadSafeSender> sender);
|
| ~ChildSharedBitmapManager() override;
|
|
|
| + // cc::SharedBitmapManager implementation.
|
| scoped_ptr<cc::SharedBitmap> AllocateSharedBitmap(
|
| const gfx::Size& size) override;
|
| scoped_ptr<cc::SharedBitmap> GetSharedBitmapFromId(
|
| const gfx::Size&,
|
| const cc::SharedBitmapId&) override;
|
| +
|
| scoped_ptr<cc::SharedBitmap> GetBitmapForSharedMemory(
|
| - base::SharedMemory* mem) override;
|
| + base::SharedMemory* mem);
|
|
|
| private:
|
| scoped_refptr<ThreadSafeSender> sender_;
|
|
|