| Index: cc/layers/texture_layer.h
|
| diff --git a/cc/layers/texture_layer.h b/cc/layers/texture_layer.h
|
| index 6ef413cffeda3c11711bc50ded8b13ec5a1360de..009a217ae6a97cf6818d92912c8a498d9917ccbf 100644
|
| --- a/cc/layers/texture_layer.h
|
| +++ b/cc/layers/texture_layer.h
|
| @@ -131,6 +131,12 @@ class CC_EXPORT TextureLayer : public Layer {
|
| void SetTextureMailbox(const TextureMailbox& mailbox,
|
| scoped_ptr<SingleReleaseCallback> release_callback);
|
|
|
| + // Use this for special cases where the same texture is used to back the
|
| + // TextureLayer across all frames.
|
| + // WARNING: DON'T ACTUALLY USE THIS WHAT YOU ARE DOING IS WRONG.
|
| + // TODO(danakj): Remove this when pepper doesn't need it. crbug.com/350204
|
| + void SetTextureMailboxWithoutReleaseCallback(const TextureMailbox& mailbox);
|
| +
|
| void WillModifyTexture();
|
|
|
| virtual void SetNeedsDisplayRect(const gfx::RectF& dirty_rect) OVERRIDE;
|
| @@ -150,7 +156,8 @@ class CC_EXPORT TextureLayer : public Layer {
|
| void SetTextureMailboxInternal(
|
| const TextureMailbox& mailbox,
|
| scoped_ptr<SingleReleaseCallback> release_callback,
|
| - bool requires_commit);
|
| + bool requires_commit,
|
| + bool allow_mailbox_reuse);
|
|
|
| TextureLayerClient* client_;
|
| bool uses_mailbox_;
|
|
|