commit b0df8be137d8fb49436e46d1fd1a5aec8b7ab562
author reed <reed@google.com> Wed Feb 04 09:07:17 2015 -0800
committer Commit bot <commit-bot@chromium.org> Wed Feb 04 09:07:17 2015 -0800
tree b56df14fae666ac8c6c56ee3fe7d6bdc8d64f4f2
parent 1a481fe4bf632ed4f76cb337691236fabfd4ab03

return reference to cache instead of copying the mask

BUG=437128

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

src/core/SkMaskFilter.cpp

diff --git a/src/core/SkMaskFilter.cpp b/src/core/SkMaskFilter.cpp
index c9783e7..ee58b74 100644
--- a/src/core/SkMaskFilter.cpp
+++ b/src/core/SkMaskFilter.cpp
@@ -10,6 +10,7 @@
 #include "SkMaskFilter.h"
 #include "SkBlitter.h"
 #include "SkDraw.h"
+#include "SkCachedData.h"
 #include "SkRasterClip.h"
 #include "SkRRect.h"
 #include "SkTypes.h"
@@ -20,6 +21,15 @@
 #include "SkGrPixelRef.h"
 #endif
 
+SkMaskFilter::NinePatch::~NinePatch() {
+    if (fCache) {
+        SkASSERT((const void*)fMask.fImage == fCache->data());
+        fCache->unref();
+    } else {
+        SkMask::FreeImage(fMask.fImage);
+    }
+}
+
 bool SkMaskFilter::filterMask(SkMask*, const SkMask&, const SkMatrix&,
                               SkIPoint*) const {
     return false;
@@ -219,7 +229,6 @@
         return false;
     }
     draw_nine(patch.fMask, patch.fOuterRect, patch.fCenter, true, clip, blitter);
-    SkMask::FreeImage(patch.fMask.fImage);
     return true;
 }
 
@@ -234,9 +243,7 @@
     if (rectCount > 0) {
         NinePatch patch;
 
-        patch.fMask.fImage = NULL;
-        switch (this->filterRectsToNine(rects, rectCount, matrix,
-                                        clip.getBounds(), &patch)) {
+        switch (this->filterRectsToNine(rects, rectCount, matrix, clip.getBounds(), &patch)) {
             case kFalse_FilterReturn:
                 SkASSERT(NULL == patch.fMask.fImage);
                 return false;
@@ -244,7 +251,6 @@
             case kTrue_FilterReturn:
                 draw_nine(patch.fMask, patch.fOuterRect, patch.fCenter, 1 == rectCount, clip,
                           blitter);
-                SkMask::FreeImage(patch.fMask.fImage);
                 return true;
 
             case kUnimplemented_FilterReturn: