Chromium Code Reviews| Index: skia/ext/vector_canvas_unittest.cc |
| diff --git a/skia/ext/vector_canvas_unittest.cc b/skia/ext/vector_canvas_unittest.cc |
| index 8efbcdb1f6132fdf7f5b2be2b4367f5cda22430e..31c2b9e71a08f2d7b61164bee080aca458467529 100644 |
| --- a/skia/ext/vector_canvas_unittest.cc |
| +++ b/skia/ext/vector_canvas_unittest.cc |
| @@ -390,8 +390,9 @@ class VectorCanvasTest : public ImageTest { |
| 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. |
| @@ -729,9 +730,9 @@ 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 th
Stephen White
2012/11/29 23:11:47
In fact, it doesn't compile (yay!). See win_rel u
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); |
| @@ -749,9 +750,9 @@ TEST_F(VectorCanvasTest, MAYBE_PathEffects) { |
| { |
| 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); |
| @@ -767,9 +768,9 @@ TEST_F(VectorCanvasTest, MAYBE_PathEffects) { |
| { |
| 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); |
| @@ -783,9 +784,9 @@ 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( |
| + intervals, arraysize(intervals), 0); |
| + paint.setPathEffect(effect.get()); |
| paint.setColor(SK_ColorMAGENTA); |
| paint.setStyle(SkPaint::kStroke_Style); |