| Index: cc/resources/texture_mailbox.cc
|
| diff --git a/cc/resources/texture_mailbox.cc b/cc/resources/texture_mailbox.cc
|
| index ff4c6f92022815816ee161c1813643b8d78f5e58..318e90dc41a53b4dfa108530f1eb5ee96c8db433 100644
|
| --- a/cc/resources/texture_mailbox.cc
|
| +++ b/cc/resources/texture_mailbox.cc
|
| @@ -20,8 +20,9 @@ TextureMailbox::TextureMailbox(const gpu::MailboxHolder& mailbox_holder)
|
|
|
| TextureMailbox::TextureMailbox(const gpu::Mailbox& mailbox,
|
| uint32 target,
|
| - uint32 sync_point)
|
| - : mailbox_holder_(mailbox, target, sync_point),
|
| + uint32 sync_point,
|
| + const gpu::SyncToken& sync_token)
|
| + : mailbox_holder_(mailbox, sync_point, sync_token, target),
|
| shared_bitmap_(NULL),
|
| is_overlay_candidate_(false),
|
| nearest_neighbor_(false) {}
|
| @@ -29,9 +30,10 @@ TextureMailbox::TextureMailbox(const gpu::Mailbox& mailbox,
|
| TextureMailbox::TextureMailbox(const gpu::Mailbox& mailbox,
|
| uint32 target,
|
| uint32 sync_point,
|
| + const gpu::SyncToken& sync_token,
|
| const gfx::Size& size_in_pixels,
|
| bool is_overlay_candidate)
|
| - : mailbox_holder_(mailbox, target, sync_point),
|
| + : mailbox_holder_(mailbox, sync_point, sync_token, target),
|
| shared_bitmap_(nullptr),
|
| size_in_pixels_(size_in_pixels),
|
| is_overlay_candidate_(is_overlay_candidate),
|
|
|