| Index: cc/texture_layer_impl.h
|
| diff --git a/cc/texture_layer_impl.h b/cc/texture_layer_impl.h
|
| index b7e5998f1ea007518ad23bbcab689d973c46608c..409afdfcfda006bfc982bdeffe449ea0bb27a18f 100644
|
| --- a/cc/texture_layer_impl.h
|
| +++ b/cc/texture_layer_impl.h
|
| @@ -42,7 +42,7 @@ public:
|
| void setVertexOpacity(const float vertexOpacity[4]);
|
| virtual bool canClipSelf() const OVERRIDE;
|
|
|
| - void setTextureMailbox(const std::string& mailboxName, const base::Callback<void(unsigned)>& releaseCallback);
|
| + void setTextureMailbox(const TextureMailbox&);
|
|
|
| private:
|
| TextureLayerImpl(LayerTreeImpl* treeImpl, int id, bool usesMailbox);
|
| @@ -58,8 +58,7 @@ private:
|
| float m_vertexOpacity[4];
|
|
|
| bool m_hasPendingMailbox;
|
| - std::string m_pendingMailboxName;
|
| - base::Callback<void(unsigned)> m_pendingMailboxReleaseCallback;
|
| + TextureMailbox m_pendingTextureMailbox;
|
| bool m_usesMailbox;
|
| };
|
|
|
|
|