Move SkShader::fLocalMatrix into SkShader constructor.

include/core/SkColorShader.h

 
 /*
  * Copyright 2007 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #ifndef SkColorShader_DEFINED
 #define SkColorShader_DEFINED
 
 #include "SkShader.h"
 
 /** \class SkColorShader
     A Shader that represents a single color. In general, this effect can be
     accomplished by just using the color field on the paint, but if an
     actual shader object is needed, this provides that feature.
 */
 class SK_API SkColorShader : public SkShader {
 public:
     /** Create a ColorShader that will inherit its color from the Paint
         at draw time.
     */
-    SkColorShader();
+    SkColorShader(const SkMatrix* localMatrix = NULL);
 
     /** 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);
+    SkColorShader(SkColor c, const SkMatrix* localMatrix = NULL);

[Dominik Grewe, 2014/04/25 17:50:15]

This currently causes conflicts in Chromium because the compiler can't
distinguish between the two constructors when a color is passed. Should go away
once the first constructor has been removed.

 
     virtual bool isOpaque() const SK_OVERRIDE;
 
     virtual SkShader::Context* createContext(const SkBitmap& device,
                                              const SkPaint& paint,
                                              const SkMatrix& matrix,
                                              void* storage) const SK_OVERRIDE;
 
     virtual size_t contextSize() const SK_OVERRIDE {
         return sizeof(ColorShaderContext);
@@ skipping 33 matching lines @@
     virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
 
 private:
     SkColor     fColor;         // ignored if fInheritColor is true
     SkBool8     fInheritColor;
 
     typedef SkShader INHERITED;
 };
 
 #endif