Changeset 138879 in webkit

Timestamp:

Jan 4, 2013 6:05:14 PM (11 years ago)

Author:

rniwa@webkit.org

Message:

Chromium windows compile fails because of the assertion in NodeRareData
​https://bugs.webkit.org/show_bug.cgi?id=106149

Reviewed by Andreas Kling.

MSVC adds padding between bitfields of different types for better alignment.
Since we care more about the memory usage, use unsigned for all bitfields to work around this behavior.

• dom/NodeRareData.cpp:

(SameSizeAsNodeRareData):
(WebCore):

• dom/NodeRareData.h:

(WebCore::NodeRareData::isWebVTTNode):
(WebCore::NodeRareData::isWebVTTFutureNode):
(NodeRareData):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/NodeRareData.cpp (modified) (1 diff)
• dom/NodeRareData.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-04  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Chromium windows compile fails because of the assertion in NodeRareData
+        https://bugs.webkit.org/show_bug.cgi?id=106149
+
+        Reviewed by Andreas Kling.
+
+        MSVC adds padding between bitfields of different types for better alignment.
+        Since we care more about the memory usage, use unsigned for all bitfields to work around this behavior.
+
+        * dom/NodeRareData.cpp:
+        (SameSizeAsNodeRareData):
+        (WebCore):
+        * dom/NodeRareData.h:
+        (WebCore::NodeRareData::isWebVTTNode):
+        (WebCore::NodeRareData::isWebVTTFutureNode):
+        (NodeRareData):
+
 2013-01-04  Dan Bernstein  <mitz@apple.com>
 

trunk/Source/WebCore/dom/NodeRareData.cpp

@@ -46 +46 @@
     void* m_microData;
 #endif
+};
 
-// Enum is integer type and is aligned in Windows when placed in the bitfield, so it takes more space. 
-#if PLATFORM(WIN)
-    TextTrack::WebVTTNodeType m_WebVTTNodeType;
-#endif
-};
 COMPILE_ASSERT(sizeof(NodeRareData) == sizeof(SameSizeAsNodeRareData), NodeRareDataShouldStaySmall);
 

trunk/Source/WebCore/dom/NodeRareData.h

@@ -373 +373 @@
 protected:
 #if ENABLE(VIDEO_TRACK)
-    bool isWebVTTNode() { return m_WebVTTNodeType != TextTrack::WebVTTNodeTypeNone; }
+    bool isWebVTTNode() { return static_cast<TextTrack::WebVTTNodeType>(m_WebVTTNodeType) != TextTrack::WebVTTNodeTypeNone; }
     void setIsWebVTTNode() { m_WebVTTNodeType = TextTrack::WebVTTNodeTypePast; }
-    bool isWebVTTFutureNode() { return m_WebVTTNodeType == TextTrack::WebVTTNodeTypeFuture; }
+    bool isWebVTTFutureNode() { return static_cast<TextTrack::WebVTTNodeType>(m_WebVTTNodeType) == TextTrack::WebVTTNodeTypeFuture; }
     void setIsWebVTTFutureNode() { m_WebVTTNodeType = TextTrack::WebVTTNodeTypeFuture; }
 #endif
     short m_tabIndex;
     unsigned short m_childIndex;
-    bool m_tabIndexWasSetExplicitly : 1;
-    bool m_needsFocusAppearanceUpdateSoonAfterAttach : 1;
-    bool m_styleAffectedByEmpty : 1;
-    bool m_isInCanvasSubtree : 1;
+    unsigned m_tabIndexWasSetExplicitly : 1;
+    unsigned m_needsFocusAppearanceUpdateSoonAfterAttach : 1;
+    unsigned m_styleAffectedByEmpty : 1;
+    unsigned m_isInCanvasSubtree : 1;
 #if ENABLE(FULLSCREEN_API)
-    bool m_containsFullScreenElement : 1;
+    unsigned m_containsFullScreenElement : 1;
 #endif
 #if ENABLE(DIALOG_ELEMENT)
-    bool m_isInTopLayer : 1;
+    unsigned m_isInTopLayer : 1;
 #endif
 #if ENABLE(SVG)
-    bool m_hasPendingResources : 1;
-#endif
-    bool m_childrenAffectedByHover : 1;
-    bool m_childrenAffectedByActive : 1;
-    bool m_childrenAffectedByDrag : 1;
+    unsigned m_hasPendingResources : 1;
+#endif
+    unsigned m_childrenAffectedByHover : 1;
+    unsigned m_childrenAffectedByActive : 1;
+    unsigned m_childrenAffectedByDrag : 1;
     // Bits for dynamic child matching.
     // We optimize for :first-child and :last-child. The other positional child selectors like nth-child or
     // *-child-of-type, we will just give up and re-evaluate whenever children change at all.
-    bool m_childrenAffectedByFirstChildRules : 1;
-    bool m_childrenAffectedByLastChildRules : 1;
-    bool m_childrenAffectedByDirectAdjacentRules : 1;
-    bool m_childrenAffectedByForwardPositionalRules : 1;
-    bool m_childrenAffectedByBackwardPositionalRules : 1;
+    unsigned m_childrenAffectedByFirstChildRules : 1;
+    unsigned m_childrenAffectedByLastChildRules : 1;
+    unsigned m_childrenAffectedByDirectAdjacentRules : 1;
+    unsigned m_childrenAffectedByForwardPositionalRules : 1;
+    unsigned m_childrenAffectedByBackwardPositionalRules : 1;
 #if ENABLE(VIDEO_TRACK)
-    TextTrack::WebVTTNodeType m_WebVTTNodeType : 2;
-#endif
+    unsigned m_WebVTTNodeType : 2;
+#endif
+
 private:
     OwnPtr<NodeListsNodeData> m_nodeLists;