diff options
| author |  Cary Clark <caryclark@skia.org> | 2018-04-26 08:32:37 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-04-26 17:11:53 +0000 |
| commit | d98f78cd019d96f902197711c5e7e43afec3c3de (patch) | |
| tree | 376d0bae10124bc51f150a8834c1e54d989d6a7e /docs/SkMatrix_Reference.bmh | |
| parent | ba37e5b1c9bd24a86584a3e80347a82175a2403a (diff) | |
alternative no anonymous enums
Anonymous enums play havoc with documentation;
there's no name to refer to. It may be that all
enums may either be named or replaced with constexpr
without breaking anything. Try replacing all
anonymous enums in include/core to see what happens.
This names SkCanvas::SaveLayerFlagsSet but leaves
SkCanvas::SaveLayerFlags as a uint32_t, to reduce
risk as compared to review.skia.org/123584.
There's also some chance that external linkage will
break if some client refers to anonymous enum in a way
that could require its address: see
https://stackoverflow.com/questions/22867654/enum-vs-constexpr-for-actual-static-constants-inside-classes
(This CL does not require definitions + declarations)
Brought bookmaker docs in line with this change.
This also tripped over missing code in bookmaker
handling constexpr so added that as well.
R=reed@google.com,bsalomon@google.com
Docs-Preview: https://skia.org/?cl=123920
Docs-Preview: https://skia.org/?cl=123584
Bug: skia:6898
Change-Id: I14a342edcfd59e139ef9e4501f562417c4c60391
Reviewed-on: https://skia-review.googlesource.com/123920
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Cary Clark <caryclark@skia.org>
Diffstat (limited to 'docs/SkMatrix_Reference.bmh')
| -rw-r--r-- | docs/SkMatrix_Reference.bmh | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/docs/SkMatrix_Reference.bmh b/docs/SkMatrix_Reference.bmh index 63040e8a21..ba3cf79a1d 100644 --- a/docs/SkMatrix_Reference.bmh +++ b/docs/SkMatrix_Reference.bmh @@ -619,20 +619,20 @@ for (SkScalar sx : { 1, 2 } ) { # ------------------------------------------------------------------------------ -#Enum +#Subtopic MemberIndex +#In Constant +#Line # member indices ## #Code - enum { - kMScaleX, - kMSkewX, - kMTransX, - kMSkewY, - kMScaleY, - kMTransY, - kMPersp0, - kMPersp1, - kMPersp2, - }; + static constexpr int kMScaleX = 0; + static constexpr int kMSkewX = 1; + static constexpr int kMTransX = 2; + static constexpr int kMSkewY = 3; + static constexpr int kMScaleY = 4; + static constexpr int kMTransY = 5; + static constexpr int kMPersp0 = 6; + static constexpr int kMPersp1 = 7; + static constexpr int kMPersp2 = 8; ## Matrix organizes its values in row order. These members correspond to @@ -693,17 +693,17 @@ for (int i : { SkMatrix::kMScaleX, SkMatrix::kMSkewX, SkMatrix::kMTransX, # ------------------------------------------------------------------------------ -#Enum +#Subtopic AffineIndex +#In Constant +#Line # affine member indices ## #Code - enum { - kAScaleX, - kASkewY, - kASkewX, - kAScaleY, - kATransX, - kATransY, - }; + static constexpr int kAScaleX = 0; + static constexpr int kASkewY = 1; + static constexpr int kASkewX = 2; + static constexpr int kAScaleY = 3; + static constexpr int kATransX = 4; + static constexpr int kATransY = 5; ## Affine arrays are in column major order to match the matrix used by |