Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(45)

Unified Diff: trunk/src/content/shell/renderer/test_runner/TestPlugin.cpp

Issue 224153003: Revert 261380 "cc: Remove TextureLayer::SetTextureId and Texture..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: 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
« no previous file with comments | « trunk/src/cc/layers/texture_layer_unittest.cc ('k') | trunk/src/ui/compositor/layer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/content/shell/renderer/test_runner/TestPlugin.cpp
===================================================================
--- trunk/src/content/shell/renderer/test_runner/TestPlugin.cpp (revision 261457)
+++ trunk/src/content/shell/renderer/test_runner/TestPlugin.cpp (working copy)
@@ -222,8 +222,11 @@
void TestPlugin::destroy()
{
- if (m_layer.get())
- m_layer->ClearTexture();
+ if (m_layer.get()) {
+ m_layer->WillModifyTexture();
+ m_layer->SetTextureMailbox(cc::TextureMailbox(),
+ scoped_ptr<cc::SingleReleaseCallback>());
+ }
if (m_container)
m_container->setWebLayer(0);
m_webLayer.reset();
« no previous file with comments | « trunk/src/cc/layers/texture_layer_unittest.cc ('k') | trunk/src/ui/compositor/layer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698