Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3137)

Unified Diff: cc/blink/web_external_bitmap_impl.h

Issue 812543002: Update from https://crrev.com/308331 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/base/tiling_data.cc ('k') | cc/blink/web_external_bitmap_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
« no previous file with comments | « cc/base/tiling_data.cc ('k') | cc/blink/web_external_bitmap_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698