Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / third_party / skia / src / gpu / gl / GrGLProgram.h

diff --git a/src/third_party/skia/src/gpu/gl/GrGLProgram.h b/src/third_party/skia/src/gpu/gl/GrGLProgram.h
index 8e2ae74..0a2a242 100644 (file)
--- a/src/third_party/skia/src/gpu/gl/GrGLProgram.h
+++ b/src/third_party/skia/src/gpu/gl/GrGLProgram.h
@@ -114,7 +114,7 @@ public:
                                 0, SkIntToScalar(2) / fRenderTargetSize.fHeight, -SK_Scalar1,
                                 0, 0, SkMatrix::I()[8]);
             }
-            combined.setConcat(combined, fViewMatrix);
+            combined.preConcat(fViewMatrix);
             GrGLGetMatrix<Size>(destMatrix, combined);
         }
     };