Sanitizing source files in Housekeeper-Nightly

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

4 files changed, 14 insertions, 9 deletions

diff --git a/src/opts/SkMorphology_opts.h b/src/opts/SkMorphology_opts.h
index 7ea7c54623..e3ad853cf6 100644
--- a/src/opts/SkMorphology_opts.h
+++ b/src/opts/SkMorphology_opts.h
@@ -5,10 +5,17 @@
  * found in the LICENSE file.
  */
 
-#ifndef SkMorphology_opts_DEFINED
-#define SkMorphology_opts_DEFINED
+#include <SkColor.h>
 
-#include <SkMorphologyImageFilter.h>
+/**
+ * All morphology procs have the same signature: src is the source buffer, dst the
+ * destination buffer, radius is the morphology radius, width and height are the bounds
+ * of the destination buffer (in pixels), and srcStride and dstStride are the
+ * number of pixels per row in each buffer. All buffers are 8888.
+ */
+
+typedef void (*SkMorphologyProc)(const SkPMColor* src, SkPMColor* dst, int radius,
+                                 int width, int height, int srcStride, int dstStride);
 
 enum SkMorphologyProcType {
     kDilateX_SkMorphologyProcType,
@@ -17,6 +24,4 @@ enum SkMorphologyProcType {
     kErodeY_SkMorphologyProcType
 };
 
-SkMorphologyImageFilter::Proc SkMorphologyGetPlatformProc(SkMorphologyProcType type);
-
-#endif
+SkMorphologyProc SkMorphologyGetPlatformProc(SkMorphologyProcType type);
diff --git a/src/opts/SkMorphology_opts_none.cpp b/src/opts/SkMorphology_opts_none.cpp
index ade261fc7d..66d58ba571 100644
--- a/src/opts/SkMorphology_opts_none.cpp
+++ b/src/opts/SkMorphology_opts_none.cpp
@@ -7,6 +7,6 @@
 
 #include "SkMorphology_opts.h"
 
-SkMorphologyImageFilter::Proc SkMorphologyGetPlatformProc(SkMorphologyProcType) {
+SkMorphologyProc SkMorphologyGetPlatformProc(SkMorphologyProcType) {
     return NULL;
 }
diff --git a/src/opts/opts_check_SSE2.cpp b/src/opts/opts_check_SSE2.cpp
index d0d88fe4a0..aaf6b2ef82 100644
--- a/src/opts/opts_check_SSE2.cpp
+++ b/src/opts/opts_check_SSE2.cpp
@@ -251,7 +251,7 @@ SkMemset32Proc SkMemset32GetPlatformProc() {
     }
 }
 
-SkMorphologyImageFilter::Proc SkMorphologyGetPlatformProc(SkMorphologyProcType type) {
+SkMorphologyProc SkMorphologyGetPlatformProc(SkMorphologyProcType type) {
     if (!cachedHasSSE2()) {
         return NULL;
     }
diff --git a/src/opts/opts_check_arm.cpp b/src/opts/opts_check_arm.cpp
index 9e8b472bdf..3a322aa0e9 100644
--- a/src/opts/opts_check_arm.cpp
+++ b/src/opts/opts_check_arm.cpp
@@ -69,7 +69,7 @@ SkBlitRow::ColorRectProc PlatformColorRectProcFactory() {
     return NULL;
 }
 
-SkMorphologyImageFilter::Proc SkMorphologyGetPlatformProc(SkMorphologyProcType type) {
+SkMorphologyProc SkMorphologyGetPlatformProc(SkMorphologyProcType type) {
 #if SK_ARM_NEON_IS_NONE
     return NULL;
 #else