| Index: include/core/SkColorShader.h
|
| diff --git a/include/core/SkColorShader.h b/include/core/SkColorShader.h
|
| index 56e5add4a31a446667ed5c121f92432de9f80657..fbe6330c480aec7f991e6b2b4ec9418aa5819130 100644
|
| --- a/include/core/SkColorShader.h
|
| +++ b/include/core/SkColorShader.h
|
| @@ -19,16 +19,11 @@
|
| */
|
| class SK_API SkColorShader : public SkShader {
|
| public:
|
| - /** Create a ColorShader that will inherit its color from the Paint
|
| - at draw time.
|
| - */
|
| - SkColorShader();
|
| -
|
| /** Create a ColorShader that ignores the color in the paint, and uses the
|
| specified color. Note: like all shaders, at draw time the paint's alpha
|
| will be respected, and is applied to the specified color.
|
| */
|
| - SkColorShader(SkColor c);
|
| + explicit SkColorShader(SkColor c);
|
|
|
| virtual bool isOpaque() const SK_OVERRIDE;
|
|
|
| @@ -65,7 +60,7 @@ public:
|
| SkMatrix* outMatrix,
|
| TileMode xy[2]) const SK_OVERRIDE;
|
|
|
| - virtual GradientType asAGradient(GradientInfo* info) const SK_OVERRIDE;
|
| + virtual GradientType asAGradient(GradientInfo* info) const SK_OVERRIDE;
|
|
|
| SK_TO_STRING_OVERRIDE()
|
| SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkColorShader)
|
| @@ -76,7 +71,6 @@ protected:
|
|
|
| private:
|
| SkColor fColor; // ignored if fInheritColor is true
|
| - SkBool8 fInheritColor;
|
|
|
| typedef SkShader INHERITED;
|
| };
|
|
|