Move SkShader::fLocalMatrix into SkShader constructor.

src/animator/SkDrawShader.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 "SkDrawShader.h"
@@ skipping 18 matching lines @@
 }
 
 bool SkDrawShader::add() {
     if (fPaint->shader != (SkDrawShader*) -1)
         return true;
     fPaint->shader = this;
     fPaint->fOwnsShader = true;
     return false;
 }
 
-void SkDrawShader::addPostlude(SkShader* shader) {
-    if (matrix)
-        shader->setLocalMatrix(matrix->getMatrix());
+SkMatrix* SkDrawShader::getMatrix() {
+    return matrix ? &matrix->getMatrix() : NULL;
 }
 
 #if SK_USE_CONDENSED_INFO == 0
 
 const SkMemberInfo SkDrawBitmapShader::fInfo[] = {
     SK_MEMBER_INHERITED,
     SK_MEMBER(filterBitmap, Boolean),
     SK_MEMBER(image, BaseBitmap)
 };
 
@@ skipping 16 matching lines @@
         return NULL;
 
     // note: bitmap shader now supports independent tile modes for X and Y
     // we pass the same to both, but later we should extend this flexibility
     // to the xml (e.g. tileModeX="repeat" tileModeY="clmap")
     //
     // oops, bitmapshader no longer takes filterBitmap, but deduces it at
     // draw-time from the paint
     SkShader* shader  = SkShader::CreateBitmapShader(image->fBitmap,
                                                     (SkShader::TileMode) tileMode,
-                                                    (SkShader::TileMode) tileMode);
+                                                    (SkShader::TileMode) tileMode,
+                                                    getMatrix());
     SkAutoTDelete<SkShader> autoDel(shader);
-    addPostlude(shader);
     (void)autoDel.detach();
     return shader;
 }