Remove WebVideoFrame, WebVideoFrameProvider, and WebVideoLayer.

webkit/media/android/webmediaplayer_android.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef WEBKIT_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_
 #define WEBKIT_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_
 
 #include <jni.h>
 
 #include "base/basictypes.h"
+#include "base/memory/ref_counted.h"
+#include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
-#include "base/memory/scoped_ptr.h"
 #include "base/time.h"
+#include "cc/layers/video_frame_provider.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebURL.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayer.h"
 
-namespace WebKit {
-class WebVideoFrame;
+namespace webkit {
+class WebLayerImpl;
 }
 
 namespace webkit_media {
 
 class StreamTextureFactory;
 class StreamTextureProxy;
 class WebMediaPlayerManagerAndroid;
-class WebVideoFrameImpl;
 
 // An abstract class that serves as the common base class for implementing
 // WebKit::WebMediaPlayer on Android.
 class WebMediaPlayerAndroid
     : public WebKit::WebMediaPlayer,
+      public cc::VideoFrameProvider,
       public MessageLoop::DestructionObserver {
  public:
   // Resource loading.
   virtual void load(const WebKit::WebURL& url, CORSMode cors_mode);
   virtual void load(const WebKit::WebURL& url,
                     WebKit::WebMediaSource* media_source,
                     CORSMode cors_mode);
   virtual void cancelLoad();
 
   // Playback controls.
@@ skipping 44 matching lines @@
   virtual WebKit::WebMediaPlayer::MovieLoadType movieLoadType() const;
 
   virtual float mediaTimeForTimeValue(float timeValue) const;
 
   // Provide statistics.
   virtual unsigned decodedFrameCount() const;
   virtual unsigned droppedFrameCount() const;
   virtual unsigned audioDecodedByteCount() const;
   virtual unsigned videoDecodedByteCount() const;
 
-  // Methods called from VideoLayerChromium. These methods are running on the
-  // compositor thread.
-  virtual WebKit::WebVideoFrame* getCurrentFrame();
-  virtual void putCurrentFrame(WebKit::WebVideoFrame*);
-
-  // This gets called both on compositor and main thread to set the callback
-  // target when a frame is produced.
-  virtual void setStreamTextureClient(WebKit::WebStreamTextureClient* client);
+  // cc::VideoFrameProvider implementation.
+  virtual void SetVideoFrameProviderClient(
+      cc::VideoFrameProvider::Client* client) OVERRIDE;
+  virtual scoped_refptr<media::VideoFrame> GetCurrentFrame() OVERRIDE;
+  virtual void PutCurrentFrame(const scoped_refptr<media::VideoFrame>& frame)
+      OVERRIDE;
 
   // Media player callback handlers.
   virtual void OnMediaPrepared(base::TimeDelta duration);
   virtual void OnPlaybackComplete();
   virtual void OnBufferingUpdate(int percentage);
   virtual void OnSeekComplete(base::TimeDelta current_time);
   virtual void OnMediaError(int error_type);
   virtual void OnVideoSizeChanged(int width, int height);
 
   // Called to update the current time.
@@ skipping 73 matching lines @@
   void ReallocateVideoFrame();
 
   WebKit::WebMediaPlayerClient* const client_;
 
   // Save the list of buffered time ranges.
   WebKit::WebTimeRanges buffered_;
 
   // Size of the video.
   WebKit::WebSize natural_size_;
 
-  // The video frame object used for renderering by WebKit.
-  scoped_ptr<WebVideoFrameImpl> web_video_frame_;
+  // The video frame object used for rendering by the compositor.
+  scoped_refptr<media::VideoFrame> current_frame_;
 
   // Message loop for main renderer thread.
   MessageLoop* main_loop_;
 
   // URL of the media file to be fetched.
   GURL url_;
 
   // Media duration.
   base::TimeDelta duration_;
 
@@ skipping 34 matching lines @@
   // Object for allocating stream textures.
   scoped_ptr<StreamTextureFactory> stream_texture_factory_;
 
   // Object for calling back the compositor thread to repaint the video when a
   // frame available. It should be initialized on the compositor thread.
   scoped_ptr<StreamTextureProxy> stream_texture_proxy_;
 
   // Whether media player needs external surface.
   bool needs_external_surface_;
 
+  // A pointer back to the compositor to inform it about state changes. This is
+  // not NULL while the compositor is actively using this webmediaplayer.
+  cc::VideoFrameProvider::Client* video_frame_provider_client_;
+
+  scoped_ptr<webkit::WebLayerImpl> video_weblayer_;
+
   DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerAndroid);
 };
 
 }  // namespace webkit_media
 
 #endif  // WEBKIT_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_