Eliminate implicit conversion from scoped_refptr<T> to T*

webkit/plugins/ppapi/ppb_graphics_2d_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/plugins/ppapi/ppb_graphics_2d_impl.h"
 
 #include <iterator>
 
 #include "base/bind.h"
 #include "base/logging.h"
@@ skipping 71 matching lines @@
     pixel_out[0] = pixel_in[2];
     pixel_out[1] = pixel_in[1];
     pixel_out[2] = pixel_in[0];
     pixel_out[3] = pixel_in[3];
   }
 }
 
 // Converts ImageData from PP_IMAGEDATAFORMAT_BGRA_PREMUL to
 // PP_IMAGEDATAFORMAT_RGBA_PREMUL, or reverse. It's assumed that the
 // destination image is always mapped (so will have non-NULL data).
-void ConvertImageData(PPB_ImageData_Impl* src_image, const SkIRect& src_rect,
-                      PPB_ImageData_Impl* dest_image, const SkRect& dest_rect) {
+void ConvertImageData(scoped_refptr<PPB_ImageData_Impl> src_image,
+                      const SkIRect& src_rect,
+                      scoped_refptr<PPB_ImageData_Impl> dest_image,
+                      const SkRect& dest_rect) {
   ImageDataAutoMapper auto_mapper(src_image);
 
   DCHECK(src_image->format() != dest_image->format());
   DCHECK(PPB_ImageData_Impl::IsImageDataFormatSupported(src_image->format()));
   DCHECK(PPB_ImageData_Impl::IsImageDataFormatSupported(dest_image->format()));
 
   const SkBitmap* src_bitmap = src_image->GetMappedBitmap();
   const SkBitmap* dest_bitmap = dest_image->GetMappedBitmap();
   if (src_rect.width() == src_image->width() &&
       dest_rect.width() == dest_image->width()) {
@@ skipping 446 matching lines @@
   }
 }
 
 void PPB_Graphics2D_Impl::ViewFlushedPaint() {
   // Notify any "painted" callback. See |unpainted_flush_callback_| in the
   // header for more.
   if (!painted_flush_callback_.is_null())
     painted_flush_callback_.Execute(PP_OK);
 }
 
-void PPB_Graphics2D_Impl::ExecutePaintImageData(PPB_ImageData_Impl* image,
-                                                int x, int y,
-                                                const gfx::Rect& src_rect,
-                                                gfx::Rect* invalidated_rect) {
+void PPB_Graphics2D_Impl::ExecutePaintImageData(
+    scoped_refptr<PPB_ImageData_Impl> image, int x, int y,
+    const gfx::Rect& src_rect, gfx::Rect* invalidated_rect) {
   // Ensure the source image is mapped to read from it.
   ImageDataAutoMapper auto_mapper(image);
   if (!auto_mapper.is_valid())
     return;
 
   // Portion within the source image to cut out.
   SkIRect src_irect = { src_rect.x(), src_rect.y(),
                         src_rect.right(), src_rect.bottom() };
 
   // Location within the backing store to copy to.
   *invalidated_rect = src_rect;
   invalidated_rect->Offset(x, y);
   SkRect dest_rect = { SkIntToScalar(invalidated_rect->x()),
                        SkIntToScalar(invalidated_rect->y()),
                        SkIntToScalar(invalidated_rect->right()),
                        SkIntToScalar(invalidated_rect->bottom()) };
 
   if (image->format() != image_data_->format()) {
     // Convert the image data if the format does not match.
-    ConvertImageData(image, src_irect, image_data_, dest_rect);
+    ConvertImageData(image, src_irect, image_data_.get(), dest_rect);
   } else {
     // We're guaranteed to have a mapped canvas since we mapped it in Init().
     skia::PlatformCanvas* backing_canvas = image_data_->GetPlatformCanvas();
 
     // We want to replace the contents of the bitmap rather than blend.
     SkPaint paint;
     paint.setXfermodeMode(SkXfermode::kSrc_Mode);
     backing_canvas->drawBitmapRect(*image->GetMappedBitmap(),
                                    &src_irect, dest_rect, &paint);
   }
 }
 
 void PPB_Graphics2D_Impl::ExecuteScroll(const gfx::Rect& clip,
                                         int dx, int dy,
                                         gfx::Rect* invalidated_rect) {
   gfx::ScrollCanvas(image_data_->GetPlatformCanvas(),
                     clip, gfx::Point(dx, dy));
   *invalidated_rect = clip;
 }
 
-void PPB_Graphics2D_Impl::ExecuteReplaceContents(PPB_ImageData_Impl* image,
-                                                 gfx::Rect* invalidated_rect) {
+void PPB_Graphics2D_Impl::ExecuteReplaceContents(
+    scoped_refptr<PPB_ImageData_Impl> image, gfx::Rect* invalidated_rect) {
   if (image->format() != image_data_->format()) {
     DCHECK(image->width() == image_data_->width() &&
            image->height() == image_data_->height());
     // Convert the image data if the format does not match.
     SkIRect src_irect = { 0, 0, image->width(), image->height() };
     SkRect dest_rect = { SkIntToScalar(0),
                          SkIntToScalar(0),
                          SkIntToScalar(image_data_->width()),
                          SkIntToScalar(image_data_->height()) };
-    ConvertImageData(image, src_irect, image_data_, dest_rect);
+    ConvertImageData(image, src_irect, image_data_.get(), dest_rect);
   } else {
     // The passed-in image may not be mapped in our process, and we need to
     // guarantee that the current backing store is always mapped.
     if (!image->Map())
       return;
     image_data_->Unmap();
     image_data_->Swap(image);
   }
   *invalidated_rect = gfx::Rect(0, 0,
                                 image_data_->width(), image_data_->height());
@@ skipping 21 matching lines @@
 }
 
 bool PPB_Graphics2D_Impl::HasPendingFlush() const {
   return !unpainted_flush_callback_.is_null() ||
          !painted_flush_callback_.is_null() ||
          offscreen_flush_pending_;
 }
 
 }  // namespace ppapi
 }  // namespace webkit