ui/compositor/layer.cc - Issue 213743005: cc: Remove TextureLayer::SetTextureId and TextureLayer::WillModifyTexture

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: ui/compositor/layer.cc

Issue 213743005: cc: Remove TextureLayer::SetTextureId and TextureLayer::WillModifyTexture (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase on top of https://codereview.chromium.org/219963015/, fix assert Created 6 years, 9 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

« cc/layers/texture_layer.h ('K') | « content/shell/renderer/test_runner/TestPlugin.cpp ('k') | webkit/renderer/compositor_bindings/web_external_texture_layer_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ui/compositor/layer.cc

diff --git a/ui/compositor/layer.cc b/ui/compositor/layer.cc

index 1637d5e7451913d38ef09b3d5f66a01e799a74cb..e4161d87c7da70ad73962012c8a70778f0d50c2b 100644

--- a/ui/compositor/layer.cc

+++ b/ui/compositor/layer.cc

@@ -458,7 +458,7 @@ void Layer::SwitchToLayer(scoped_refptr<cc::Layer> new_layer) {

}

if (texture_layer_.get())

- texture_layer_->WillModifyTexture();

+ texture_layer_->ClearClient();

// TODO(piman): delegated_renderer_layer_ cleanup.

cc_layer_->RemoveAllChildren();