Index: Source/core/dom/Node.cpp |
diff --git a/Source/core/dom/Node.cpp b/Source/core/dom/Node.cpp |
index 6cb9f35f4a68f03d5a4fde44829c03c71e8df83c..e3d98ed2b40e445588aef03fba92353a41bf8433 100644 |
--- a/Source/core/dom/Node.cpp |
+++ b/Source/core/dom/Node.cpp |
@@ -99,7 +99,9 @@ namespace blink { |
using namespace HTMLNames; |
struct SameSizeAsNode : NODE_BASE_CLASSES { |
+#if !(ENABLE(OILPAN) && USE_4BYTE_HEADER_PADDING) |
uint32_t m_nodeFlags; |
+#endif |
void* m_pointer[5]; |
}; |
@@ -256,12 +258,12 @@ void Node::trackForDebugging() |
} |
Node::Node(TreeScope* treeScope, ConstructionType type) |
- : m_nodeFlags(type) |
- , m_parentOrShadowHostNode(nullptr) |
+ : m_parentOrShadowHostNode(nullptr) |
, m_treeScope(treeScope) |
, m_previous(nullptr) |
, m_next(nullptr) |
{ |
+ NODE_FLAGS = type; |
ASSERT(m_treeScope || type == CreateDocument || type == CreateShadowRoot); |
#if !ENABLE(OILPAN) |
if (m_treeScope) |
@@ -706,7 +708,7 @@ void Node::markAncestorsWithChildNeedsDistributionRecalc() |
inline void Node::setStyleChange(StyleChangeType changeType) |
{ |
- m_nodeFlags = (m_nodeFlags & ~StyleChangeMask) | changeType; |
+ NODE_FLAGS = (NODE_FLAGS & ~StyleChangeMask) | changeType; |
} |
void Node::markAncestorsWithChildNeedsStyleRecalc() |
@@ -743,7 +745,7 @@ void Node::setNeedsStyleRecalc(StyleChangeType changeType, const StyleChangeReas |
void Node::clearNeedsStyleRecalc() |
{ |
- m_nodeFlags &= ~StyleChangeMask; |
+ NODE_FLAGS &= ~StyleChangeMask; |
clearSVGFilterNeedsLayerUpdate(); |