Title: [246286] trunk/Source/WebCore
- Revision
- 246286
- Author
- [email protected]
- Date
- 2019-06-10 15:18:53 -0700 (Mon, 10 Jun 2019)
Log Message
[GTK] 2.25.1 does not build on 32-bit ARM due to bit-packing assertion, requires -DENABLE_DARK_MODE_CSS=OFF
https://bugs.webkit.org/show_bug.cgi?id=198274
Reviewed by Timothy Hatcher.
Rather than reorder everything in StyleRareInheritedData, let's slightly increase the size
of GreaterThanOrSameSizeAsStyleRareInheritedData to allow the static assert to pass.
At the same time, remove an obsolote iOS-specific member that is probably no longer needed.
* rendering/style/StyleRareInheritedData.cpp:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (246285 => 246286)
--- trunk/Source/WebCore/ChangeLog 2019-06-10 22:16:37 UTC (rev 246285)
+++ trunk/Source/WebCore/ChangeLog 2019-06-10 22:18:53 UTC (rev 246286)
@@ -1,3 +1,17 @@
+2019-06-10 Michael Catanzaro <[email protected]>
+
+ [GTK] 2.25.1 does not build on 32-bit ARM due to bit-packing assertion, requires -DENABLE_DARK_MODE_CSS=OFF
+ https://bugs.webkit.org/show_bug.cgi?id=198274
+
+ Reviewed by Timothy Hatcher.
+
+ Rather than reorder everything in StyleRareInheritedData, let's slightly increase the size
+ of GreaterThanOrSameSizeAsStyleRareInheritedData to allow the static assert to pass.
+
+ At the same time, remove an obsolote iOS-specific member that is probably no longer needed.
+
+ * rendering/style/StyleRareInheritedData.cpp:
+
2019-06-10 Sam Weinig <[email protected]>
Remove Dashboard support
Modified: trunk/Source/WebCore/rendering/style/StyleRareInheritedData.cpp (246285 => 246286)
--- trunk/Source/WebCore/rendering/style/StyleRareInheritedData.cpp 2019-06-10 22:16:37 UTC (rev 246285)
+++ trunk/Source/WebCore/rendering/style/StyleRareInheritedData.cpp 2019-06-10 22:18:53 UTC (rev 246286)
@@ -48,14 +48,12 @@
float secondFloat;
TextUnderlineOffset offset;
TextDecorationThickness thickness;
+ void* customPropertyDataRefs[1];
unsigned bitfields[4];
short pagedMediaShorts[2];
TabSize tabSize;
short hyphenationShorts[3];
-#if PLATFORM(IOS_FAMILY)
- Color compositionColor; // FIXME: this has gone.
-#endif
#if ENABLE(TEXT_AUTOSIZING)
TextSizeAdjustment textSizeAdjust;
#endif
@@ -71,8 +69,6 @@
#if ENABLE(DARK_MODE_CSS)
StyleColorScheme colorScheme;
#endif
-
- void* customPropertyDataRefs[1];
};
COMPILE_ASSERT(sizeof(StyleRareInheritedData) <= sizeof(GreaterThanOrSameSizeAsStyleRareInheritedData), StyleRareInheritedData_should_bit_pack);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
