| Index: cc/resources/texture_mailbox.cc
|
| diff --git a/cc/resources/texture_mailbox.cc b/cc/resources/texture_mailbox.cc
|
| index db117f52c54046ca3dbc1bf6c79ef0de54247f5e..44a7d9446dd7620ee38740daf77e46b1ed117ba2 100644
|
| --- a/cc/resources/texture_mailbox.cc
|
| +++ b/cc/resources/texture_mailbox.cc
|
| @@ -31,15 +31,18 @@ TextureMailbox::TextureMailbox(const gpu::Mailbox& mailbox,
|
| secure_output_only_(false),
|
| nearest_neighbor_(false) {}
|
|
|
| -TextureMailbox::TextureMailbox(const gpu::Mailbox& mailbox,
|
| - const gpu::SyncToken& sync_token,
|
| - uint32_t target,
|
| - const gfx::Size& size_in_pixels,
|
| - bool is_overlay_candidate,
|
| - bool secure_output_only)
|
| +TextureMailbox::TextureMailbox(
|
| + const gpu::Mailbox& mailbox,
|
| + const gpu::SyncToken& sync_token,
|
| + uint32_t target,
|
| + const gfx::Size& size_in_pixels,
|
| + const gfx::GpuMemoryBufferHandle& gpu_memory_buffer_handle,
|
| + bool is_overlay_candidate,
|
| + bool secure_output_only)
|
| : mailbox_holder_(mailbox, sync_token, target),
|
| shared_bitmap_(nullptr),
|
| size_in_pixels_(size_in_pixels),
|
| + gpu_memory_buffer_handle_(gpu_memory_buffer_handle),
|
| is_overlay_candidate_(is_overlay_candidate),
|
| secure_output_only_(secure_output_only),
|
| nearest_neighbor_(false) {
|
| @@ -58,6 +61,15 @@ TextureMailbox::TextureMailbox(SharedBitmap* shared_bitmap,
|
| CHECK(SharedBitmap::VerifySizeInBytes(size_in_pixels_));
|
| }
|
|
|
| +TextureMailbox::TextureMailbox(const TextureMailbox& other)
|
| + : mailbox_holder_(other.mailbox_holder_),
|
| + shared_bitmap_(other.shared_bitmap_),
|
| + size_in_pixels_(other.size_in_pixels_),
|
| + gpu_memory_buffer_handle_(other.gpu_memory_buffer_handle_),
|
| + is_overlay_candidate_(other.is_overlay_candidate_),
|
| + secure_output_only_(other.secure_output_only_),
|
| + nearest_neighbor_(other.nearest_neighbor_) {}
|
| +
|
| TextureMailbox::~TextureMailbox() {}
|
|
|
| bool TextureMailbox::Equals(const TextureMailbox& other) const {
|
|
|