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/SkPaint_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/SkPaint_Reference.bmh')
| -rw-r--r-- | docs/SkPaint_Reference.bmh | 27 |
1 files changed, 5 insertions, 22 deletions
diff --git a/docs/SkPaint_Reference.bmh b/docs/SkPaint_Reference.bmh index 1467b5338c..47627361d4 100644 --- a/docs/SkPaint_Reference.bmh +++ b/docs/SkPaint_Reference.bmh @@ -1897,6 +1897,8 @@ while stroking. kStroke_Style, kStrokeAndFill_Style, }; + + static constexpr int kStyleCount = kStrokeAndFill_Style + 1; ## Set Style to fill, stroke, or both fill and stroke geometry. @@ -1931,22 +1933,12 @@ a fill draw. and the set Path_Fill_Type is ignored. ## -#Enum Style ## - -#Enum -#Line # number of Style defines ## -#Code - enum { - kStyleCount = kStrokeAndFill_Style + 1, - }; -## - #Const kStyleCount 3 The number of different Style values defined. May be used to verify that Style is a legal value. ## -#Enum ## +#Enum Style ## #Method Style getStyle() const @@ -3493,6 +3485,8 @@ Increments drawLooper Reference_Count by one. kCenter_Align, kRight_Align, }; + + static constexpr int kAlignCount = 3; ## Align adjusts the text relative to the text position. @@ -3526,17 +3520,6 @@ Align defaults to kLeft_Align. and by its height if Flags has kVerticalText_Flag set. ## -#Enum ## - -#Enum -#Line # number of Text_Align values ## - -#Code - enum { - kAlignCount = 3, - }; -## - #Const kAlignCount 3 The number of different Text_Align values defined. ## |