diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-04-28 14:55:39 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-04-28 14:55:39 +0000 |
| commit | 9c9005a347e9996f357bd79591bd34f74f8bbc66 (patch) | |
| tree | 5e03fa9c44510f969be6dee9641968574dbed932 /gm/hairmodes.cpp | |
| parent | c76a4b2a81b5c502ded23dee1e0c5d762028d5cf (diff) | |
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
Diffstat (limited to 'gm/hairmodes.cpp')
| -rw-r--r-- | gm/hairmodes.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/gm/hairmodes.cpp b/gm/hairmodes.cpp index 4aa999d383..783c225e98 100644 --- a/gm/hairmodes.cpp +++ b/gm/hairmodes.cpp @@ -64,14 +64,12 @@ static SkShader* make_bg_shader() { *bm.getAddr32(0, 0) = *bm.getAddr32(1, 1) = 0xFFFFFFFF; *bm.getAddr32(1, 0) = *bm.getAddr32(0, 1) = SkPackARGB32(0xFF, 0xCC, 0xCC, 0xCC); - SkShader* s = SkShader::CreateBitmapShader(bm, - SkShader::kRepeat_TileMode, - SkShader::kRepeat_TileMode); - SkMatrix m; m.setScale(SkIntToScalar(6), SkIntToScalar(6)); - s->setLocalMatrix(m); - return s; + return SkShader::CreateBitmapShader(bm, + SkShader::kRepeat_TileMode, + SkShader::kRepeat_TileMode, + &m); } namespace skiagm { |