Moving media-related files from webkit/glue/ to webkit/media/.

webkit/glue/media/video_renderer_impl.h

Index: webkit/glue/media/video_renderer_impl.h
diff --git a/webkit/glue/media/video_renderer_impl.h b/webkit/glue/media/video_renderer_impl.h
deleted file mode 100644
index c69e085df8511cb4d513a7bd434bf04a729de398..0000000000000000000000000000000000000000
--- a/webkit/glue/media/video_renderer_impl.h
+++ /dev/null
@@ -1,82 +0,0 @@
-// 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_GLUE_MEDIA_VIDEO_RENDERER_IMPL_H_
-#define WEBKIT_GLUE_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/size.h"
-#include "third_party/skia/include/core/SkBitmap.h"
-#include "webkit/glue/media/web_video_renderer.h"
-
-namespace webkit_glue {
-
-// 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 {
- public:
-  explicit VideoRendererImpl(bool pts_logging);
-  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;
-
- 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.
-  bool CanFastPaint(SkCanvas* canvas, const gfx::Rect& dest_rect);
-
-  // Slow paint does a YUV => RGB, and scaled blit in two separate operations.
-  void SlowPaint(media::VideoFrame* video_frame,
-                 SkCanvas* canvas,
-                 const gfx::Rect& dest_rect);
-
-  // Fast paint does YUV => RGB, scaling, blitting all in one step into the
-  // canvas. It's not always safe and appropriate to perform fast paint.
-  // CanFastPaint() is used to determine the conditions.
-  void FastPaint(media::VideoFrame* video_frame,
-                 SkCanvas* canvas,
-                 const gfx::Rect& dest_rect);
-
-  // Pointer to our parent object that is called to request repaints.
-  scoped_refptr<WebMediaPlayerProxy> proxy_;
-
-  // An RGB bitmap used to convert the video frames.
-  SkBitmap bitmap_;
-
-  // These two members are used to determine if the |bitmap_| contains
-  // an already converted image of the current frame.  IMPORTANT NOTE:  The
-  // value of |last_converted_frame_| must only be used for comparison purposes,
-  // 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_glue
-
-#endif  // WEBKIT_GLUE_MEDIA_VIDEO_RENDERER_IMPL_H_