Add skia::RefPtr class to wrap ref counted classes from Skia.

skia/ext/vector_canvas_unittest.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 "build/build_config.h"
 
 #if !defined(OS_WIN)
 #include <unistd.h>
 #endif
 
@@ skipping 372 matching lines @@
     delete context_;
     context_ = NULL;
 
     parent::TearDown();
   }
 
   void Init(int size) {
     size_ = size;
     context_ = new Context();
     bitmap_ = new Bitmap(*context_, size_, size_);
-    vcanvas_ = new VectorCanvas(VectorPlatformDeviceEmf::CreateDevice(
-        size_, size_, true, context_->context()));
+    vcanvas_ = new VectorCanvas(skia::RefPtr<SkDevice>(
+        VectorPlatformDeviceEmf::CreateDevice(
+            size_, size_, true, context_->context())));
     pcanvas_ = CreatePlatformCanvas(size_, size_, false);
 
     // Clear white.
     vcanvas_->drawARGB(255, 255, 255, 255, SkXfermode::kSrc_Mode);
     pcanvas_->drawARGB(255, 255, 255, 255, SkXfermode::kSrc_Mode);
   }
 
   // Compares both canvas and returns the pixel difference in percentage between
   // both images. 0 on success and ]0, 100] on failure.
   double ProcessImage(const FilePath::StringType& filename) {
@@ skipping 317 matching lines @@
 
 #if defined(OS_WIN)
 #define MAYBE_PathEffects DISABLED_PathEffects
 #else
 #define MAYBE_PathEffects PathEffects
 #endif
 TEST_F(VectorCanvasTest, MAYBE_PathEffects) {
   {
     SkPaint paint;
     SkScalar intervals[] = { 1, 1 };
-    SkPathEffect* effect = new SkDashPathEffect(intervals, arraysize(intervals),
-                                                0);
-    paint.setPathEffect(effect)->unref();
+    skia::RefPtr<SkPathEffect> effect = new SkDashPathEffect(

[Stephen White, 2012/11/29 23:00:33]

Shouldn't we be doing an AdoptRef here?

How is this working, in fact, if the constructor is private?  I was hoping that
code like this wouldn't work without the adopt.

[Stephen White, 2012/11/29 23:11:47]

In fact, it doesn't compile (yay!).  See win_rel unit_tests.

[danakj, 2012/11/29 23:15:52]

Yeh, fixing!

+        intervals, arraysize(intervals), 0);
+    paint.setPathEffect(effect.get());
     paint.setColor(SK_ColorMAGENTA);
     paint.setStyle(SkPaint::kStroke_Style);
 
     vcanvas_->drawLine(10, 10, 90, 10, paint);
     pcanvas_->drawLine(10, 10, 90, 10, paint);
   }
   EXPECT_EQ(0., ProcessImage(FILE_PATH_LITERAL("dash_line")));
 
 
   // Starting here, there is NO WAY to make them agree. At least verify that the
   // output doesn't change across versions. This test is disabled. See bug
   // 1060231.
   compare_canvas_ = false;
 
   {
     SkPaint paint;
     SkScalar intervals[] = { 3, 5 };
-    SkPathEffect* effect = new SkDashPathEffect(intervals, arraysize(intervals),
-                                                0);
-    paint.setPathEffect(effect)->unref();
+    skia::RefPtr<SkPathEffect> effect = new SkDashPathEffect(

[Stephen White, 2012/11/29 23:00:33]

Same here.

+        intervals, arraysize(intervals), 0);
+    paint.setPathEffect(effect.get());
     paint.setColor(SK_ColorMAGENTA);
     paint.setStyle(SkPaint::kStroke_Style);
 
     SkPath path;
     path.moveTo(10, 15);
     path.lineTo(90, 15);
     path.lineTo(90, 90);
     vcanvas_->drawPath(path, paint);
     pcanvas_->drawPath(path, paint);
   }
   EXPECT_EQ(0., ProcessImage(FILE_PATH_LITERAL("dash_path")));
 
   {
     SkPaint paint;
     SkScalar intervals[] = { 2, 1 };
-    SkPathEffect* effect = new SkDashPathEffect(intervals, arraysize(intervals),
-                                                0);
-    paint.setPathEffect(effect)->unref();
+    skia::RefPtr<SkPathEffect> effect = new SkDashPathEffect(

[Stephen White, 2012/11/29 23:00:33]

Same here (and below).

[danakj, 2012/11/29 23:15:52]

Done.

+        intervals, arraysize(intervals), 0);
+    paint.setPathEffect(effect.get());
     paint.setColor(SK_ColorMAGENTA);
     paint.setStyle(SkPaint::kStroke_Style);
 
     vcanvas_->drawRectCoords(20, 20, 30, 30, paint);
     pcanvas_->drawRectCoords(20, 20, 30, 30, paint);
   }
   EXPECT_EQ(0., ProcessImage(FILE_PATH_LITERAL("dash_rect")));
 
   // This thing looks like it has been drawn by a 3 years old kid. I haven't
   // filed a bug on this since I guess nobody is expecting this to look nice.
   {
     SkPaint paint;
     SkScalar intervals[] = { 1, 1 };
-    SkPathEffect* effect = new SkDashPathEffect(intervals, arraysize(intervals),
-                                                0);
-    paint.setPathEffect(effect)->unref();
+    skia::RefPtr<SkPathEffect> effect = new SkDashPathEffect(
+        intervals, arraysize(intervals), 0);
+    paint.setPathEffect(effect.get());
     paint.setColor(SK_ColorMAGENTA);
     paint.setStyle(SkPaint::kStroke_Style);
 
     SkPath path;
     path.addCircle(50, 75, 10);
     vcanvas_->drawPath(path, paint);
     pcanvas_->drawPath(path, paint);
     EXPECT_EQ(0., ProcessImage(FILE_PATH_LITERAL("circle")));
   }
 }
@@ skipping 160 matching lines @@
     pcanvas_->rotate(67);
     vcanvas_->drawBitmap(bitmap, 20, -50, NULL);
     pcanvas_->drawBitmap(bitmap, 20, -50, NULL);
     EXPECT_EQ(0., ProcessImage(FILE_PATH_LITERAL("rotate")));
   }
 }
 
 #endif  // !defined(USE_AURA)
 
 }  // namespace skia