diff --git a/debugger/SkDebugCanvas.cpp b/debugger/SkDebugCanvas.cpp
index acb9a7d..03c3c16 100644
--- a/debugger/SkDebugCanvas.cpp
+++ b/debugger/SkDebugCanvas.cpp
@@ -200,7 +200,8 @@
 }
 
 bool SkDebugCanvas::clipPath(const SkPath& path, SkRegion::Op op, bool doAA) {
-    addDrawCommand(new ClipPath(path, op, doAA, createBitmap(path)));
+    SkBitmap bitmap = createBitmap(path);
+    addDrawCommand(new ClipPath(path, op, doAA, bitmap));
     return true;
 }
 
@@ -248,7 +249,8 @@
 }
 
 void SkDebugCanvas::drawPath(const SkPath& path, const SkPaint& paint) {
-    addDrawCommand(new DrawPath(path, paint, createBitmap(path)));
+    SkBitmap bitmap = createBitmap(path);
+    addDrawCommand(new DrawPath(path, paint, bitmap));
 }
 
 void SkDebugCanvas::drawPicture(SkPicture& picture) {
diff --git a/debugger/SkDrawCommand.h b/debugger/SkDrawCommand.h
index 5d2c065..df447a4 100644
--- a/debugger/SkDrawCommand.h
+++ b/debugger/SkDrawCommand.h
@@ -170,7 +170,7 @@
 public:
     DrawPath(const SkPath& path, const SkPaint& paint, SkBitmap& bitmap);
     virtual void execute(SkCanvas* canvas) SK_OVERRIDE;
-    virtual const SkBitmap* DrawPath::getBitmap() const SK_OVERRIDE;
+    virtual const SkBitmap* getBitmap() const SK_OVERRIDE;
 
 private:
     const SkPath* fPath;