Chromium Code Reviews| Index: cc/texture_layer.h |
| diff --git a/cc/texture_layer.h b/cc/texture_layer.h |
| index 2e7921e4bd33ca6a315ed224c1f462eebb3e945a..1aaf01ce6238e49b64efbbb1221a28e804e03c37 100644 |
| --- a/cc/texture_layer.h |
| +++ b/cc/texture_layer.h |
| @@ -5,6 +5,9 @@ |
| #ifndef CC_TEXTURE_LAYER_H_ |
| #define CC_TEXTURE_LAYER_H_ |
| +#include <string> |
| + |
| +#include "base/callback.h" |
| #include "cc/cc_export.h" |
| #include "cc/layer.h" |
| @@ -24,6 +27,9 @@ public: |
| // are driven by an external process. |
| static scoped_refptr<TextureLayer> create(TextureLayerClient*); |
| + // Used when mailbox names are specified instead of texture ID's |
|
jamesr
2013/01/03 23:40:14
IDs, not ID's
|
| + static scoped_refptr<TextureLayer> createForMailbox(); |
| + |
| void clearClient() { m_client = 0; } |
| virtual scoped_ptr<LayerImpl> createLayerImpl(LayerTreeImpl* treeImpl) OVERRIDE; |
| @@ -48,6 +54,9 @@ public: |
| // Code path for plugins which supply their own texture ID. |
| void setTextureId(unsigned); |
| + // Code path for plugins which supply their own texture ID. |
| + void setTextureMailbox(const std::string&, const base::Callback<void(unsigned)>&); |
|
jamesr
2013/01/03 23:40:14
second time base::Callback<void(unsigned)> is used
|
| + |
| void willModifyTexture(); |
| virtual void setNeedsDisplayRect(const gfx::RectF&) OVERRIDE; |
| @@ -59,11 +68,13 @@ public: |
| virtual bool blocksPendingCommit() const OVERRIDE; |
| protected: |
| - explicit TextureLayer(TextureLayerClient*); |
| + TextureLayer(TextureLayerClient*, bool usesMailbox); |
| virtual ~TextureLayer(); |
| private: |
| TextureLayerClient* m_client; |
| + bool m_usesMailbox; |
| + base::Callback<void(unsigned)> m_mailboxReleaseCallback; |
| bool m_flipped; |
| gfx::RectF m_uvRect; |
| @@ -75,6 +86,7 @@ private: |
| bool m_contentCommitted; |
| unsigned m_textureId; |
| + std::string m_mailboxName; |
| }; |
| } |