Merge 97451 - Clear WebMediaPlayerClientImpl back pointer on destruction

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

 /*
  * 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 35 matching lines @@
 
     static PassRefPtr<VideoLayerChromium> create(GraphicsLayerChromium* owner = 0,
                                                  VideoFrameProvider* = 0);
     virtual ~VideoLayerChromium();
 
     virtual PassRefPtr<CCLayerImpl> createCCLayerImpl();
 
     virtual void updateCompositorResources(GraphicsContext3D*);
     virtual bool drawsContent() const { return true; }
 
-    // This function is called by VideoFrameProvider. When this method is called
-    // putCurrentFrame() must be called to return the frame currently held.
-    void releaseCurrentFrame();
+    void releaseProvider();
 
     virtual void pushPropertiesTo(CCLayerImpl*);
 
     virtual void setLayerTreeHost(CCLayerTreeHost*);
 
 protected:
     virtual void cleanupResources();
     virtual const char* layerTypeAsString() const { return "VideoLayer"; }
 
 private:
     struct Texture {
         IntSize m_visibleSize;
         OwnPtr<ManagedTexture> m_texture;
     };
 
     VideoLayerChromium(GraphicsLayerChromium* owner, VideoFrameProvider*);
 
     static GC3Denum determineTextureFormat(const VideoFrameChromium*);
     static IntSize computeVisibleSize(const VideoFrameChromium*, unsigned plane);
     bool reserveTextures(const VideoFrameChromium*, GC3Denum textureFormat);
     void updateTexture(GraphicsContext3D*, Texture&, const void*) const;
 
     void resetFrameParameters();
 
     bool m_skipsDraw;
     VideoFrameChromium::Format m_frameFormat;
     VideoFrameProvider* m_provider;
 
     Texture m_textures[3];
-
-    // This will be null for the entire duration of video playback if hardware
-    // decoding is not being used.
-    VideoFrameChromium* m_currentFrame;
 };
 
 }
 #endif // USE(ACCELERATED_COMPOSITING)
 
 #endif