Attachment 371591 Details for Bug 198274 – Patch

[patch] Patch

bug-198274-20190607115917.patch (text/plain), 2.19 KB, created by Michael Catanzaro on 2019-06-07 09:59:18 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Catanzaro

Created: 2019-06-07 09:59:18 PDT

Size: 2.19 KB

patch

obsolete

>Subversion Revision: 246199
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index a774c90cb77d837f0f9fb15202d9e073a9653dc2..f45de457a3bb2ea09d89f1101d32da7e27b87a3a 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,17 @@
>+2019-06-07  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 NOBODY (OOPS!).
>+
>+        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-07  Michael Catanzaro  <mcatanzaro@igalia.com>
> 
>         [GTK] GLContextEGL.h must be built with @no-unify
>diff --git a/Source/WebCore/rendering/style/StyleRareInheritedData.cpp b/Source/WebCore/rendering/style/StyleRareInheritedData.cpp
>index 1f22a1a5a4a59e28f9d0178578dcd9663d0b28d5..14e31b5c506affd53a6ba934a0c5c12e709fb058 100644
>--- a/Source/WebCore/rendering/style/StyleRareInheritedData.cpp
>+++ b/Source/WebCore/rendering/style/StyleRareInheritedData.cpp
>@@ -48,14 +48,12 @@ struct GreaterThanOrSameSizeAsStyleRareInheritedData : public RefCounted<Greater
>     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 @@ struct GreaterThanOrSameSizeAsStyleRareInheritedData : public RefCounted<Greater
> #if ENABLE(DARK_MODE_CSS)
>     StyleColorScheme colorScheme;
> #endif
>-
>-    void* customPropertyDataRefs[1];
> };
> 
> COMPILE_ASSERT(sizeof(StyleRareInheritedData) <= sizeof(GreaterThanOrSameSizeAsStyleRareInheritedData), StyleRareInheritedData_should_bit_pack);

Actions: View | Formatted Diff | Diff

Attachments on bug 198274: 371591