Revert of Create special surfaces according to original device (not always in N32)

src/core/SkSpecialImage.h

Index: src/core/SkSpecialImage.h
diff --git a/src/core/SkSpecialImage.h b/src/core/SkSpecialImage.h
index c1f3791edf376ece3fd3ecc42ac5d86719deb5c3..cd8c3141fb9150a3c022664d310c1871ca8924b5 100644
--- a/src/core/SkSpecialImage.h
+++ b/src/core/SkSpecialImage.h
@@ -12,8 +12,7 @@
 #include "SkRefCnt.h"
 #include "SkSurfaceProps.h"
 
-#include "SkImageFilter.h" // for OutputProperties
-#include "SkImageInfo.h"   // for SkAlphaType
+#include "SkImageInfo.h" // for SkAlphaType
 
 class GrContext;
 class GrTexture;
@@ -87,17 +86,13 @@
     /**
      *  Create a new special surface with a backend that is compatible with this special image.
      */
-    sk_sp<SkSpecialSurface> makeSurface(const SkImageFilter::OutputProperties& outProps,
-                                        const SkISize& size,
-                                        SkAlphaType at = kPremul_SkAlphaType) const;
+    sk_sp<SkSpecialSurface> makeSurface(const SkImageInfo&) const;
 
     /**
      * Create a new surface with a backend that is compatible with this special image.
      * TODO: switch this to makeSurface once we resolved the naming issue
      */
-    sk_sp<SkSurface> makeTightSurface(const SkImageFilter::OutputProperties& outProps,
-                                      const SkISize& size,
-                                      SkAlphaType at = kPremul_SkAlphaType) const;
+    sk_sp<SkSurface> makeTightSurface(const SkImageInfo&) const;
 
     /**
      * Extract a subset of this special image and return it as a special image.