Move element flags from ElementRareData to NodeRareData

Source/core/dom/NodeRareData.h

 /*
  * Copyright (C) 2008, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2008 David Smith <catfish.man@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
@@ skipping 237 matching lines @@
     {
         m_connectedFrameCount += amount;
     }
     void decrementConnectedSubframeCount(unsigned amount)
     {
         ASSERT(m_connectedFrameCount);
         ASSERT(amount <= m_connectedFrameCount);
         m_connectedFrameCount -= amount;
     }
 
+    bool hasFlag(ElementFlags mask) const { return m_elementFlags & mask; }
+    void setFlag(ElementFlags mask, bool value) { m_elementFlags = (m_elementFlags & ~mask) | (-(int32_t)value & mask); }
+    void clearFlag(ElementFlags mask) { m_elementFlags &= ~mask; }
+
+    enum {
+        ConnectedFrameCountBits = 10, // Must fit Page::maxNumberOfFrames.
+        ElementFlagsBits = 17, // Must fit the ElementFlags enumeration.
+    };
+
 protected:
     NodeRareData(RenderObject* renderer)
         : NodeRareDataBase(renderer)
         , m_connectedFrameCount(0)
+        , m_elementFlags(0)
     { }
 
 private:
-    unsigned m_connectedFrameCount : 10; // Must fit Page::maxNumberOfFrames.
-
     OwnPtr<NodeListsNodeData> m_nodeLists;
     OwnPtr<NodeMutationObserverData> m_mutationObserverData;
+
+    unsigned m_connectedFrameCount : ConnectedFrameCountBits;
+    unsigned m_elementFlags : ElementFlagsBits;
 };
 
 inline bool NodeListsNodeData::deleteThisAndUpdateNodeRareDataIfAboutToRemoveLastList(Node& ownerNode)
 {
     ASSERT(ownerNode.nodeLists() == this);
     if ((m_childNodeList ? 1 : 0) + m_atomicNameCaches.size() + m_tagCollectionCacheNS.size() != 1)
         return false;
     ownerNode.clearNodeLists();
     return true;
 }
 
-// Ensure the 10 bits reserved for the m_connectedFrameCount cannot overflow
-COMPILE_ASSERT(Page::maxNumberOfFrames < 1024, Frame_limit_should_fit_in_rare_data_count);
-
 } // namespace WebCore
 
 #endif // NodeRareData_h