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/bigmatrix.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/bigmatrix.cpp')
| -rw-r--r-- | gm/bigmatrix.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gm/bigmatrix.cpp b/gm/bigmatrix.cpp index b663b2b1ef..30de8653d9 100644 --- a/gm/bigmatrix.cpp +++ b/gm/bigmatrix.cpp @@ -67,14 +67,14 @@ protected: pixels[3] = SkPackARGB32(0xFF, 0x00, 0x00, 0xFF); pt.set(30 * SK_Scalar1, 30 * SK_Scalar1); m.mapPoints(&pt, 1); - SkShader* shader = SkShader::CreateBitmapShader( - bmp, - SkShader::kRepeat_TileMode, - SkShader::kRepeat_TileMode); SkMatrix s; s.reset(); s.setScale(SK_Scalar1 / 1000, SK_Scalar1 / 1000); - shader->setLocalMatrix(s); + SkShader* shader = SkShader::CreateBitmapShader( + bmp, + SkShader::kRepeat_TileMode, + SkShader::kRepeat_TileMode, + &s); paint.setShader(shader)->unref(); paint.setAntiAlias(false); paint.setFilterLevel(SkPaint::kLow_FilterLevel); |