Changeset 102835 in webkit

Timestamp:

Dec 14, 2011 3:21:35 PM (12 years ago)

Author:

rniwa@webkit.org

Message:

COMPILE_ASSERT in CSSStyleSelector.cpp doesn't compile on Windows
​https://bugs.webkit.org/show_bug.cgi?id=74327

Reviewed by Darin Adler.

Always use unsigned instead of bool and unsigned in the bitfields of RuleData to shrink
its size under MSVC.

Unlike gcc and clang, MSVC pads each consecutive member variables of the same type
in bitfields. e.g. if you have:
sturct AB {

unsigned m_1 : 31;
bool m_2 : 1;

}
then MSVC pads m_1 and allocates sizeof(unsigned) * 2 for AB whereas gcc and clang
only allocate sizeof(unsigned) * 1 for AB.

• css/CSSStyleSelector.cpp:

(WebCore::RuleData::RuleData):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/CSSStyleSelector.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-12-14  Ryosuke Niwa  <rniwa@webkit.org>
+
+        COMPILE_ASSERT in CSSStyleSelector.cpp doesn't compile on Windows
+        https://bugs.webkit.org/show_bug.cgi?id=74327
+
+        Reviewed by Darin Adler.
+
+        Always use unsigned instead of bool and unsigned in the bitfields of RuleData to shrink
+        its size under MSVC.
+
+        Unlike gcc and clang, MSVC pads each consecutive member variables of the same type
+        in bitfields. e.g. if you have:
+        sturct AB {
+            unsigned m_1 : 31;
+            bool m_2 : 1;
+        }
+        then MSVC pads m_1 and allocates sizeof(unsigned) * 2 for AB whereas gcc and clang
+        only allocate sizeof(unsigned) * 1 for AB.
+
+        * css/CSSStyleSelector.cpp:
+        (WebCore::RuleData::RuleData):
+
 2011-12-14  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WebCore/css/CSSStyleSelector.cpp

@@ -194 +194 @@
     // Some simple testing showed <100,000 RuleData's on large sites.
     unsigned m_position : 25;
-    bool m_hasFastCheckableSelector : 1;
-    bool m_hasMultipartSelector : 1;
-    bool m_hasRightmostSelectorMatchingHTMLBasedOnRuleHash : 1;
-    bool m_containsUncommonAttributeSelector : 1;
+    unsigned m_hasFastCheckableSelector : 1;
+    unsigned m_hasMultipartSelector : 1;
+    unsigned m_hasRightmostSelectorMatchingHTMLBasedOnRuleHash : 1;
+    unsigned m_containsUncommonAttributeSelector : 1;
     unsigned m_linkMatchType : 2; //  SelectorChecker::LinkMatchMask
-    bool m_regionStyleRule : 1;
+    unsigned m_regionStyleRule : 1;
     // Use plain array instead of a Vector to minimize memory overhead.
     unsigned m_descendantSelectorIdentifierHashes[maximumIdentifierCount];
@@ -212 +212 @@
 };
 
-#if !OS(WINDOWS)
 COMPILE_ASSERT(sizeof(RuleData) == sizeof(SameSizeAsRuleData), RuleData_should_stay_small);
-#endif
 
 class RuleSet {
@@ -1895 +1893 @@
     , m_position(position)
     , m_hasFastCheckableSelector(SelectorChecker::isFastCheckableSelector(selector))
-    , m_hasMultipartSelector(selector->tagHistory())
+    , m_hasMultipartSelector(!!selector->tagHistory())
     , m_hasRightmostSelectorMatchingHTMLBasedOnRuleHash(isSelectorMatchingHTMLBasedOnRuleHash(selector))
     , m_containsUncommonAttributeSelector(WebCore::containsUncommonAttributeSelector(selector))