commit 892f31ab08b2220c591f0906e41eb766db4afb47
author bsalomon <bsalomon@google.com> Thu Aug 21 14:40:36 2014 -0700
committer Commit bot <commit-bot@chromium.org> Thu Aug 21 14:40:37 2014 -0700
tree d75123c9946eac156c34b590f37cdff825c30de9
parent d92c4c5c95403fe771c4f4342bd6527be455cc81

Fix surface leak in multidraw GMs.

TBR=robertphillips@google.com

Author: bsalomon@google.com

Review URL: https://codereview.chromium.org/496793003

gm/multipicturedraw.cpp

diff --git a/gm/multipicturedraw.cpp b/gm/multipicturedraw.cpp
index 8e74c28..a030bcc 100644
--- a/gm/multipicturedraw.cpp
+++ b/gm/multipicturedraw.cpp
@@ -75,7 +75,7 @@
     return recorder.endRecording();
 }
 
-static SkSurface* compat_surface(SkCanvas* canvas, int width, int height) {
+static SkSurface* create_compat_surface(SkCanvas* canvas, int width, int height) {
     SkImageInfo info = SkImageInfo::MakeN32Premul(width, height);
 
     SkSurface* surface = canvas->newSurface(info);
@@ -197,7 +197,7 @@
 
     ComposeStep& step = composeSteps->push_back();
 
-    step.fSurf = SkSafeRef(compat_surface(finalCanvas, kPicWidth, kPicHeight));
+    step.fSurf = create_compat_surface(finalCanvas, kPicWidth, kPicHeight);
 
     SkCanvas* subCanvas = step.fSurf->getCanvas();
 
@@ -232,7 +232,7 @@
             step.fPaint->setColorFilter(
                 SkColorFilter::CreateModeFilter(colors[x][y], SkXfermode::kModulate_Mode))->unref();
 
-            step.fSurf = SkSafeRef(compat_surface(finalCanvas, kTileWidth, kTileHeight));
+            step.fSurf = create_compat_surface(finalCanvas, kTileWidth, kTileHeight);
 
             SkCanvas* subCanvas = step.fSurf->getCanvas();