Eliminate skia::PlatformCanvas - Step 1

webkit/glue/media/video_renderer_impl.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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 "media/base/video_frame.h"
 #include "media/base/yuv_convert.h"
 #include "webkit/glue/webmediaplayer_impl.h"
 
 namespace webkit_glue {
@@ skipping 30 matching lines @@
 
 void VideoRendererImpl::SetWebMediaPlayerImplProxy(
     WebMediaPlayerImpl::Proxy* proxy) {
   proxy_ = proxy;
 }
 
 void VideoRendererImpl::SetRect(const gfx::Rect& rect) {
 }
 
 // This method is always called on the renderer's thread.
-void VideoRendererImpl::Paint(skia::PlatformCanvas* canvas,
+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(
         static_cast<float>(dest_rect.x()),
         static_cast<float>(dest_rect.y()),
         static_cast<float>(dest_rect.right()),
@@ skipping 28 matching lines @@
 }
 
 // CanFastPaint is a helper method to determine the conditions for fast
 // painting. The conditions are:
 // 1. No skew in canvas matrix.
 // 2. No flipping nor mirroring.
 // 3. Canvas has pixel format ARGB8888.
 // 4. Canvas is opaque.
 // TODO(hclam): The fast paint method should support flipping and mirroring.
 // Disable the flipping and mirroring checks once we have it.
-bool VideoRendererImpl::CanFastPaint(skia::PlatformCanvas* canvas,
+bool VideoRendererImpl::CanFastPaint(SkCanvas* canvas,
                                      const gfx::Rect& dest_rect) {
   // Fast paint does not handle opacity value other than 1.0. Hence use slow
   // paint if opacity is not 1.0. Since alpha = opacity * 0xFF, we check that
   // alpha != 0xFF.
   //
   // Additonal notes: If opacity = 0.0, the chrome display engine does not try
   // to render the video. So, this method is never called. However, if the
   // opacity = 0.0001, alpha is again 0, but the display engine tries to render
   // the video. If we use Fast paint, the video shows up with opacity = 1.0.
   // Hence we use slow paint also in the case where alpha = 0. It would be ideal
@@ skipping 33 matching lines @@
     if (config == SkBitmap::kARGB_8888_Config && device->isOpaque() &&
         device_rect.contains(total_clip.getBounds())) {
       return true;
     }
   }
 
   return false;
 }
 
 void VideoRendererImpl::SlowPaint(media::VideoFrame* video_frame,
-                                  skia::PlatformCanvas* canvas,
+                                  SkCanvas* canvas,
                                   const gfx::Rect& dest_rect) {
   // 1. Convert YUV frame to RGB.
   base::TimeDelta timestamp = video_frame->GetTimestamp();
   if (video_frame != last_converted_frame_ ||
       timestamp != last_converted_timestamp_) {
     last_converted_frame_ = video_frame;
     last_converted_timestamp_ = timestamp;
     DCHECK(video_frame->format() == media::VideoFrame::YV12 ||
            video_frame->format() == media::VideoFrame::YV16);
     DCHECK(video_frame->stride(media::VideoFrame::kUPlane) ==
@@ skipping 26 matching lines @@
                     SkIntToScalar(video_size_.width()),
                     SkIntToScalar(dest_rect.height()) /
                     SkIntToScalar(video_size_.height()));
   }
   SkPaint paint;
   paint.setFlags(SkPaint::kFilterBitmap_Flag);
   canvas->drawBitmapMatrix(bitmap_, matrix, &paint);
 }
 
 void VideoRendererImpl::FastPaint(media::VideoFrame* video_frame,
-                                  skia::PlatformCanvas* canvas,
+                                  SkCanvas* canvas,
                                   const gfx::Rect& dest_rect) {
   DCHECK(video_frame->format() == media::VideoFrame::YV12 ||
          video_frame->format() == media::VideoFrame::YV16);
   DCHECK(video_frame->stride(media::VideoFrame::kUPlane) ==
          video_frame->stride(media::VideoFrame::kVPlane));
   DCHECK(video_frame->planes() == media::VideoFrame::kNumYUVPlanes);
   const SkBitmap& bitmap = canvas->getDevice()->accessBitmap(true);
   media::YUVType yuv_type = (video_frame->format() == media::VideoFrame::YV12) ?
                             media::YV12 : media::YV16;
   int y_shift = yuv_type;  // 1 for YV12, 0 for YV16.
@@ skipping 94 matching lines @@
     // 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