Move SkShader::fLocalMatrix into SkShader constructor.

src/core/SkShader.cpp

 /*
  * Copyright 2006 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.
  */
 
 #include "SkBitmapProcShader.h"
 #include "SkReadBuffer.h"
 #include "SkMallocPixelRef.h"
 #include "SkPaint.h"
 #include "SkPicture.h"
 #include "SkPictureShader.h"
 #include "SkScalar.h"
 #include "SkShader.h"
 #include "SkWriteBuffer.h"
 
-SkShader::SkShader() {
-    fLocalMatrix.reset();
+SkShader::SkShader(const SkMatrix* localMatrix) {
+    if (localMatrix) {
+        fLocalMatrix = *localMatrix;
+    } else {
+        fLocalMatrix.reset();
+    }
 }
 
 SkShader::SkShader(SkReadBuffer& buffer)
         : INHERITED(buffer) {
     if (buffer.readBool()) {
         buffer.readMatrix(&fLocalMatrix);
     } else {
         fLocalMatrix.reset();
     }
 }
@@ skipping 143 matching lines @@
 }
 
 SkShader::GradientType SkShader::asAGradient(GradientInfo* info) const {
     return kNone_GradientType;
 }
 
 GrEffectRef* SkShader::asNewEffect(GrContext*, const SkPaint&) const {
     return NULL;
 }
 
-SkShader* SkShader::CreateBitmapShader(const SkBitmap& src,
-                                       TileMode tmx, TileMode tmy) {
-    return ::CreateBitmapShader(src, tmx, tmy, NULL);
+SkShader* SkShader::CreateBitmapShader(const SkBitmap& src, TileMode tmx, TileMode tmy,
+                                       const SkMatrix* localMatrix) {
+    return ::CreateBitmapShader(src, tmx, tmy, localMatrix, NULL);
 }
 
 SkShader* SkShader::CreatePictureShader(SkPicture* src, TileMode tmx, TileMode tmy) {
     return SkPictureShader::Create(src, tmx, tmy);
 }
 
+SkShader* SkShader::CreateLocalMatrixWrapper(SkShader* shader, const SkMatrix& localMatrix) {
+    return SkLocalMatrixShaderWrapper::Create(shader, localMatrix);
+}
+
 #ifndef SK_IGNORE_TO_STRING
 void SkShader::toString(SkString* str) const {
     if (this->hasLocalMatrix()) {
         str->append(" ");
         this->getLocalMatrix().toString(str);
     }
 }
 #endif
 
 //////////////////////////////////////////////////////////////////////////////
 
+SkLocalMatrixShaderWrapper::SkLocalMatrixShaderWrapper(SkShader* shader,
+                                                       const SkMatrix& localMatrix)
+    : INHERITED(&localMatrix)
+    , fShader(shader) {

[scroggo, 2014/04/24 17:02:53]

nit: Brace should go on the next line.

[Dominik Grewe, 2014/04/24 17:16:47]

Done.

+    SkASSERT(shader);
+    shader->ref();
+}
+
+SkLocalMatrixShaderWrapper::SkLocalMatrixShaderWrapper(SkReadBuffer& buffer)
+        : INHERITED(buffer) {

[scroggo, 2014/04/24 17:02:53]

ditto

[Dominik Grewe, 2014/04/24 17:16:47]

Done.

+    fShader.reset(buffer.readShader());
+}
+
+void SkLocalMatrixShaderWrapper::flatten(SkWriteBuffer& buffer) {
+    this->INHERITED::flatten(buffer);
+    buffer.writeFlattenable(fShader);
+}
+
+
+//////////////////////////////////////////////////////////////////////////////
+
 #include "SkColorShader.h"
 #include "SkUtils.h"
 
-SkColorShader::SkColorShader()
-    : fColor()
+SkColorShader::SkColorShader(const SkMatrix* localMatrix)
+    : INHERITED(localMatrix)
+    , fColor()
     , fInheritColor(true) {
 }
 
-SkColorShader::SkColorShader(SkColor c)
-    : fColor(c)
+SkColorShader::SkColorShader(SkColor c, const SkMatrix* localMatrix)
+    : INHERITED(localMatrix)
+    , fColor(c)
     , fInheritColor(false) {
 }
 
 bool SkColorShader::isOpaque() const {
     if (fInheritColor) {
         return true; // using paint's alpha
     }
     return SkColorGetA(fColor) == 255;
 }
 
@@ skipping 123 matching lines @@
 #include "SkEmptyShader.h"
 
 void SkEmptyShader::toString(SkString* str) const {
     str->append("SkEmptyShader: (");
 
     this->INHERITED::toString(str);
 
     str->append(")");
 }
 #endif