Merge 106610 - Avoid crashing renderer when GPU process dies by not caching textures between vide...

Source/WebCore/platform/graphics/chromium/cc/CCVideoLayerImpl.cpp

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 132 matching lines @@
     case GraphicsContext3D::RGBA:
         drawRGBA(layerRenderer);
         break;
     case GraphicsContext3D::TEXTURE_2D:
         drawNativeTexture(layerRenderer);
         break;
     default:
         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);
 }
 
 void CCVideoLayerImpl::appendQuads(CCQuadList& quadList, const CCSharedQuadState* sharedQuadState)
 {
     IntRect quadRect(IntPoint(), bounds());
     quadList.append(CCVideoDrawQuad::create(sharedQuadState, quadRect, this));
 }
 
 bool CCVideoLayerImpl::copyFrameToTextures(const VideoFrameChromium* frame, GC3Denum format, LayerRendererChromium* layerRenderer)
@@ skipping 167 matching lines @@
 void CCVideoLayerImpl::dumpLayerProperties(TextStream& ts, int indent) const
 {
     writeIndent(ts, indent);
     ts << "video layer\n";
     CCLayerImpl::dumpLayerProperties(ts, indent);
 }
 
 }
 
 #endif // USE(ACCELERATED_COMPOSITING)