Eliminate skia::PlatformCanvas - Step 1

webkit/glue/media/video_renderer_impl.h

-// 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.
 //
 // 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.
 
 #ifndef WEBKIT_GLUE_MEDIA_VIDEO_RENDERER_IMPL_H_
 #define WEBKIT_GLUE_MEDIA_VIDEO_RENDERER_IMPL_H_
@@ skipping 11 matching lines @@
 namespace webkit_glue {
 
 class VideoRendererImpl : public WebVideoRenderer {
  public:
   explicit VideoRendererImpl(bool pts_logging);
   virtual ~VideoRendererImpl();
 
   // WebVideoRenderer implementation.
   virtual void SetWebMediaPlayerImplProxy(WebMediaPlayerImpl::Proxy* proxy);
   virtual void SetRect(const gfx::Rect& rect);
-  virtual void Paint(skia::PlatformCanvas* canvas, const gfx::Rect& dest_rect);
+  virtual void Paint(SkCanvas* canvas, const gfx::Rect& dest_rect);
   virtual void GetCurrentFrame(scoped_refptr<media::VideoFrame>* frame_out);
   virtual void PutCurrentFrame(scoped_refptr<media::VideoFrame> frame);
 
  protected:
   // Method called by VideoRendererBase during initialization.
   virtual bool OnInitialize(media::VideoDecoder* decoder);
 
   // Method called by the VideoRendererBase when stopping.
   virtual void OnStop(media::FilterCallback* callback);
 
   // Method called by the VideoRendererBase when a frame is available.
   virtual void OnFrameAvailable();
 
  private:
   // Determine the conditions to perform fast paint. Returns true if we can do
   // fast paint otherwise false.
-  bool CanFastPaint(skia::PlatformCanvas* canvas, const gfx::Rect& dest_rect);
+  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,
-                 skia::PlatformCanvas* canvas,
+                 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,
-                 skia::PlatformCanvas* canvas,
+                 SkCanvas* canvas,
                  const gfx::Rect& dest_rect);
 
   void TransformToSkIRect(const SkMatrix& matrix, const gfx::Rect& src_rect,
                           SkIRect* dest_rect);
 
   // Pointer to our parent object that is called to request repaints.
   scoped_refptr<WebMediaPlayerImpl::Proxy> proxy_;
 
   // An RGB bitmap used to convert the video frames.
   SkBitmap bitmap_;
@@ skipping 13 matching lines @@
 
   // 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_