cc/layers/texture_layer_impl.cc - Issue 16888015: Reland r206537 - cc: Don't return mailboxes if the TextureLayer is removed from the tree.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: cc/layers/texture_layer_impl.cc

Issue 16888015: Reland r206537 - cc: Don't return mailboxes if the TextureLayer is removed from the tree. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: nits Created 7 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: cc/layers/texture_layer_impl.cc

diff --git a/cc/layers/texture_layer_impl.cc b/cc/layers/texture_layer_impl.cc

index ad28757aac66fe2ab910f4effacda2c689746c56..3ded0c92a53011c9766176381389de60b1aa15b0 100644

--- a/cc/layers/texture_layer_impl.cc

+++ b/cc/layers/texture_layer_impl.cc

@@ -34,8 +34,6 @@ TextureLayerImpl::~TextureLayerImpl() { FreeTextureMailbox(); }

void TextureLayerImpl::SetTextureMailbox(const TextureMailbox& mailbox) {

DCHECK(uses_mailbox_);

- if (own_mailbox_)

- DCHECK(!mailbox.IsValid() || !mailbox.Equals(texture_mailbox_));

FreeTextureMailbox();

texture_mailbox_ = mailbox;

own_mailbox_ = true;

« no previous file with comments | « cc/layers/texture_layer.cc ('k') | cc/layers/texture_layer_unittest.cc » ('j') | no next file with comments »