Title: [197777] trunk/Source/WebCore
- Revision
- 197777
- Author
- cdu...@apple.com
- Date
- 2016-03-08 10:06:08 -0800 (Tue, 08 Mar 2016)
Log Message
Unreviewed, fix 32-bit build after r197726.
Also, re-enable static_assert to check the ElementRareData size.
* dom/ElementRareData.cpp:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (197776 => 197777)
--- trunk/Source/WebCore/ChangeLog 2016-03-08 18:03:28 UTC (rev 197776)
+++ trunk/Source/WebCore/ChangeLog 2016-03-08 18:06:08 UTC (rev 197777)
@@ -1,3 +1,11 @@
+2016-03-08 Chris Dumez <cdu...@apple.com>
+
+ Unreviewed, fix 32-bit build after r197726.
+
+ Also, re-enable static_assert to check the ElementRareData size.
+
+ * dom/ElementRareData.cpp:
+
2016-03-08 Brent Fulgham <bfulg...@apple.com>
Unreviewed test fix after r197721.
Modified: trunk/Source/WebCore/dom/ElementRareData.cpp (197776 => 197777)
--- trunk/Source/WebCore/dom/ElementRareData.cpp 2016-03-08 18:03:28 UTC (rev 197776)
+++ trunk/Source/WebCore/dom/ElementRareData.cpp 2016-03-08 18:06:08 UTC (rev 197777)
@@ -36,14 +36,17 @@
struct SameSizeAsElementRareData : NodeRareData {
int tabIndex;
unsigned short childIndex;
- unsigned bitfields;
+#if ENABLE(FULLSCREEN_API)
+ unsigned bitfields : 11;
+#else
+ unsigned bitfields : 10;
+#endif
RegionOversetState regionOversetState;
LayoutSize sizeForResizing;
IntPoint savedLayerScrollPosition;
void* pointers[7];
};
-// FIXME: This currently does not build on some platforms.
-//static_assert(sizeof(ElementRareData) == sizeof(SameSizeAsElementRareData), "ElementRareData should stay small");
+static_assert(sizeof(ElementRareData) == sizeof(SameSizeAsElementRareData), "ElementRareData should stay small");
} // namespace WebCore
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
