Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / third_party / skia / src / animator / SkDrawShader.cpp

diff --git a/src/third_party/skia/src/animator/SkDrawShader.cpp b/src/third_party/skia/src/animator/SkDrawShader.cpp
index e3aa4da..f9f379b 100644 (file)
--- a/src/third_party/skia/src/animator/SkDrawShader.cpp
+++ b/src/third_party/skia/src/animator/SkDrawShader.cpp
@@ -36,9 +36,8 @@ bool SkDrawShader::add() {
     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
@@ -75,9 +74,9 @@ SkShader* SkDrawBitmapShader::getShader() {
     // 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;
 }