| Index: third_party/WebKit/Source/core/style/ComputedStyleConstants.h
|
| diff --git a/third_party/WebKit/Source/core/style/ComputedStyleConstants.h b/third_party/WebKit/Source/core/style/ComputedStyleConstants.h
|
| index a817d9ae3b0dba345c70e7b4260985ce3a309867..fa822216f54da9694eadca80577033d9a4e4da47 100644
|
| --- a/third_party/WebKit/Source/core/style/ComputedStyleConstants.h
|
| +++ b/third_party/WebKit/Source/core/style/ComputedStyleConstants.h
|
| @@ -238,11 +238,12 @@ enum TextDecorationStyle {
|
| };
|
|
|
| static const size_t kTextDecorationSkipBits = 3;
|
| -enum TextDecorationSkip {
|
| - kTextDecorationSkipNone = 0x0,
|
| - kTextDecorationSkipObjects = 0x1,
|
| - kTextDecorationSkipInk = 0x2
|
| -};
|
| +enum class TextDecorationSkip { kNone = 0x0, kObjects = 0x1, kInk = 0x2 };
|
| +inline TextDecorationSkip operator&(TextDecorationSkip a,
|
| + TextDecorationSkip b) {
|
| + return TextDecorationSkip(static_cast<unsigned>(a) &
|
| + static_cast<unsigned>(b));
|
| +}
|
| inline TextDecorationSkip operator|(TextDecorationSkip a,
|
| TextDecorationSkip b) {
|
| return TextDecorationSkip(static_cast<unsigned>(a) |
|
|
|