| Index: src/core/SkPaint.cpp
|
| diff --git a/src/core/SkPaint.cpp b/src/core/SkPaint.cpp
|
| index f64ab1d844784a02b1028ad5cdf16dd6fc0080f1..6c1323c592699baa77da05a8c4d92efd724cbf48 100644
|
| --- a/src/core/SkPaint.cpp
|
| +++ b/src/core/SkPaint.cpp
|
| @@ -2419,8 +2419,8 @@ bool SkPaint::nothingToDraw() const {
|
| uint32_t SkPaint::getHash() const {
|
| // We're going to hash 10 pointers and 7 32-bit values, finishing up with fBitfields,
|
| // so fBitfields should be 10 pointers and 6 32-bit values from the start.
|
| - SK_COMPILE_ASSERT(offsetof(SkPaint, fBitfields) == 10 * sizeof(void*) + 6 * sizeof(uint32_t),
|
| - SkPaint_notPackedTightly);
|
| + static_assert(offsetof(SkPaint, fBitfields) == 10 * sizeof(void*) + 6 * sizeof(uint32_t),
|
| + "SkPaint_notPackedTightly");
|
| return SkChecksum::Murmur3(reinterpret_cast<const uint32_t*>(this),
|
| offsetof(SkPaint, fBitfields) + sizeof(fBitfields));
|
| }
|
|
|