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/bitmapshader.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/bitmapshader.cpp')
| -rw-r--r-- | gm/bitmapshader.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/gm/bitmapshader.cpp b/gm/bitmapshader.cpp index acb2ecb22f..8085f5c42c 100644 --- a/gm/bitmapshader.cpp +++ b/gm/bitmapshader.cpp @@ -35,8 +35,7 @@ static void draw_mask(SkBitmap* bm) { canvas.drawCircle(10, 10, 10, circlePaint); } -static void adopt_shader(SkPaint* paint, SkShader* shader, SkMatrix s) { - shader->setLocalMatrix(s); +static void adopt_shader(SkPaint* paint, SkShader* shader) { paint->setShader(shader); SkSafeUnref(shader); } @@ -72,7 +71,7 @@ protected: canvas->save(); adopt_shader(&paint, SkShader::CreateBitmapShader(fBitmap, SkShader::kClamp_TileMode, - SkShader::kClamp_TileMode), s); + SkShader::kClamp_TileMode, &s)); // draw the shader with a bitmap mask canvas->drawBitmap(fMask, 0, 0, &paint); @@ -94,7 +93,7 @@ protected: canvas->translate(0, 25); adopt_shader(&paint, SkShader::CreateBitmapShader(fMask, SkShader::kRepeat_TileMode, - SkShader::kRepeat_TileMode), s); + SkShader::kRepeat_TileMode, &s)); paint.setColor(SK_ColorRED); // draw the mask using the shader and a color |