Simplify SkPDFShader class. Now invalid objects are never created.

src/pdf/SkPDFShader.h

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #ifndef SkPDFShader_DEFINED
@@ skipping 32 matching lines @@
     static SkPDFObject* GetPDFShader(const SkShader& shader,
                                      const SkMatrix& matrix,
                                      const SkIRect& surfaceBBox,
                                      SkScalar rasterScale);
 
     class State;
     bool equals(const SkPDFShader::State&) const;
 
 protected:
     SkAutoTDelete<const State> fShaderState;
+    SkPDFObject* fSelf;

[mtklein, 2015/01/22 15:54:30]

This is just aching for a comment.  My first thought is, WTF, you mean 'this'?

 
     // This is an internal method.
     // CanonicalShadersMutex() should already be acquired.
     // This also takes ownership of shaderState.
     static SkPDFObject* GetPDFShaderByState(State* shaderState);
-    static SkPDFObject* AddToCanonIfValid(SkPDFShader*);
-    static void RemoveFromCanonIfValid(SkPDFShader*);
 
-    SkPDFShader(State*);
-    virtual ~SkPDFShader();
-
-    virtual bool isValid() = 0;
-    virtual SkPDFObject* toPDFObject() = 0;
+    SkPDFShader(State* s);
+    ~SkPDFShader();
 };
 
 #endif