Remove --enable-video-logging and WebVideoRenderer.

webkit/media/video_renderer_impl.h

 // Copyright (c) 2011 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_VIDEO_RENDERER_IMPL_H_
 #define WEBKIT_MEDIA_VIDEO_RENDERER_IMPL_H_
 
 #include "media/base/buffers.h"
 #include "media/base/filters.h"
 #include "media/filters/video_renderer_base.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayer.h"
+#include "ui/gfx/rect.h"
 #include "ui/gfx/size.h"
 #include "third_party/skia/include/core/SkBitmap.h"
-#include "webkit/media/web_video_renderer.h"
+
+class SkCanvas;
 
 namespace webkit_media {
 
+class WebMediaPlayerProxy;
+
 // The video renderer implementation to be use by the media pipeline. It lives
 // inside video renderer thread and also WebKit's main thread. We need to be
 // extra careful about members shared by two different threads, especially
 // video frame buffers.
-class VideoRendererImpl : public WebVideoRenderer {
+class VideoRendererImpl : public media::VideoRendererBase {
  public:
-  explicit VideoRendererImpl(bool pts_logging);
+  explicit VideoRendererImpl(const scoped_refptr<WebMediaPlayerProxy>& proxy);
   virtual ~VideoRendererImpl();
 
-  // WebVideoRenderer implementation.
-  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;
+  // Paint the current front frame on the |canvas| stretching it to fit the
+  // |dest_rect|.
+  //
+  // Method called on the render thread.
+  void Paint(SkCanvas* canvas, const gfx::Rect& dest_rect);
 
  protected:
   // VideoRendererBase implementation.
   virtual bool OnInitialize(media::VideoDecoder* decoder) OVERRIDE;
   virtual void OnStop(const base::Closure& callback) OVERRIDE;
   virtual void OnFrameAvailable() OVERRIDE;
 
  private:
   // Determine the conditions to perform fast paint. Returns true if we can do
   // fast paint otherwise false.
@@ skipping 23 matching lines @@
   // and it should be assumed that the value of the pointer is INVALID unless
   // it matches the pointer returned from GetCurrentFrame().  Even then, just
   // to make sure, we compare the timestamp to be sure the bits in the
   // |current_frame_bitmap_| are valid.
   media::VideoFrame* last_converted_frame_;
   base::TimeDelta last_converted_timestamp_;
 
   // The natural size of the video.
   gfx::Size natural_size_;
 
-  // Whether we're logging video presentation timestamps (PTS).
-  bool pts_logging_;
-
   DISALLOW_COPY_AND_ASSIGN(VideoRendererImpl);
 };
 
 }  // namespace webkit_media
 
 #endif  // WEBKIT_MEDIA_VIDEO_RENDERER_IMPL_H_