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/shadertext3.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/shadertext3.cpp')
| -rw-r--r-- | gm/shadertext3.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/gm/shadertext3.cpp b/gm/shadertext3.cpp index a1c2d6006b..6ae3159b91 100644 --- a/gm/shadertext3.cpp +++ b/gm/shadertext3.cpp @@ -100,14 +100,15 @@ protected: int i = 0; for (size_t tm0 = 0; tm0 < SK_ARRAY_COUNT(kTileModes); ++tm0) { for (size_t tm1 = 0; tm1 < SK_ARRAY_COUNT(kTileModes); ++tm1) { - SkAutoTUnref<SkShader> shader(SkShader::CreateBitmapShader(fBmp, - kTileModes[tm0], - kTileModes[tm1])); SkMatrix localM; localM.setTranslate(5.f, 5.f); localM.postRotate(20); localM.postScale(1.15f, .85f); - shader->setLocalMatrix(localM); + + SkAutoTUnref<SkShader> shader(SkShader::CreateBitmapShader(fBmp, + kTileModes[tm0], + kTileModes[tm1], + &localM)); SkPaint fillPaint; fillPaint.setAntiAlias(true); |