move SkAutoMaskFreeImage from SkMaskFilter.h to SkMask.h

git-svn-id: http://skia.googlecode.com/svn/trunk@2489 2bbb7eff-a529-9590-31e7-b0007b416f81

2 files changed, 22 insertions, 18 deletions

diff --git a/include/core/SkMask.h b/include/core/SkMask.h
index 1af78e159c..3f9a11449c 100644
--- a/include/core/SkMask.h
+++ b/include/core/SkMask.h
@@ -123,5 +123,27 @@ struct SkMask {
     };
 };
 
+///////////////////////////////////////////////////////////////////////////////
+
+/**
+ *  \class SkAutoMaskImage
+ *
+ *  Stack class used to manage the fImage buffer in a SkMask.
+ *  When this object loses scope, the buffer is freed with SkMask::FreeImage().
+ */
+class SkAutoMaskFreeImage {
+public:
+    SkAutoMaskFreeImage(uint8_t* maskImage) {
+        fImage = maskImage;
+    }
+    
+    ~SkAutoMaskFreeImage() {
+        SkMask::FreeImage(fImage);
+    }
+
+private:
+    uint8_t* fImage;
+};
+
 #endif
 
diff --git a/include/core/SkMaskFilter.h b/include/core/SkMaskFilter.h
index 0f1321e086..fe0c69fd67 100644
--- a/include/core/SkMaskFilter.h
+++ b/include/core/SkMaskFilter.h
@@ -92,23 +92,5 @@ protected:
     SkMaskFilter(SkFlattenableReadBuffer&) {}
 };
 
-/** \class SkAutoMaskImage
-
-    Stack class used to manage the fImage buffer in a SkMask.
-    When this object loses scope, the buffer is freed with SkMask::FreeImage().
-*/
-class SkAutoMaskFreeImage {
-public:
-    SkAutoMaskFreeImage(uint8_t* maskImage) {
-        fImage = maskImage;
-    }
-
-    ~SkAutoMaskFreeImage() {
-        SkMask::FreeImage(fImage);
-    }
-private:
-    uint8_t*    fImage;
-};
-
 #endif