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/giantbitmap.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/giantbitmap.cpp')
| -rw-r--r-- | gm/giantbitmap.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/gm/giantbitmap.cpp b/gm/giantbitmap.cpp index c284809b16..ed4190a814 100644 --- a/gm/giantbitmap.cpp +++ b/gm/giantbitmap.cpp @@ -95,7 +95,6 @@ protected: virtual void onDraw(SkCanvas* canvas) { SkPaint paint; - SkShader* s = SkShader::CreateBitmapShader(getBitmap(), fMode, fMode); SkMatrix m; if (fDoRotate) { @@ -106,7 +105,7 @@ protected: SkScalar scale = 11*SK_Scalar1/12; m.setScale(scale, scale); } - s->setLocalMatrix(m); + SkShader* s = SkShader::CreateBitmapShader(getBitmap(), fMode, fMode, &m); paint.setShader(s)->unref(); paint.setFilterLevel(fDoFilter ? SkPaint::kLow_FilterLevel : SkPaint::kNone_FilterLevel); |