| Index: src/gpu/GrStrokeInfo.cpp
|
| diff --git a/src/gpu/GrStrokeInfo.cpp b/src/gpu/GrStrokeInfo.cpp
|
| index 0ad4179add90af5f36cfad4d8fca1be913f05967..03483afec77b62eda59d5a5387a480fa8bb6c402 100644
|
| --- a/src/gpu/GrStrokeInfo.cpp
|
| +++ b/src/gpu/GrStrokeInfo.cpp
|
| @@ -36,9 +36,9 @@ void GrStrokeInfo::asUniqueKeyFragment(uint32_t* data) const {
|
| kCapShift = kJoinShift + kJoinBits,
|
| };
|
|
|
| - SK_COMPILE_ASSERT(SkStrokeRec::kStyleCount <= (1 << kStyleBits), style_shift_will_be_wrong);
|
| - SK_COMPILE_ASSERT(SkPaint::kJoinCount <= (1 << kJoinBits), cap_shift_will_be_wrong);
|
| - SK_COMPILE_ASSERT(SkPaint::kCapCount <= (1 << kCapBits), cap_does_not_fit);
|
| + static_assert(SkStrokeRec::kStyleCount <= (1 << kStyleBits), "style_shift_will_be_wrong");
|
| + static_assert(SkPaint::kJoinCount <= (1 << kJoinBits), "cap_shift_will_be_wrong");
|
| + static_assert(SkPaint::kCapCount <= (1 << kCapBits), "cap_does_not_fit");
|
| uint32_t styleKey = this->getStyle();
|
| if (this->needToApply()) {
|
| styleKey |= this->getJoin() << kJoinShift;
|
|
|