Merge r221467 - Attempt to fix the Apple Windows and WinCairo build f…

…ollowing <https://trac.webkit.org/changeset/221459> (https://bugs.webkit.org/show_bug.cgi?id=176171) Explicitly cast PseudoIds to unsigned before computing a difference between two PseudoIds. * rendering/style/RenderStyle.h:
WebKit · Sep 2, 2017 · 8b5d9f3 · 8b5d9f3
1 parent 9a2d8c9
commit 8b5d9f3
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>
+
+        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)
+
+        Explicitly cast PseudoIds to unsigned before computing a difference between two PseudoIds.
+
+        * rendering/style/RenderStyle.h:
+
 2017-08-31  Daniel Bates  <dabates@apple.com>
 
         Make RenderStyle's non-inherited flags more human friendly

diff --git a/Source/WebCore/rendering/style/RenderStyle.h b/Source/WebCore/rendering/style/RenderStyle.h
@@ -1771,7 +1771,7 @@ class RenderStyle {
         unsigned isLink : 1;
 
         unsigned styleType : 4; // PseudoId
-        unsigned pseudoBits : (FIRST_INTERNAL_PSEUDOID - FIRST_PUBLIC_PSEUDOID);
+        unsigned pseudoBits : (static_cast<unsigned>(FIRST_INTERNAL_PSEUDOID) - static_cast<unsigned>(FIRST_PUBLIC_PSEUDOID));
 
         // If you add more style bits here, you will also need to update RenderStyle::NonInheritedFlags::copyNonInheritedFrom().
     };