Revert "Revert of factories should return baseclass, allowing the impl to specialize (patchset #4 i…

include/effects/SkPictureImageFilter.h

Index: include/effects/SkPictureImageFilter.h
diff --git a/include/effects/SkPictureImageFilter.h b/include/effects/SkPictureImageFilter.h
index 231a492900bf089a4bfa08e96ad09f89accbc7f4..934d1324c02151319a0bb2cb537339903ad7bb63 100644
--- a/include/effects/SkPictureImageFilter.h
+++ b/include/effects/SkPictureImageFilter.h
@@ -16,7 +16,7 @@ public:
     /**
      *  Refs the passed-in picture.
      */
-    static SkPictureImageFilter* Create(const SkPicture* picture) {
+    static SkImageFilter* Create(const SkPicture* picture) {
         return new SkPictureImageFilter(picture);
     }
 
@@ -24,7 +24,7 @@ public:
      *  Refs the passed-in picture. cropRect can be used to crop or expand the destination rect when
      *  the picture is drawn. (No scaling is implied by the dest rect; only the CTM is applied.)
      */
-    static SkPictureImageFilter* Create(const SkPicture* picture, const SkRect& cropRect) {
+    static SkImageFilter* Create(const SkPicture* picture, const SkRect& cropRect) {
         return new SkPictureImageFilter(picture, cropRect, kDeviceSpace_PictureResolution,
                                         kLow_SkFilterQuality);
     }
@@ -36,12 +36,13 @@ public:
      *  expand the destination rect when the picture is drawn. (No scaling is implied by the
      *  dest rect; only the CTM is applied.)
      */
-    static SkPictureImageFilter* CreateForLocalSpace(const SkPicture* picture,
+    static SkImageFilter* CreateForLocalSpace(const SkPicture* picture,
                                                      const SkRect& cropRect,
                                                      SkFilterQuality filterQuality) {
         return new SkPictureImageFilter(picture, cropRect, kLocalSpace_PictureResolution,
                                         filterQuality);
     }
+
     SK_TO_STRING_OVERRIDE()
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkPictureImageFilter)
 
@@ -51,10 +52,8 @@ protected:
         kLocalSpace_PictureResolution
     };
 
-    explicit SkPictureImageFilter(const SkPicture* picture);
-    SkPictureImageFilter(const SkPicture* picture, const SkRect& cropRect,
-                         PictureResolution, SkFilterQuality);
     virtual ~SkPictureImageFilter();
+
     /*  Constructs an SkPictureImageFilter object from an SkReadBuffer.
      *  Note: If the SkPictureImageFilter object construction requires bitmap
      *  decoding, the decoder must be set on the SkReadBuffer parameter by calling
@@ -62,11 +61,13 @@ protected:
      *  @param SkReadBuffer Serialized picture data.
      */
     void flatten(SkWriteBuffer&) const override;
-    virtual bool onFilterImage(Proxy*, const SkBitmap& src, const Context&,
-                               SkBitmap* result, SkIPoint* offset) const override;
+    bool onFilterImage(Proxy*, const SkBitmap& src, const Context&, SkBitmap* result,
+                       SkIPoint* offset) const override;
 
 private:
-
+    explicit SkPictureImageFilter(const SkPicture* picture);
+    SkPictureImageFilter(const SkPicture* picture, const SkRect& cropRect,
+                         PictureResolution, SkFilterQuality);
 
     void drawPictureAtDeviceResolution(SkBaseDevice*, const SkIRect& deviceBounds,
                                        const Context&) const;
@@ -77,6 +78,7 @@ private:
     SkRect                fCropRect;
     PictureResolution     fPictureResolution;
     SkFilterQuality       fFilterQuality;
+
     typedef SkImageFilter INHERITED;
 };