Another attempt to fix the Apple Windows build following <https://trac.webkit.org...
authordbates@webkit.org <dbates@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 1 Sep 2017 02:59:19 +0000 (02:59 +0000)
committerdbates@webkit.org <dbates@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 1 Sep 2017 02:59:19 +0000 (02:59 +0000)
(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:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@221469 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/rendering/style/RenderStyle.cpp

index c2ec664..17bb3eb 100644 (file)
@@ -1,5 +1,14 @@
 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>
         (https://bugs.webkit.org/show_bug.cgi?id=176171)
 
index 4095771..ef961c8 100644 (file)
@@ -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()
 {