update SkPaint size sanity check
I counted twice... there are 7 pointers and 8 4-byte things.
Change-Id: I106a0f1c1bf9ee580e7b04afc763b2ec977fca3c
Reviewed-on: https://skia-review.googlesource.com/150120
Auto-Submit: Mike Klein <mtklein@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>
diff --git a/src/core/SkPaint.cpp b/src/core/SkPaint.cpp
index 15aa44e..ae56f2e 100644
--- a/src/core/SkPaint.cpp
+++ b/src/core/SkPaint.cpp
@@ -1494,10 +1494,8 @@
}
uint32_t SkPaint::getHash() const {
- // We're going to hash 7 pointers and 7 32-bit values, finishing up with fBitfields,
- // so fBitfields should be 7 pointers and 6 32-bit values from the start.
- static_assert(offsetof(SkPaint, fBitfields) == 7 * sizeof(void*) + 7 * sizeof(uint32_t),
- "SkPaint_notPackedTightly");
- return SkOpts::hash(reinterpret_cast<const uint32_t*>(this),
- offsetof(SkPaint, fBitfields) + sizeof(fBitfields));
+ // SkPaint has no padding bytes, which lets us hash the struct directly.
+ static_assert(sizeof(SkPaint) == 7*sizeof(void*) + 8*sizeof(uint32_t),
+ "Please update, and make sure SkPaint still has no padding bytes.");
+ return SkOpts::hash(reinterpret_cast<const uint32_t*>(this), sizeof(SkPaint));
}