Move SkShader::fLocalMatrix into SkShader constructor.

gm/shadertext2.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "gm.h"
 #include "SkCanvas.h"
 #include "SkGradientShader.h"
 #include "SkUnitMappers.h"
@@ skipping 77 matching lines @@
         localMatrices.append()->fMatrix.reset();
         localMatrices.top().fMatrix.setPerspX(-0.007f);
         localMatrices.top().fMatrix.setPerspY(+0.008f);
         localMatrices.top().fLabel = "Persp";
 
         static SkBitmap bmp;
         if (bmp.isNull()) {
             makebm(&bmp, kPointSize / 2, kPointSize / 2);
         }
 
+        // TODO(dominikg): Do we still need to create this shader here?
+        //                 The only place where it may be used is in fillPaint.measureText().
         SkAutoTUnref<SkShader> shader(SkShader::CreateBitmapShader(bmp,
                                                                    SkShader::kMirror_TileMode,
                                                                    SkShader::kRepeat_TileMode));

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

I think we can delete this shader here. Wdyt?

[scroggo, 2014/04/25 17:58:32]

I agree. I can't imagine measureText needs to look at the shader

         SkPaint fillPaint;
         fillPaint.setAntiAlias(true);
         fillPaint.setTextSize(SkIntToScalar(kPointSize));
         fillPaint.setFilterLevel(SkPaint::kLow_FilterLevel);
         fillPaint.setShader(shader);
 
         SkPaint outlinePaint;
         outlinePaint.setAntiAlias(true);
         outlinePaint.setTextSize(SkIntToScalar(kPointSize));
         outlinePaint.setStyle(SkPaint::kStroke_Style);
@@ skipping 40 matching lines @@
 
             SkScalar columnH = 0;
             for (int m = 0; m < matrices.count(); ++m) {
                 columnH = 0;
                 canvas->save();
                 canvas->drawText(matrices[m].fLabel, strlen(matrices[m].fLabel),
                                  0, labelPaint.getTextSize() - 1, labelPaint);
                 canvas->translate(0, kPadY / 2 + kPointSize);
                 columnH += kPadY / 2 + kPointSize;
                 for (int lm = 0; lm < localMatrices.count(); ++lm) {
-                    shader->setLocalMatrix(localMatrices[lm].fMatrix);
+                    paint.setShader(SkShader::CreateBitmapShader(bmp,
+                                                                 SkShader::kMirror_TileMode,
+                                                                 SkShader::kRepeat_TileMode,
+                                                                 &localMatrices[lm].fMatrix));
 
                     canvas->save();
                         canvas->concat(matrices[m].fMatrix);
                         canvas->drawText(kText, kTextLen, 0, 0, paint);
                         canvas->drawText(kText, kTextLen, 0, 0, outlinePaint);
                     canvas->restore();
 
                     SkPath path;
                     path.arcTo(SkRect::MakeXYWH(-0.1f * w, 0.f,
                                                 1.2f * w, 2.f * kPointSize),
@@ skipping 38 matching lines @@
 
 private:
     typedef GM INHERITED;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
 static GM* MyFactory(void*) { return new ShaderText2GM; }
 static GMRegistry reg(MyFactory);
 }