Split WebMediaPlayerImpl::Proxy into its own class.

webkit/glue/media/video_renderer_impl.cc

 // 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.
 
 #include "webkit/glue/media/video_renderer_impl.h"
 
+#include "base/logging.h"
 #include "media/base/video_frame.h"
 #include "media/base/yuv_convert.h"
-#include "webkit/glue/webmediaplayer_impl.h"
+#include "third_party/skia/include/core/SkCanvas.h"
+#include "third_party/skia/include/core/SkDevice.h"
+#include "webkit/glue/webmediaplayer_proxy.h"
+
+// Transform destination rect to local coordinates.
+static void TransformToSkIRect(const SkMatrix& matrix,
+                               const gfx::Rect& src_rect,
+                               SkIRect* dest_rect) {
+  SkRect transformed_rect;
+  SkRect skia_dest_rect;
+  skia_dest_rect.iset(src_rect.x(), src_rect.y(),
+                      src_rect.right(), src_rect.bottom());
+  matrix.mapRect(&transformed_rect, skia_dest_rect);
+  transformed_rect.round(dest_rect);
+}
 
 namespace webkit_glue {
 
 VideoRendererImpl::VideoRendererImpl(bool pts_logging)
     : last_converted_frame_(NULL),
       pts_logging_(pts_logging) {
 }
 
 VideoRendererImpl::~VideoRendererImpl() {}
 
@@ skipping 10 matching lines @@
   if (callback) {
     callback->Run();
     delete callback;
   }
 }
 
 void VideoRendererImpl::OnFrameAvailable() {
   proxy_->Repaint();
 }
 
-void VideoRendererImpl::SetWebMediaPlayerImplProxy(
-    WebMediaPlayerImpl::Proxy* proxy) {
+void VideoRendererImpl::SetWebMediaPlayerProxy(WebMediaPlayerProxy* proxy) {
   proxy_ = proxy;
 }
 
-void VideoRendererImpl::SetRect(const gfx::Rect& rect) {
-}
+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) {
   scoped_refptr<media::VideoFrame> video_frame;
   GetCurrentFrame(&video_frame);
   if (!video_frame) {
     SkPaint paint;
     paint.setColor(SK_ColorBLACK);
     canvas->drawRectCoords(
@@ skipping 235 matching lines @@
                            video_frame->stride(media::VideoFrame::kYPlane),
                            video_frame->stride(media::VideoFrame::kUPlane),
                            bitmap.rowBytes(),
                            yuv_type,
                            media::ROTATE_0,
                            media::FILTER_BILINEAR);
     bitmap.unlockPixels();
   }
 }
 
-void VideoRendererImpl::TransformToSkIRect(const SkMatrix& matrix,
-                                           const gfx::Rect& src_rect,
-                                           SkIRect* dest_rect) {
-    // Transform destination rect to local coordinates.
-    SkRect transformed_rect;
-    SkRect skia_dest_rect;
-    skia_dest_rect.iset(src_rect.x(), src_rect.y(),
-                        src_rect.right(), src_rect.bottom());
-    matrix.mapRect(&transformed_rect, skia_dest_rect);
-    transformed_rect.round(dest_rect);
-}
-
 }  // namespace webkit_glue