Changeset 246286 in webkit

Timestamp:

Jun 10, 2019 3:18:53 PM (5 years ago)

Author:

Michael Catanzaro

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:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/style/StyleRareInheritedData.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-06-10  Michael Catanzaro  <mcatanzaro@igalia.com>
+
+        [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  <weinig@apple.com>
 

trunk/Source/WebCore/rendering/style/StyleRareInheritedData.cpp

@@ -49 +49 @@
     TextUnderlineOffset offset;
     TextDecorationThickness thickness;
+    void* customPropertyDataRefs[1];
     unsigned bitfields[4];
     short pagedMediaShorts[2];
@@ -54 +55 @@
     short hyphenationShorts[3];
 
-#if PLATFORM(IOS_FAMILY)
-    Color compositionColor; // FIXME: this has gone.
-#endif
 #if ENABLE(TEXT_AUTOSIZING)
     TextSizeAdjustment textSizeAdjust;
@@ -72 +70 @@
     StyleColorScheme colorScheme;
 #endif
-
-    void* customPropertyDataRefs[1];
 };