From 9c9005a347e9996f357bd79591bd34f74f8bbc66 Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Mon, 28 Apr 2014 14:55:39 +0000 Subject: Move SkShader::fLocalMatrix into SkShader constructor. As a first step towards removing SkShader::setLocalMatrix, which will make SkShader thread-safe, remove calls to setLocalMatrix that happen immediately after the shader is being created. Instead, pass the matrix into the constructor or factory method. BUG=skia:1976 R=scroggo@google.com, reed@google.com, skyostil@google.com, mtklein@google.com Author: dominikg@chromium.org Review URL: https://codereview.chromium.org/245963010 git-svn-id: http://skia.googlecode.com/svn/trunk@14401 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gm/xfermodes2.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gm/xfermodes2.cpp') diff --git a/gm/xfermodes2.cpp b/gm/xfermodes2.cpp index 1af59d2553..2ccabc61cb 100644 --- a/gm/xfermodes2.cpp +++ b/gm/xfermodes2.cpp @@ -96,12 +96,12 @@ private: bg.allocN32Pixels(2, 2, true); memcpy(bg.getPixels(), kCheckData, sizeof(kCheckData)); - fBG.reset(SkShader::CreateBitmapShader(bg, - SkShader::kRepeat_TileMode, - SkShader::kRepeat_TileMode)); SkMatrix lm; lm.setScale(SkIntToScalar(16), SkIntToScalar(16)); - fBG->setLocalMatrix(lm); + fBG.reset(SkShader::CreateBitmapShader(bg, + SkShader::kRepeat_TileMode, + SkShader::kRepeat_TileMode, + &lm)); SkBitmap dstBmp; dstBmp.allocN32Pixels(kSize, kSize); -- cgit v1.2.3