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

Unified Diff: Source/WebCore/platform/graphics/chromium/cc/CCVideoLayerImpl.cpp

Issue 9309085: Merge 106610 - Avoid crashing renderer when GPU process dies by not caching textures between vide... (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1025/
Patch Set: Created 8 years, 11 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 | « Source/WebCore/ChangeLog ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/platform/graphics/chromium/cc/CCVideoLayerImpl.cpp
===================================================================
--- Source/WebCore/platform/graphics/chromium/cc/CCVideoLayerImpl.cpp (revision 106674)
+++ Source/WebCore/platform/graphics/chromium/cc/CCVideoLayerImpl.cpp (working copy)
@@ -150,8 +150,17 @@
CRASH(); // Someone updated convertVFCFormatToGC3DFormat above but update this!
}
- for (unsigned plane = 0; plane < frame->planes(); ++plane)
+ for (unsigned plane = 0; plane < frame->planes(); ++plane) {
m_textures[plane].m_texture->unreserve();
+ // FIXME: ManagedTexture's store a raw pointer to their TextureManager,
+ // and the textures we create use layerRenderer->renderSurfaceTextureManager().
+ // Since there is no guarantee layerRenderer will still be alive the
+ // next time we are called, we clear the texture reference. It would
+ // be nice if instead we could rely on textures being invalidated when
+ // their manager was deleted so that new textures didn't always have to
+ // be recreated for each frame.
+ m_textures[plane].m_texture.clear();
+ }
m_provider->putCurrentFrame(frame);
}
« no previous file with comments | « Source/WebCore/ChangeLog ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698