add localmatrix parameter to shader's asNewEffect

src/core/SkLocalMatrixShader.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkShader.h"
 #include "SkReadBuffer.h"
 #include "SkWriteBuffer.h"
@@ skipping 12 matching lines @@
     virtual BitmapType asABitmap(SkBitmap* bitmap, SkMatrix* matrix,
                                  TileMode* mode) const SK_OVERRIDE {
         return fProxyShader->asABitmap(bitmap, matrix, mode);
     }
 
     virtual GradientType asAGradient(GradientInfo* info) const SK_OVERRIDE {
         return fProxyShader->asAGradient(info);
     }
 
     // TODO: need to augment this API to pass in a localmatrix (which we can augment)
-    virtual GrEffectRef* asNewEffect(GrContext* ctx, const SkPaint& paint) const SK_OVERRIDE {
-        return fProxyShader->asNewEffect(ctx, paint);
+    virtual GrEffectRef* asNewEffect(GrContext* ctx, const SkPaint& paint,
+                                     const SkMatrix* localMatrix) const SK_OVERRIDE {
+        SkMatrix tmp = fProxyLocalMatrix;
+        if (localMatrix) {
+            tmp.preConcat(*localMatrix);
+        }
+        return fProxyShader->asNewEffect(ctx, paint, &tmp);
     }
 
     virtual SkShader* refAsALocalMatrixShader(SkMatrix* localMatrix) const SK_OVERRIDE {
         if (localMatrix) {
             *localMatrix = fProxyLocalMatrix;
         }
         return SkRef(fProxyShader.get());
     }
 
     SK_TO_STRING_OVERRIDE()
@@ skipping 60 matching lines @@
     SkMatrix otherLocalMatrix;
     SkAutoTUnref<SkShader> otherProxy(proxy->refAsALocalMatrixShader(&otherLocalMatrix));
     if (otherProxy.get()) {
         otherLocalMatrix.preConcat(localMatrix);
         lm = &otherLocalMatrix;
         proxy = otherProxy.get();
     }
 
     return SkNEW_ARGS(SkLocalMatrixShader, (proxy, *lm));
 }