Use skia::RefPtr in place of manual ref-counting for Skia types.

content/plugin/webplugin_proxy.cc

 // Copyright (c) 2012 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 "content/plugin/webplugin_proxy.h"
 
 #include "build/build_config.h"
 
 #include "base/bind.h"
 #include "base/lazy_instance.h"
@@ skipping 353 matching lines @@
   CGContextClipToRect(windowless_context(), rect.ToCGRect());
   // TODO(caryclark): This is a temporary workaround to allow the Darwin / Skia
   // port to share code with the Darwin / CG port. All ports will eventually use
   // the common code below.
   delegate_->CGPaint(windowless_context(), rect);
   if (windowless_contexts_[saved_index].get() == saved_context_weak)
     CGContextRestoreGState(windowless_contexts_[saved_index]);
 #else
   // See above comment about windowless_context_ changing.
   // http::/crbug.com/139462
-  skia::PlatformCanvas* saved_canvas = windowless_canvas();
-  SkAutoRef local_ref(saved_canvas);
+  skia::RefPtr<skia::PlatformCanvas> saved_canvas = windowless_canvas();
 #if defined(USE_X11)
   scoped_refptr<SharedTransportDIB> local_dib_ref(
       windowless_dibs_[windowless_buffer_index_]);
 #endif
 
   saved_canvas->save();
 
   // The given clip rect is relative to the plugin coordinate system.
   SkRect sk_rect = { SkIntToScalar(rect.x()),
                      SkIntToScalar(rect.y()),
                      SkIntToScalar(rect.right()),
                      SkIntToScalar(rect.bottom()) };
   saved_canvas->clipRect(sk_rect);
 
   // Fill a transparent value so that if the plugin supports transparency that
   // will work.
   saved_canvas->drawColor(SkColorSetARGB(0, 0, 0, 0), SkXfermode::kSrc_Mode);
 
   // Bring the windowless canvas into the window coordinate system, which is
   // how the plugin expects to draw (since the windowless API was originally
   // designed just for scribbling over the web page).
   saved_canvas->translate(SkIntToScalar(-delegate_->GetRect().x()),
                           SkIntToScalar(-delegate_->GetRect().y()));
 
   // Before we send the invalidate, paint so that renderer uses the updated
   // bitmap.
-  delegate_->Paint(saved_canvas, offset_rect);
+  delegate_->Paint(saved_canvas.get(), offset_rect);
 
   saved_canvas->restore();
 #endif
 }
 
 void WebPluginProxy::UpdateGeometry(
     const gfx::Rect& window_rect,
     const gfx::Rect& clip_rect,
     const TransportDIB::Handle& windowless_buffer0,
     const TransportDIB::Handle& windowless_buffer1,
@@ skipping 30 matching lines @@
       !damaged_rect_.IsEmpty()) {
     InvalidateRect(damaged_rect_);
   }
 }
 
 #if defined(OS_WIN)
 
 void WebPluginProxy::CreateCanvasFromHandle(
     const TransportDIB::Handle& dib_handle,
     const gfx::Rect& window_rect,
-    SkAutoTUnref<skia::PlatformCanvas>* canvas) {
-  canvas->reset(skia::CreatePlatformCanvas(window_rect.width(),
-                                           window_rect.height(),
-                                           true,
-                                           dib_handle,
-                                           skia::RETURN_NULL_ON_FAILURE));
+    skia::RefPtr<skia::PlatformCanvas>* canvas) {
+  *canvas = skia::AdoptRef(
+      skia::CreatePlatformCanvas(window_rect.width(),
+                                 window_rect.height(),
+                                 true,
+                                 dib_handle,
+                                 skia::RETURN_NULL_ON_FAILURE));
   // The canvas does not own the section so we need to close it now.
   CloseHandle(dib_handle);
 }
 
 void WebPluginProxy::SetWindowlessBuffers(
     const TransportDIB::Handle& windowless_buffer0,
     const TransportDIB::Handle& windowless_buffer1,
     const gfx::Rect& window_rect) {
   CreateCanvasFromHandle(windowless_buffer0,
                          window_rect,
                          &windowless_canvases_[0]);
-  if (!windowless_canvases_[0].get()) {
-    windowless_canvases_[1].reset(NULL);
+  if (!windowless_canvases_[0]) {
+    windowless_canvases_[1].clear();
     return;
   }
   CreateCanvasFromHandle(windowless_buffer1,
                          window_rect,
                          &windowless_canvases_[1]);
-  if (!windowless_canvases_[1].get()) {
-    windowless_canvases_[0].reset(NULL);
+  if (!windowless_canvases_[1]) {
+    windowless_canvases_[0].clear();
     return;
   }
 }
 
 #elif defined(OS_MACOSX)
 
 void WebPluginProxy::CreateDIBAndCGContextFromHandle(
     const TransportDIB::Handle& dib_handle,
     const gfx::Rect& window_rect,
     scoped_ptr<TransportDIB>* dib_out,
@@ skipping 31 matching lines @@
                                   &windowless_dibs_[1],
                                   &windowless_contexts_[1]);
 }
 
 #elif defined(USE_X11)
 
 void WebPluginProxy::CreateDIBAndCanvasFromHandle(
     const TransportDIB::Handle& dib_handle,
     const gfx::Rect& window_rect,
     scoped_refptr<SharedTransportDIB>* dib_out,
-    SkAutoTUnref<skia::PlatformCanvas>* canvas) {
+    skia::RefPtr<skia::PlatformCanvas>* canvas) {
   TransportDIB* dib = TransportDIB::Map(dib_handle);
   // dib may be NULL if the renderer has already destroyed the TransportDIB by
   // the time we receive the handle, e.g. in case of multiple resizes.
   if (dib) {
-    canvas->reset(
+    *canvas = skia::AdoptRef(
         dib->GetPlatformCanvas(window_rect.width(), window_rect.height()));
   } else {
-    canvas->reset(NULL);
+    canvas->clear();
   }
   *dib_out = new SharedTransportDIB(dib);
 }
 
 void WebPluginProxy::CreateShmPixmapFromDIB(
     TransportDIB* dib,
     const gfx::Rect& window_rect,
     XID* pixmap_out) {
   if (dib) {
     Display* display = ui::GetXDisplay();
@@ skipping 175 matching lines @@
   int input_type;
   gfx::Rect caret_rect;
   if (!delegate_->GetIMEStatus(&input_type, &caret_rect))
     return;
 
   Send(new PluginHostMsg_NotifyIMEStatus(route_id_, input_type, caret_rect));
 }
 #endif
 
 }  // namespace content