diff options
| author | karen@chromium.org <karen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-15 21:04:03 +0000 |
|---|---|---|
| committer | karen@chromium.org <karen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-15 21:04:03 +0000 |
| commit | ae01f83fdb4414d5449f830c5f8070bc62734fba (patch) | |
| tree | 00d69d11a5100bfbe8b9fdc380283b7ba44d8adf | |
| parent | 5e7493698a3357063bf61226eb20d8f95000472a (diff) | |
| download | chromium_src-ae01f83fdb4414d5449f830c5f8070bc62734fba.zip chromium_src-ae01f83fdb4414d5449f830c5f8070bc62734fba.tar.gz chromium_src-ae01f83fdb4414d5449f830c5f8070bc62734fba.tar.bz2 | |
Merge 235241 "Prevent cc:TextureLayer from calling AcquireLayerT..."
> 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
TBR=junov@chromium.org
Review URL: https://codereview.chromium.org/74183003
git-svn-id: svn://svn.chromium.org/chrome/branches/1700/src@235421 0039d316-1c4b-4281-b951-d872f2087c98
| -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 45a456e..9d28a11 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; } @@ -273,8 +274,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 { |