diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-05-09 15:42:07 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-05-09 15:42:07 +0000 |
| commit | d12de02542867c7c1be32b6e02e2f5dca9fb9452 (patch) | |
| tree | 02a7ac7ad038886b0cded813f5ec3805f22cd527 /include/core/SkShader.h | |
| parent | 5d20caea15b574c9027ea4e695a03c4402e1d832 (diff) | |
Revert of hide get/setLocalMatrix (https://codereview.chromium.org/279563002/)
Reason for revert:
broke gms
Original issue's description:
> hide get/setLocalMatrix
>
> BUG=skia:
>
> Committed: http://code.google.com/p/skia/source/detail?r=14675
R=fmalita@google.com, dominikg@chromium.org, fmalita@chromium.org
TBR=dominikg@chromium.org, fmalita@chromium.org, fmalita@google.com
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Author: reed@google.com
Review URL: https://codereview.chromium.org/278903002
git-svn-id: http://skia.googlecode.com/svn/trunk@14677 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include/core/SkShader.h')
| -rw-r--r-- | include/core/SkShader.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/include/core/SkShader.h b/include/core/SkShader.h index 87e10ceb2f..2f3764c0be 100644 --- a/include/core/SkShader.h +++ b/include/core/SkShader.h @@ -38,15 +38,14 @@ public: virtual ~SkShader(); /** - * Returns the local matrix. + * Returns true if the local matrix is not an identity matrix. */ - const SkMatrix& getLocalMatrix() const { return fLocalMatrix; } + bool hasLocalMatrix() const { return !fLocalMatrix.isIdentity(); } -#ifdef SK_SUPPORT_LEGACY_SHADER_LOCALMATRIX /** - * Returns true if the local matrix is not an identity matrix. + * Returns the local matrix. */ - bool hasLocalMatrix() const { return !fLocalMatrix.isIdentity(); } + const SkMatrix& getLocalMatrix() const { return fLocalMatrix; } /** * Set the shader's local matrix. @@ -58,7 +57,6 @@ public: * Reset the shader's local matrix to identity. */ void resetLocalMatrix() { fLocalMatrix.reset(); } -#endif enum TileMode { /** replicate the edge color if the shader draws outside of its |