| Index: cc/resources/texture_mailbox.cc
|
| diff --git a/cc/resources/texture_mailbox.cc b/cc/resources/texture_mailbox.cc
|
| index 6788fe5b4cf357a023aed35ccff64ac471c1c526..bc8915e583c639f89e7b34856c14c0a7dfbdc70a 100644
|
| --- a/cc/resources/texture_mailbox.cc
|
| +++ b/cc/resources/texture_mailbox.cc
|
| @@ -19,8 +19,13 @@ TextureMailbox::TextureMailbox(const gpu::MailboxHolder& mailbox_holder)
|
| : mailbox_holder_(mailbox_holder),
|
| shared_bitmap_(NULL),
|
| is_overlay_candidate_(false),
|
| +#if defined(OS_ANDROID)
|
| + is_backed_by_surface_texture_(false),
|
| + wants_promotion_hint_(false),
|
| +#endif
|
| secure_output_only_(false),
|
| - nearest_neighbor_(false) {}
|
| + nearest_neighbor_(false) {
|
| +}
|
|
|
| TextureMailbox::TextureMailbox(const gpu::Mailbox& mailbox,
|
| const gpu::SyncToken& sync_token,
|
| @@ -28,20 +33,28 @@ TextureMailbox::TextureMailbox(const gpu::Mailbox& mailbox,
|
| : mailbox_holder_(mailbox, sync_token, target),
|
| shared_bitmap_(NULL),
|
| is_overlay_candidate_(false),
|
| +#if defined(OS_ANDROID)
|
| + is_backed_by_surface_texture_(false),
|
| + wants_promotion_hint_(false),
|
| +#endif
|
| secure_output_only_(false),
|
| - nearest_neighbor_(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,
|
| + bool is_overlay_candidate,
|
| + bool secure_output_only)
|
| : mailbox_holder_(mailbox, sync_token, target),
|
| shared_bitmap_(nullptr),
|
| size_in_pixels_(size_in_pixels),
|
| is_overlay_candidate_(is_overlay_candidate),
|
| +#if defined(OS_ANDROID)
|
| + is_backed_by_surface_texture_(false),
|
| + wants_promotion_hint_(false),
|
| +#endif
|
| secure_output_only_(secure_output_only),
|
| nearest_neighbor_(false) {
|
| DCHECK(!is_overlay_candidate || !size_in_pixels.IsEmpty());
|
| @@ -52,6 +65,10 @@ TextureMailbox::TextureMailbox(SharedBitmap* shared_bitmap,
|
| : shared_bitmap_(shared_bitmap),
|
| size_in_pixels_(size_in_pixels),
|
| is_overlay_candidate_(false),
|
| +#if defined(OS_ANDROID)
|
| + is_backed_by_surface_texture_(false),
|
| + wants_promotion_hint_(false),
|
| +#endif
|
| secure_output_only_(false),
|
| nearest_neighbor_(false) {
|
| // If an embedder of cc gives an invalid TextureMailbox, we should crash
|
|
|