Oilpan: Decrease sizeof(Node) by 8 byte

Source/core/dom/Node.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ skipping 81 matching lines @@
 #include "wtf/RefCountedLeakCounter.h"
 #include "wtf/Vector.h"
 #include "wtf/text/CString.h"
 #include "wtf/text/StringBuilder.h"
 
 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];
 };
 
 static_assert(sizeof(Node) <= sizeof(SameSizeAsNode), "Node should stay small");
 
 #if !ENABLE(OILPAN)
 void* Node::operator new(size_t size)
 {
     ASSERT(isMainThread());
     return partitionAlloc(WTF::Partitions::nodePartition(), size);
@@ skipping 136 matching lines @@
 #ifndef NDEBUG
     nodeCounter.increment();
 #endif
 
 #if DUMP_NODE_STATISTICS
     liveNodeSet().add(this);
 #endif
 }
 
 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)
         m_treeScope->guardRef();
 #endif
 
 #if !defined(NDEBUG) || (defined(DUMP_NODE_STATISTICS) && DUMP_NODE_STATISTICS)
     trackForDebugging();
 #endif
     InstanceCounters::incrementCounter(InstanceCounters::NodeCounter);
@@ skipping 424 matching lines @@
 
 void Node::markAncestorsWithChildNeedsDistributionRecalc()
 {
     for (Node* node = this; node && !node->childNeedsDistributionRecalc(); node = node->parentOrShadowHostNode())
         node->setChildNeedsDistributionRecalc();
     document().scheduleLayoutTreeUpdateIfNeeded();
 }
 
 inline void Node::setStyleChange(StyleChangeType changeType)
 {
-    m_nodeFlags = (m_nodeFlags & ~StyleChangeMask) | changeType;
+    NODE_FLAGS = (NODE_FLAGS & ~StyleChangeMask) | changeType;
 }
 
 void Node::markAncestorsWithChildNeedsStyleRecalc()
 {
     for (ContainerNode* p = parentOrShadowHostNode(); p && !p->childNeedsStyleRecalc(); p = p->parentOrShadowHostNode())
         p->setChildNeedsStyleRecalc();
     document().scheduleLayoutTreeUpdateIfNeeded();
     document().incStyleVersion();
 }
 
@@ skipping 16 matching lines @@
 
     if (existingChangeType == NoStyleChange)
         markAncestorsWithChildNeedsStyleRecalc();
 
     if (isElementNode() && hasRareData())
         toElement(*this).setAnimationStyleChange(false);
 }
 
 void Node::clearNeedsStyleRecalc()
 {
-    m_nodeFlags &= ~StyleChangeMask;
+    NODE_FLAGS &= ~StyleChangeMask;
 
     clearSVGFilterNeedsLayerUpdate();
 
     if (isElementNode() && hasRareData())
         toElement(*this).setAnimationStyleChange(false);
 }
 
 bool Node::inActiveDocument() const
 {
     return inDocument() && document().isActive();
@@ skipping 1634 matching lines @@
 
 void showNodePath(const blink::Node* node)
 {
     if (node)
         node->showNodePathForThis();
     else
         fprintf(stderr, "Cannot showNodePath for (nil)\n");
 }
 
 #endif