Merge r221469 - Another attempt to fix the Apple Windows build follow…

…ing <https://trac.webkit.org/changeset/221459> (https://bugs.webkit.org/show_bug.cgi?id=176171) Temporarily weaken the size check for RenderStyle from a strict equality to <=. * rendering/style/RenderStyle.cpp:
WebKit · Sep 2, 2017 · 1744d50 · 1744d50
1 parent 8b5d9f3
commit 1744d50
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2017-08-31  Daniel Bates  <dabates@apple.com>
+
+        Another attempt to fix the Apple Windows build following <https://trac.webkit.org/changeset/221459>
+        (https://bugs.webkit.org/show_bug.cgi?id=176171)
+
+        Temporarily weaken the size check for RenderStyle from a strict equality to <=.
+
+        * rendering/style/RenderStyle.cpp:
+
 2017-08-31  Daniel Bates  <dabates@apple.com>
 
         Attempt to fix the Apple Windows and WinCairo build following <https://trac.webkit.org/changeset/221459>

diff --git a/Source/WebCore/rendering/style/RenderStyle.cpp b/Source/WebCore/rendering/style/RenderStyle.cpp
@@ -81,7 +81,7 @@ struct SameSizeAsRenderStyle {
 #endif
 };
 
-static_assert(sizeof(RenderStyle) == sizeof(SameSizeAsRenderStyle), "RenderStyle should stay small");
+static_assert(sizeof(RenderStyle) <= sizeof(SameSizeAsRenderStyle), "RenderStyle should stay small");
 
 RenderStyle& RenderStyle::defaultStyle()
 {