Revert of factories should return baseclass, allowing the impl to specialize

gm/pictureimagefilter.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "gm.h"
 
 #include "SkPictureImageFilter.h"
@@ skipping 39 matching lines @@
         canvas->drawPaint(paint);
         canvas->restore();
     }
 
     void onDraw(SkCanvas* canvas) override {
         canvas->clear(SK_ColorBLACK);
         {
             SkRect srcRect = SkRect::MakeXYWH(20, 20, 30, 30);
             SkRect emptyRect = SkRect::MakeXYWH(20, 20, 0, 0);
             SkRect bounds = SkRect::MakeXYWH(0, 0, 100, 100);
-            SkAutoTUnref<SkImageFilter> pictureSource(
+            SkAutoTUnref<SkPictureImageFilter> pictureSource(
                 SkPictureImageFilter::Create(fPicture));
-            SkAutoTUnref<SkImageFilter> pictureSourceSrcRect(
+            SkAutoTUnref<SkPictureImageFilter> pictureSourceSrcRect(
                 SkPictureImageFilter::Create(fPicture, srcRect));
-            SkAutoTUnref<SkImageFilter> pictureSourceEmptyRect(
+            SkAutoTUnref<SkPictureImageFilter> pictureSourceEmptyRect(
                 SkPictureImageFilter::Create(fPicture, emptyRect));
-            SkAutoTUnref<SkImageFilter> pictureSourceResampled(
+            SkAutoTUnref<SkPictureImageFilter> pictureSourceResampled(
                 SkPictureImageFilter::CreateForLocalSpace(fPicture, fPicture->cullRect(),
                     kLow_SkFilterQuality));
-            SkAutoTUnref<SkImageFilter> pictureSourcePixelated(
+            SkAutoTUnref<SkPictureImageFilter> pictureSourcePixelated(
                 SkPictureImageFilter::CreateForLocalSpace(fPicture, fPicture->cullRect(),
                     kNone_SkFilterQuality));
 
             canvas->save();
             // Draw the picture unscaled.
             fillRectFiltered(canvas, bounds, pictureSource);
             canvas->translate(SkIntToScalar(100), 0);
 
             // Draw an unscaled subset of the source picture.
             fillRectFiltered(canvas, bounds, pictureSourceSrcRect);
@@ skipping 22 matching lines @@
     }
 
 private:
     SkAutoTUnref<SkPicture> fPicture;
     typedef GM INHERITED;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
 DEF_GM( return new PictureImageFilterGM; )