Finish overriding onMakeColorSpace() for SkImageFilters

Fixes 3 gms in gbr-8888.  Breaks 0 gms in gbr-8888.

Bug: skia:
Change-Id: I3365390b16353821ef6057a7bb68020887e36f72
Reviewed-on: https://skia-review.googlesource.com/13323
Commit-Queue: Matt Sarett <msarett@google.com>
Reviewed-by: Mike Klein <mtklein@chromium.org>

1 files changed, 5 insertions, 3 deletions

diff --git a/include/core/SkImageFilter.h b/include/core/SkImageFilter.h
index ee24d96964..a6ade97b1f 100644
--- a/include/core/SkImageFilter.h
+++ b/include/core/SkImageFilter.h
@@ -406,9 +406,7 @@ protected:
     sk_sp<SkImageFilter> makeColorSpace(SkColorSpaceXformer* xformer) const {
         return this->onMakeColorSpace(xformer);
     }
-    virtual sk_sp<SkImageFilter> onMakeColorSpace(SkColorSpaceXformer*) const {
-        return sk_ref_sp(const_cast<SkImageFilter*>(this));
-    }
+    virtual sk_sp<SkImageFilter> onMakeColorSpace(SkColorSpaceXformer*) const = 0;
 
 private:
     // For makeColorSpace().
@@ -418,14 +416,18 @@ private:
     friend class SkColorFilterImageFilter;
     friend class SkColorSpaceXformer;
     friend class SkComposeImageFilter;
+    friend class SkDiffuseLightingImageFilter;
     friend class SkDisplacementMapEffect;
     friend class SkDropShadowImageFilter;
     friend class SkImageSource;
     friend class SkMagnifierImageFilter;
     friend class SkMatrixConvolutionImageFilter;
+    friend class SkMatrixImageFilter;
+    friend class SkLocalMatrixImageFilter;
     friend class SkMergeImageFilter;
     friend class SkMorphologyImageFilter;
     friend class SkOffsetImageFilter;
+    friend class SkSpecularLightingImageFilter;
     friend class SkTileImageFilter;
     friend class SkXfermodeImageFilter_Base;