Revert "Revert of factories should return baseclass, allowing the impl to specialize (patchset #4 id:60001 of https://codereview.chromium.org/1390523005/ )"

This reverts commit 95376a0dde3cdf414eb97a20cef3af19ed7e0151.

BUG=skia:
TBR=

Review URL: https://codereview.chromium.org/1389083002

1 files changed, 9 insertions, 9 deletions

diff --git a/include/effects/SkTableMaskFilter.h b/include/effects/SkTableMaskFilter.h
index 1d530877cc..757ddf2084 100644
--- a/include/effects/SkTableMaskFilter.h
+++ b/include/effects/SkTableMaskFilter.h
@@ -18,8 +18,6 @@
  */
 class SK_API SkTableMaskFilter : public SkMaskFilter {
 public:
-    virtual ~SkTableMaskFilter();
-
     /** Utility that sets the gamma table
      */
     static void MakeGammaTable(uint8_t table[256], SkScalar gamma);
@@ -29,35 +27,37 @@ public:
      */
     static void MakeClipTable(uint8_t table[256], uint8_t min, uint8_t max);
 
-    static SkTableMaskFilter* Create(const uint8_t table[256]) {
+    static SkMaskFilter* Create(const uint8_t table[256]) {
         return new SkTableMaskFilter(table);
     }
 
-    static SkTableMaskFilter* CreateGamma(SkScalar gamma) {
+    static SkMaskFilter* CreateGamma(SkScalar gamma) {
         uint8_t table[256];
         MakeGammaTable(table, gamma);
         return new SkTableMaskFilter(table);
     }
 
-    static SkTableMaskFilter* CreateClip(uint8_t min, uint8_t max) {
+    static SkMaskFilter* CreateClip(uint8_t min, uint8_t max) {
         uint8_t table[256];
         MakeClipTable(table, min, max);
         return new SkTableMaskFilter(table);
     }
 
     SkMask::Format getFormat() const override;
-    virtual bool filterMask(SkMask*, const SkMask&, const SkMatrix&,
-                            SkIPoint*) const override;
+    bool filterMask(SkMask*, const SkMask&, const SkMatrix&, SkIPoint*) const override;
 
     SK_TO_STRING_OVERRIDE()
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkTableMaskFilter)
 
 protected:
-    SkTableMaskFilter();
-    explicit SkTableMaskFilter(const uint8_t table[256]);
+    virtual ~SkTableMaskFilter();
+
     void flatten(SkWriteBuffer&) const override;
 
 private:
+    SkTableMaskFilter();
+    explicit SkTableMaskFilter(const uint8_t table[256]);
+
     uint8_t fTable[256];
 
     typedef SkMaskFilter INHERITED;