Merge 97451 - Clear WebMediaPlayerClientImpl back pointer on destruction

Source/WebCore/platform/graphics/chromium/VideoLayerChromium.cpp

Index: Source/WebCore/platform/graphics/chromium/VideoLayerChromium.cpp
===================================================================
--- Source/WebCore/platform/graphics/chromium/VideoLayerChromium.cpp	(revision 97678)
+++ Source/WebCore/platform/graphics/chromium/VideoLayerChromium.cpp	(working copy)
@@ -56,7 +56,6 @@
     , m_skipsDraw(true)
     , m_frameFormat(VideoFrameChromium::Invalid)
     , m_provider(provider)
-    , m_currentFrame(0)
 {
 }
 
@@ -75,12 +74,11 @@
     LayerChromium::cleanupResources();
     for (size_t i = 0; i < 3; ++i)
         m_textures[i].m_texture.clear();
-    releaseCurrentFrame();
 }
 
 void VideoLayerChromium::updateCompositorResources(GraphicsContext3D* context)
 {
-    if (!m_contentsDirty || !m_owner)
+    if (!m_contentsDirty || !m_owner || !m_provider)
         return;
 
     RenderLayerBacking* backing = static_cast<RenderLayerBacking*>(m_owner->client());
@@ -246,13 +244,9 @@
     }
 }
 
-void VideoLayerChromium::releaseCurrentFrame()
+void VideoLayerChromium::releaseProvider()
 {
-    if (!m_currentFrame)
-        return;
-
-    m_provider->putCurrentFrame(m_currentFrame);
-    m_currentFrame = 0;
+    m_provider = 0;
 }
 
 } // namespace WebCore