1 files changed, 11 insertions, 2 deletions
diff --git a/src/pipe/SkGPipeRead.cpp b/src/pipe/SkGPipeRead.cpp
index 976abbf10a..ddc0cc41d9 100644
--- a/src/pipe/SkGPipeRead.cpp
+++ b/src/pipe/SkGPipeRead.cpp
@@ -545,12 +545,21 @@ SkGPipeState::~SkGPipeState() {
 
 #include "SkGPipe.h"
 
+SkGPipeReader::SkGPipeReader() {
+    fCanvas = NULL;
+    fState = NULL;
+}
+
 SkGPipeReader::SkGPipeReader(SkCanvas* target) {
-    SkSafeRef(target);
-    fCanvas = target;
+    fCanvas = NULL;
+    this->setCanvas(target);
     fState = NULL;
 }
 
+void SkGPipeReader::setCanvas(SkCanvas *target) {
+    SkRefCnt_SafeAssign(fCanvas, target);
+}
+
 SkGPipeReader::~SkGPipeReader() {
     SkSafeUnref(fCanvas);
     delete fState;