diff options
| author | junov@chromium.org <junov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-14 22:26:09 +0000 |
|---|---|---|
| committer | junov@chromium.org <junov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-14 22:26:09 +0000 |
| commit | 27fa4c92f1992a802fdec5b7e8bdfb4da0e5a7f4 (patch) | |
| tree | c0690d6ed9d284c20607d6a1ab1e7d11446f839a /cc | |
| parent | 345ba90876ea3cf3ca86b017cc4aae0e687d4eab (diff) | |
| download | chromium_src-27fa4c92f1992a802fdec5b7e8bdfb4da0e5a7f4.zip chromium_src-27fa4c92f1992a802fdec5b7e8bdfb4da0e5a7f4.tar.gz chromium_src-27fa4c92f1992a802fdec5b7e8bdfb4da0e5a7f4.tar.bz2 | |
Prevent cc:TextureLayer from calling AcquireLayerTexture when using mailboxes
BUG=315170
R=danakj@chromium.org, enne@chromium.org, piman@chromium.org
Review URL: https://codereview.chromium.org/69933014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@235241 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc')
| -rw-r--r-- | cc/layers/texture_layer.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/cc/layers/texture_layer.cc b/cc/layers/texture_layer.cc index 1d21dba..006f96d 100644 --- a/cc/layers/texture_layer.cc +++ b/cc/layers/texture_layer.cc @@ -168,7 +168,8 @@ void TextureLayer::SetTextureMailbox( } void TextureLayer::WillModifyTexture() { - if (layer_tree_host() && (DrawsContent() || content_committed_)) { + if (!uses_mailbox_ && layer_tree_host() && (DrawsContent() || + content_committed_)) { layer_tree_host()->AcquireLayerTextures(); content_committed_ = false; } @@ -269,8 +270,8 @@ void TextureLayer::PushPropertiesTo(LayerImpl* layer) { needs_set_mailbox_ = false; } else { texture_layer->set_texture_id(texture_id_); + content_committed_ = DrawsContent(); } - content_committed_ = DrawsContent(); } Region TextureLayer::VisibleContentOpaqueRegion() const { |