| Index: cc/blink/web_external_bitmap_impl.h
|
| diff --git a/cc/blink/web_external_bitmap_impl.h b/cc/blink/web_external_bitmap_impl.h
|
| index 2d2d8ce6458770d0899bdfe47c6d49827a568c82..6cada7dc3c848d6f048ff83b54ecc2d112239221 100644
|
| --- a/cc/blink/web_external_bitmap_impl.h
|
| +++ b/cc/blink/web_external_bitmap_impl.h
|
| @@ -10,17 +10,18 @@
|
| #include "cc/blink/cc_blink_export.h"
|
| #include "third_party/WebKit/public/platform/WebExternalBitmap.h"
|
|
|
| -namespace base {
|
| -class SharedMemory;
|
| +namespace cc {
|
| +class SharedBitmap;
|
| }
|
|
|
| namespace cc_blink {
|
|
|
| -typedef scoped_ptr<base::SharedMemory>(*SharedMemoryAllocationFunction)(size_t);
|
| +typedef scoped_ptr<cc::SharedBitmap>(*SharedBitmapAllocationFunction)(
|
| + const gfx::Size& size);
|
|
|
| // Sets the function that this will use to allocate shared memory.
|
| -CC_BLINK_EXPORT void SetSharedMemoryAllocationFunction(
|
| - SharedMemoryAllocationFunction);
|
| +CC_BLINK_EXPORT void SetSharedBitmapAllocationFunction(
|
| + SharedBitmapAllocationFunction);
|
|
|
| class WebExternalBitmapImpl : public blink::WebExternalBitmap {
|
| public:
|
| @@ -32,10 +33,10 @@ class WebExternalBitmapImpl : public blink::WebExternalBitmap {
|
| void setSize(blink::WebSize size) override;
|
| uint8* pixels() override;
|
|
|
| - base::SharedMemory* shared_memory() { return shared_memory_.get(); }
|
| + cc::SharedBitmap* shared_bitmap() { return shared_bitmap_.get(); }
|
|
|
| private:
|
| - scoped_ptr<base::SharedMemory> shared_memory_;
|
| + scoped_ptr<cc::SharedBitmap> shared_bitmap_;
|
| blink::WebSize size_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(WebExternalBitmapImpl);
|
|
|