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

src/core/SkSpecialImage.h

 /*
  * Copyright 2016 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file
  */
 
 #ifndef SkSpecialImage_DEFINED
 #define SkSpecialImage_DEFINED
 
 #include "SkNextID.h"
 #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;
 class SkBitmap;
 class SkCanvas;
 class SkImage;
 struct SkImageInfo;
 class SkPaint;
 class SkPixmap;
 class SkSpecialSurface;
@@ skipping 53 matching lines @@
                                              uint32_t uniqueID,
                                              sk_sp<GrTexture>,
                                              sk_sp<SkColorSpace>,
                                              const SkSurfaceProps* = nullptr,
                                              SkAlphaType at = kPremul_SkAlphaType);
 #endif
 
     /**
      *  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.
      * It may or may not point to the same backing memory.
      */
     sk_sp<SkSpecialImage> makeSubset(const SkIRect& subset) const;
 
     /**
      * Extract a subset of this special image and return it as an SkImage.
      * It may or may not point to the same backing memory.
@@ skipping 34 matching lines @@
 
 private:
     const SkSurfaceProps fProps;
     const SkIRect        fSubset;
     const uint32_t       fUniqueID;
 
     typedef SkRefCnt INHERITED;
 };
 
 #endif