Move VideoFrameProvider to, and remove all usage of WebVideoFrame from cc/

webkit/media/webvideoframe_impl.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_WEBVIDEOFRAME_IMPL_H_
 #define WEBKIT_MEDIA_WEBVIDEOFRAME_IMPL_H_
 
 #include "base/compiler_specific.h"
 #include "media/base/video_frame.h"

[sheu, 2013/01/03 22:00:27]

You could just drop the header now and forward-declare

[danakj, 2013/01/03 22:44:54]

Done.

-#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebRect.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSize.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebVideoFrame.h"
 
 namespace webkit_media {
 
 class WebVideoFrameImpl : public WebKit::WebVideoFrame {

[Ami GONE FROM CHROMIUM, 2013/01/03 21:59:07]

AFAICT at this point this class serves the sole purpose of being able to do a
static_cast<> instead of a C-style cast in WMPI; is that true?

Once this lands, can WebKit::WebVideoFrame be gutted/deleted and replaced with
an opaque pointer?

I'm kinda surprised this works with SW compositing, TBH.  Does webkit painting
really not make any calls to the frame anymore?

[danakj, 2013/01/03 22:44:54]

Yep, as you said: https://bugs.webkit.org/show_bug.cgi?id=106037

Next step will be to remove WebVideoLayer entirely, and then maybe the other
WebVideo* classes can just go away, I'm not sure.

[Ami GONE FROM CHROMIUM, 2013/01/03 22:49:32]

I take it you tested this (gutting WVF) and it works with the meaningful subset
of the cross-product of:
HW/SW decode
accelerated/non-accelerated compositing
threaded/not compositing
canvas2d/webgl grabs of video frames
?

[danakj, 2013/01/03 22:53:57]

I tested with:
- youtube html5 video
- html5doctor.com/demos/video-canvas-magic/demo2.html
- the media test matrix (webm, ogv, mp4)

The avi videos on the test matrix aren't working for me, with or without this
patch.

  public:
-  // This converts a WebKit::WebVideoFrame to a media::VideoFrame.
-  static media::VideoFrame* toVideoFrame(
-      WebKit::WebVideoFrame* web_video_frame);
-
   WebVideoFrameImpl(scoped_refptr<media::VideoFrame> video_frame);
   virtual ~WebVideoFrameImpl();
-  virtual WebVideoFrame::Format format() const;
-  virtual unsigned planes() const;
-  virtual const void* data(unsigned plane) const;
-  virtual unsigned textureId() const;
-  virtual unsigned textureTarget() const;
-  virtual WebKit::WebRect visibleRect() const;
-  virtual WebKit::WebSize textureSize() const;
+
+  scoped_refptr<media::VideoFrame> video_frame;
 
  private:
-  scoped_refptr<media::VideoFrame> video_frame_;
   DISALLOW_COPY_AND_ASSIGN(WebVideoFrameImpl);
 };
 
-// TODO(skaslev) This is temporarily inline pending the removal of
-// WebKit::WebVideoFrame and WebVideoFrameImpl which are currently unused.
-inline media::VideoFrame* WebVideoFrameImpl::toVideoFrame(
-    WebKit::WebVideoFrame* web_video_frame) {
-  WebVideoFrameImpl* wrapped_frame =
-      static_cast<WebVideoFrameImpl*>(web_video_frame);
-  if (wrapped_frame)
-    return wrapped_frame->video_frame_.get();
-  return NULL;
-}
-
 }  // namespace webkit_media
 
 #endif  // WEBKIT_MEDIA_WEBVIDEOFRAME_IMPL_H_