Remove attrNodeListMap.

Source/core/dom/ElementRareData.cpp

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 13 matching lines @@
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "core/dom/ElementRareData.h"
 
+#include "core/dom/Attr.h"
+#include "core/dom/NamedNodeMap.h"
 #include "core/rendering/style/RenderStyle.h"
 
 namespace WebCore {
 
 struct SameSizeAsElementRareData : NodeRareData {
     short indices[2];
     LayoutSize sizeForResizing;
     IntSize scrollOffset;
     void* pointers[12];
 };
 
 CSSStyleDeclaration& ElementRareData::ensureInlineCSSStyleDeclaration(Element* ownerElement)
 {
     if (!m_cssomWrapper)
         m_cssomWrapper = adoptPtrWillBeNoop(new InlineCSSStyleDeclaration(ownerElement));
     return *m_cssomWrapper;
 }
 
+AttrData& ElementRareData::ensureAttrData()
+{
+    if (!m_attrData)
+        m_attrData = AttrData::create();
+    return *m_attrData;
+}
+
 void ElementRareData::traceAfterDispatch(Visitor* visitor)
 {
     visitor->trace(m_dataset);
     visitor->trace(m_classList);
     visitor->trace(m_shadow);
-    visitor->trace(m_attributeMap);
+    visitor->trace(m_attrData);
     visitor->trace(m_inputMethodContext);
     visitor->trace(m_activeAnimations);
     visitor->trace(m_cssomWrapper);
     visitor->trace(m_generatedBefore);
     visitor->trace(m_generatedAfter);
     visitor->trace(m_backdrop);
     NodeRareData::traceAfterDispatch(visitor);
 }
 
 COMPILE_ASSERT(sizeof(ElementRareData) == sizeof(SameSizeAsElementRareData), ElementRareDataShouldStaySmall);
 
+inline AttrData::AttrData()

[esprehn, 2014/06/17 08:27:05]

Put it in the header or remove the inline.

+{
+}
+
+PassOwnPtrWillBeRawPtr<AttrData> AttrData::create()
+{
+    return adoptPtrWillBeNoop(new AttrData);
+}
+
+DEFINE_EMPTY_DESTRUCTOR_WILL_BE_REMOVED(AttrData)
+
+void AttrData::trace(Visitor* visitor)
+{
+#if ENABLE(OILPAN)
+    visitor->trace(m_attrNodeList);
+#endif

[esprehn, 2014/06/17 08:27:05]

This code doesn't make sense. We should never call trace() methods when not in
oilpan mode. Remove this ifdef.

[Mads Ager (chromium), 2014/06/17 08:35:08]

They are never called, but they are compiled.

[esprehn, 2014/06/17 11:06:04]

Why won't think compile in non-oilpan mode? It's not at all clear here why the
trace() call below is fine outside the ifdef, but the one above requires it.

+    visitor->trace(m_attributeMap);
+}
+
+WillBeHeapVector<RefPtrWillBeMember<Attr> >& AttrData::ensureAttrNodeList()
+{
+    if (!m_attrNodeList)
+        m_attrNodeList = adoptPtrWillBeNoop(new WillBeHeapVector<RefPtrWillBeMember<Attr> >());
+    return *m_attrNodeList;
+}
+
+void AttrData::removeAttrNodeList()
+{
+    m_attrNodeList.clear();
+}
+
+void AttrData::setAttributeMap(PassOwnPtrWillBeRawPtr<NamedNodeMap> attributeMap)
+{
+    m_attributeMap = attributeMap;
+}
+
 } // namespace WebCore