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 /include/core/SkShader.h | |
| 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 'include/core/SkShader.h')
| -rw-r--r-- | include/core/SkShader.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/core/SkShader.h b/include/core/SkShader.h index cc2cc751d8..4af8f78bfb 100644 --- a/include/core/SkShader.h +++ b/include/core/SkShader.h @@ -34,7 +34,7 @@ class SK_API SkShader : public SkFlattenable { public: SK_DECLARE_INST_COUNT(SkShader) - SkShader(); + SkShader(const SkMatrix* localMatrix = NULL); virtual ~SkShader(); /** @@ -371,7 +371,8 @@ public: * @return Returns a new shader object. Note: this function never returns null. */ static SkShader* CreateBitmapShader(const SkBitmap& src, - TileMode tmx, TileMode tmy); + TileMode tmx, TileMode tmy, + const SkMatrix* localMatrix = NULL); /** Call this to create a new shader that will draw with the specified picture. * |