Completely random typo fixes and style corrections cleanup.

Accumulated these while spelunking into the fast-forward issue, but now that's
on hold figured I'd send these out for cleanup.

BUG=none
TEST=trybots


Review URL: http://codereview.chromium.org/7726002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98194 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 2 insertions, 27 deletions

diff --git a/webkit/glue/media/video_renderer_impl.cc b/webkit/glue/media/video_renderer_impl.cc
index c217336..de516e0 100644
--- a/webkit/glue/media/video_renderer_impl.cc
+++ b/webkit/glue/media/video_renderer_impl.cc
@@ -60,8 +60,7 @@ void VideoRendererImpl::SetWebMediaPlayerProxy(WebMediaPlayerProxy* proxy) {
 void VideoRendererImpl::SetRect(const gfx::Rect& rect) {}
 
 // This method is always called on the renderer's thread.
-void VideoRendererImpl::Paint(SkCanvas* canvas,
-                              const gfx::Rect& dest_rect) {
+void VideoRendererImpl::Paint(SkCanvas* canvas, const gfx::Rect& dest_rect) {
   scoped_refptr<media::VideoFrame> video_frame;
   GetCurrentFrame(&video_frame);
   if (!video_frame) {
@@ -91,16 +90,6 @@ void VideoRendererImpl::Paint(SkCanvas* canvas,
   PutCurrentFrame(video_frame);
 }
 
-void VideoRendererImpl::GetCurrentFrame(
-    scoped_refptr<media::VideoFrame>* frame_out) {
-  VideoRendererBase::GetCurrentFrame(frame_out);
-}
-
-void VideoRendererImpl::PutCurrentFrame(
-    scoped_refptr<media::VideoFrame> frame) {
-  VideoRendererBase::PutCurrentFrame(frame);
-}
-
 // CanFastPaint is a helper method to determine the conditions for fast
 // painting. The conditions are:
 // 1. No skew in canvas matrix.
diff --git a/webkit/glue/media/video_renderer_impl.h b/webkit/glue/media/video_renderer_impl.h
index a9d3b6b..71977d0 100644
--- a/webkit/glue/media/video_renderer_impl.h
+++ b/webkit/glue/media/video_renderer_impl.h
@@ -28,10 +28,6 @@ class VideoRendererImpl : public WebVideoRenderer {
   virtual void SetWebMediaPlayerProxy(WebMediaPlayerProxy* proxy) OVERRIDE;
   virtual void SetRect(const gfx::Rect& rect) OVERRIDE;
   virtual void Paint(SkCanvas* canvas, const gfx::Rect& dest_rect) OVERRIDE;
-  virtual void GetCurrentFrame(
-      scoped_refptr<media::VideoFrame>* frame_out) OVERRIDE;
-  virtual void PutCurrentFrame(
-      scoped_refptr<media::VideoFrame> frame) OVERRIDE;
 
  protected:
   // VideoRendererBase implementation.
diff --git a/webkit/glue/media/web_video_renderer.h b/webkit/glue/media/web_video_renderer.h
index aa938a8..c2762e1 100644
--- a/webkit/glue/media/web_video_renderer.h
+++ b/webkit/glue/media/web_video_renderer.h
@@ -36,17 +36,7 @@ class WebVideoRenderer : public media::VideoRendererBase {
   // |dest_rect|.
   //
   // Method called on the render thread.
-  virtual void Paint(SkCanvas* canvas,
-                     const gfx::Rect& dest_rect) = 0;
-
-  // Clients of this class (painter/compositor) should use GetCurrentFrame()
-  // obtain ownership of VideoFrame, it should always relinquish the ownership
-  // by use PutCurrentFrame(). Current frame is not guaranteed to be non-NULL.
-  // It expects clients to use color-fill the background if current frame
-  // is NULL. This could happen when before pipeline is pre-rolled or during
-  // pause/flush/seek.
-  virtual void GetCurrentFrame(scoped_refptr<media::VideoFrame>* frame_out) {}
-  virtual void PutCurrentFrame(scoped_refptr<media::VideoFrame> frame) {}
+  virtual void Paint(SkCanvas* canvas, const gfx::Rect& dest_rect) = 0;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(WebVideoRenderer);