diff options
author | piman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-10 00:41:11 +0000 |
---|---|---|
committer | piman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-10 00:41:11 +0000 |
commit | 17e0843927433cb7c6bf679828432a31f5781582 (patch) | |
tree | 5e0b9dd2a5c277d784ebac586f5ab0b82979fdbc /cc/layers/texture_layer.h | |
parent | 2a1d6df0dce7af3b2a4722a93f7dc61388557a0c (diff) | |
download | chromium_src-17e0843927433cb7c6bf679828432a31f5781582.zip chromium_src-17e0843927433cb7c6bf679828432a31f5781582.tar.gz chromium_src-17e0843927433cb7c6bf679828432a31f5781582.tar.bz2 |
Remove old texture path in TextureLayer
This lets us also remove LayerTreeHost::AcquireLayerTextures and related
scheduler things.
BUG=337922
Review URL: https://codereview.chromium.org/227413011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@262878 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/layers/texture_layer.h')
-rw-r--r-- | cc/layers/texture_layer.h | 23 |
1 files changed, 3 insertions, 20 deletions
diff --git a/cc/layers/texture_layer.h b/cc/layers/texture_layer.h index c2af7eb..aa2ed56 100644 --- a/cc/layers/texture_layer.h +++ b/cc/layers/texture_layer.h @@ -81,27 +81,14 @@ class CC_EXPORT TextureLayer : public Layer { DISALLOW_COPY_AND_ASSIGN(TextureMailboxHolder); }; - // If this texture layer requires special preparation logic for each frame - // driven by the compositor, pass in a non-nil client. Pass in a nil client - // pointer if texture updates are driven by an external process. - static scoped_refptr<TextureLayer> Create(TextureLayerClient* client); - // Used when mailbox names are specified instead of texture IDs. static scoped_refptr<TextureLayer> CreateForMailbox( TextureLayerClient* client); - // Resets the client, which also resets the texture. This may synchronize with - // the impl thread if it is currently drawing a texture from the client, that - // was given via TextureLayerClient::PrepareTexture. After this call it is - // safe to destroy that texture. Note: it doesn't synchronize for mailboxes, - // those can only be destroyed after the release callback has been called. + // Resets the client, which also resets the texture. void ClearClient(); - // Resets the texture. This may synchronize with the impl thread if it is - // currently drawing a texture from the client, that was given via - // TextureLayerClient::PrepareTexture. After this call it is safe to destroy - // that texture. Note: it doesn't synchronize for mailboxes, those can only be - // destroyed after the release callback has been called. + // Resets the texture. void ClearTexture(); virtual scoped_ptr<LayerImpl> CreateLayerImpl(LayerTreeImpl* tree_impl) @@ -135,7 +122,6 @@ class CC_EXPORT TextureLayer : public Layer { void SetRateLimitContext(bool rate_limit); // Code path for plugins which supply their own mailbox. - bool uses_mailbox() const { return uses_mailbox_; } void SetTextureMailbox(const TextureMailbox& mailbox, scoped_ptr<SingleReleaseCallback> release_callback); @@ -155,7 +141,7 @@ class CC_EXPORT TextureLayer : public Layer { virtual Region VisibleContentOpaqueRegion() const OVERRIDE; protected: - TextureLayer(TextureLayerClient* client, bool uses_mailbox); + explicit TextureLayer(TextureLayerClient* client); virtual ~TextureLayer(); private: @@ -166,7 +152,6 @@ class CC_EXPORT TextureLayer : public Layer { bool allow_mailbox_reuse); TextureLayerClient* client_; - bool uses_mailbox_; bool flipped_; gfx::PointF uv_top_left_; @@ -176,9 +161,7 @@ class CC_EXPORT TextureLayer : public Layer { bool premultiplied_alpha_; bool blend_background_color_; bool rate_limit_context_; - bool impl_may_draw_client_data_; - unsigned texture_id_; scoped_ptr<TextureMailboxHolder::MainThreadReference> holder_ref_; bool needs_set_mailbox_; |