diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-10-23 14:44:08 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-10-23 14:44:08 +0000 |
| commit | 1f81fd6546c111e21bc665657e976b9d842192df (patch) | |
| tree | 00bb18a731ed166d187c864f2e5542a4996e5767 /src/core/SkMatrix.cpp | |
| parent | fbcd415aa01801df5f554963d7463649b49ead73 (diff) | |
SK_ONCE for SkData and SkPathRef
Adds SK_ONCE_FRIEND, to allow SK_DEF_ONCE code to be friends with a class. This had to go in include/core to be visible to headers there.
BUG=
R=reed@google.com, bungeman@google.com
Author: mtklein@google.com
Review URL: https://codereview.chromium.org/26491003
git-svn-id: http://skia.googlecode.com/svn/trunk@11914 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/core/SkMatrix.cpp')
| -rw-r--r-- | src/core/SkMatrix.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/core/SkMatrix.cpp b/src/core/SkMatrix.cpp index 41c0f883a7..5bcb35b298 100644 --- a/src/core/SkMatrix.cpp +++ b/src/core/SkMatrix.cpp @@ -1894,14 +1894,15 @@ SkScalar SkMatrix::getMaxStretch() const { return SkScalarSqrt(largerRoot); } -DEF_SK_ONCE(reset_identity_matrix, SkMatrix* identity) { +static void reset_identity_matrix(SkMatrix* identity) { identity->reset(); } const SkMatrix& SkMatrix::I() { // If you can use C++11 now, you might consider replacing this with a constexpr constructor. static SkMatrix gIdentity; - SK_ONCE(reset_identity_matrix, &gIdentity); + SK_DECLARE_STATIC_ONCE(once); + SkOnce(&once, reset_identity_matrix, &gIdentity); return gIdentity; } |