Merge 97451 - Clear WebMediaPlayerClientImpl back pointer on destruction

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

 /*
  * Copyright (C) 2010 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 38 matching lines @@
                                                           VideoFrameProvider* provider)
 {
     return adoptRef(new VideoLayerChromium(owner, provider));
 }
 
 VideoLayerChromium::VideoLayerChromium(GraphicsLayerChromium* owner, VideoFrameProvider* provider)
     : LayerChromium(owner)
     , m_skipsDraw(true)
     , m_frameFormat(VideoFrameChromium::Invalid)
     , m_provider(provider)
-    , m_currentFrame(0)
 {
 }
 
 VideoLayerChromium::~VideoLayerChromium()
 {
     cleanupResources();
 }
 
 PassRefPtr<CCLayerImpl> VideoLayerChromium::createCCLayerImpl()
 {
     return CCVideoLayerImpl::create(m_layerId);
 }
 
 void VideoLayerChromium::cleanupResources()
 {
     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());
     if (!backing || backing->paintingGoesToWindow())
         return;
 
     ASSERT(drawsContent());
 
     m_skipsDraw = false;
     VideoFrameChromium* frame = m_provider->getCurrentFrame();
@@ skipping 145 matching lines @@
         memcpy(mem, data, dimensions.width() * dimensions.height());
         GLC(context, static_cast<Extensions3DChromium*>(context->getExtensions())->unmapTexSubImage2DCHROMIUM(mem));
     } else {
         // If mapTexSubImage2DCHROMIUM fails, then do the slower texSubImage2D
         // upload. This does twice the copies as mapTexSubImage2DCHROMIUM, one
         // in the command buffer and another to the texture.
         GLC(context, context->texSubImage2D(GraphicsContext3D::TEXTURE_2D, 0, 0, 0, dimensions.width(), dimensions.height(), format, GraphicsContext3D::UNSIGNED_BYTE, data));
     }
 }
 
-void VideoLayerChromium::releaseCurrentFrame()
+void VideoLayerChromium::releaseProvider()
 {
-    if (!m_currentFrame)
-        return;
-
-    m_provider->putCurrentFrame(m_currentFrame);
-    m_currentFrame = 0;
+    m_provider = 0;
 }
 
 } // namespace WebCore
 
 #endif // USE(ACCELERATED_COMPOSITING)