Index: cc/resources/texture_mailbox.h |
diff --git a/cc/resources/texture_mailbox.h b/cc/resources/texture_mailbox.h |
index 9bf41e18fb89d802a64ae509a7e5a34c5a86d0cd..cec60cedacaa46b465ac9a54406505e360dca140 100644 |
--- a/cc/resources/texture_mailbox.h |
+++ b/cc/resources/texture_mailbox.h |
@@ -13,6 +13,7 @@ |
#include "ui/gfx/geometry/size.h" |
namespace cc { |
+class SharedBitmap; |
// TODO(skaslev, danakj) Rename this class more apropriately since now it |
// can hold a shared memory resource as well as a texture mailbox. |
@@ -21,13 +22,13 @@ class CC_EXPORT TextureMailbox { |
TextureMailbox(); |
explicit TextureMailbox(const gpu::MailboxHolder& mailbox_holder); |
TextureMailbox(const gpu::Mailbox& mailbox, uint32 target, uint32 sync_point); |
- TextureMailbox(base::SharedMemory* shared_memory, const gfx::Size& size); |
+ TextureMailbox(SharedBitmap* shared_bitmap, const gfx::Size& size); |
~TextureMailbox(); |
bool IsValid() const { return IsTexture() || IsSharedMemory(); } |
bool IsTexture() const { return !mailbox_holder_.mailbox.IsZero(); } |
- bool IsSharedMemory() const { return shared_memory_ != NULL; } |
+ bool IsSharedMemory() const { return shared_bitmap_ != NULL; } |
bool Equals(const TextureMailbox&) const; |
@@ -46,13 +47,13 @@ class CC_EXPORT TextureMailbox { |
nearest_neighbor_ = nearest_neighbor; |
} |
- base::SharedMemory* shared_memory() const { return shared_memory_; } |
+ SharedBitmap* shared_bitmap() const { return shared_bitmap_; } |
gfx::Size shared_memory_size() const { return shared_memory_size_; } |
size_t SharedMemorySizeInBytes() const; |
private: |
gpu::MailboxHolder mailbox_holder_; |
- base::SharedMemory* shared_memory_; |
+ SharedBitmap* shared_bitmap_; |
gfx::Size shared_memory_size_; |
bool allow_overlay_; |
bool nearest_neighbor_; |