| Index: cc/resources/texture_mailbox.h
|
| diff --git a/cc/resources/texture_mailbox.h b/cc/resources/texture_mailbox.h
|
| index cec60cedacaa46b465ac9a54406505e360dca140..47e71acb199227a06375015e5955cbffe38e9685 100644
|
| --- a/cc/resources/texture_mailbox.h
|
| +++ b/cc/resources/texture_mailbox.h
|
| @@ -22,7 +22,12 @@ class CC_EXPORT TextureMailbox {
|
| TextureMailbox();
|
| explicit TextureMailbox(const gpu::MailboxHolder& mailbox_holder);
|
| TextureMailbox(const gpu::Mailbox& mailbox, uint32 target, uint32 sync_point);
|
| - TextureMailbox(SharedBitmap* shared_bitmap, const gfx::Size& size);
|
| + TextureMailbox(const gpu::Mailbox& mailbox,
|
| + uint32 target,
|
| + uint32 sync_point,
|
| + const gfx::Size& size_in_pixels,
|
| + bool allow_overlay);
|
| + TextureMailbox(SharedBitmap* shared_bitmap, const gfx::Size& size_in_pixels);
|
|
|
| ~TextureMailbox();
|
|
|
| @@ -41,20 +46,21 @@ class CC_EXPORT TextureMailbox {
|
| }
|
|
|
| bool allow_overlay() const { return allow_overlay_; }
|
| - void set_allow_overlay(bool allow_overlay) { allow_overlay_ = allow_overlay; }
|
| bool nearest_neighbor() const { return nearest_neighbor_; }
|
| void set_nearest_neighbor(bool nearest_neighbor) {
|
| nearest_neighbor_ = nearest_neighbor;
|
| }
|
|
|
| + // This is valid if allow_overlau() or IsSharedMemory() is true.
|
| + gfx::Size size_in_pixels() const { return size_in_pixels_; }
|
| +
|
| 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_;
|
| SharedBitmap* shared_bitmap_;
|
| - gfx::Size shared_memory_size_;
|
| + gfx::Size size_in_pixels_;
|
| bool allow_overlay_;
|
| bool nearest_neighbor_;
|
| };
|
|
|