Adjust RenderElement size assertion to be more accurate
authortimothy_horton@apple.com <timothy_horton@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 2 Nov 2017 01:59:12 +0000 (01:59 +0000)
committertimothy_horton@apple.com <timothy_horton@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 2 Nov 2017 01:59:12 +0000 (01:59 +0000)
https://bugs.webkit.org/show_bug.cgi?id=179146

Reviewed by Simon Fraser.

* rendering/RenderElement.cpp:
Alignment rules for bitfields differ on different platforms. If we're
more truthful in our mimicing the layout of RenderElement, we can avoid
the assertion firing on more configurations.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@224310 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/rendering/RenderElement.cpp

index d683b23..8e2874a 100644 (file)
@@ -1,3 +1,15 @@
+2017-11-01  Tim Horton  <timothy_horton@apple.com>
+
+        Adjust RenderElement size assertion to be more accurate
+        https://bugs.webkit.org/show_bug.cgi?id=179146
+
+        Reviewed by Simon Fraser.
+
+        * rendering/RenderElement.cpp:
+        Alignment rules for bitfields differ on different platforms. If we're
+        more truthful in our mimicing the layout of RenderElement, we can avoid
+        the assertion firing on more configurations.
+
 2017-11-01  Mark Lam  <mark.lam@apple.com>
 
         Add support to throw OOM if MarkedArgumentBuffer may overflow.
index dd9cc1b..0b09511 100644 (file)
@@ -81,7 +81,7 @@
 namespace WebCore {
 
 struct SameSizeAsRenderElement : public RenderObject {
-    uint32_t bitfields;
+    unsigned bitfields : 24;
     void* firstChild;
     void* lastChild;
     RenderStyle style;