Remove Attr child nodes (making Attr a Node, not a ContainerNode)

Source/core/dom/Element.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Peter Kelly (pmk@post.com)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  *           (C) 2007 David Smith (catfish.man@gmail.com)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012, 2013 Apple Inc. All rights reserved.
  *           (C) 2007 Eric Seidel (eric@webkit.org)
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 1066 matching lines @@
         appendAttributeInternal(name, newValue, inSynchronizationOfLazyAttribute);
         return;
     }
 
     const Attribute& existingAttribute = elementData()->attributes().at(index);
     AtomicString existingAttributeValue = existingAttribute.value();
     QualifiedName existingAttributeName = existingAttribute.name();
 
     if (!inSynchronizationOfLazyAttribute)
         willModifyAttribute(existingAttributeName, existingAttributeValue, newValue);
-
-    if (newValue != existingAttributeValue) {
-        // If there is an Attr node hooked to this attribute, the Attr::setValue() call below
-        // will write into the ElementData.
-        // FIXME: Refactor this so it makes some sense.
-        if (RefPtrWillBeRawPtr<Attr> attrNode = inSynchronizationOfLazyAttribute ? nullptr : attrIfExists(existingAttributeName))
-            attrNode->setValue(newValue);
-        else
-            ensureUniqueElementData().attributes().at(index).setValue(newValue);
-    }
-
+    if (newValue != existingAttributeValue)
+        ensureUniqueElementData().attributes().at(index).setValue(newValue);
     if (!inSynchronizationOfLazyAttribute)
         didModifyAttribute(existingAttributeName, newValue);
 }
 
 static inline AtomicString makeIdForStyleResolution(const AtomicString& value, bool inQuirksMode)
 {
     if (inQuirksMode)
         return value.lower();
     return value;
 }
@@ skipping 1563 matching lines @@
 {
     return document().getCachedLocale(computeInheritedLanguage());
 }
 
 void Element::cancelFocusAppearanceUpdate()
 {
     if (document().focusedElement() == this)
         document().cancelFocusAppearanceUpdate();
 }
 
-void Element::normalizeAttributes()
-{
-    if (!hasAttributes())
-        return;
-    AttrNodeList* attrNodes = attrNodeList();
-    if (!attrNodes)
-        return;
-    // Copy the Attr Vector because Node::normalize() can fire synchronous JS
-    // events (e.g. DOMSubtreeModified) and a JS listener could add / remove
-    // attributes while we are iterating.
-    AttrNodeList attrNodesCopy(*attrNodes);
-    for (size_t i = 0; i < attrNodesCopy.size(); ++i)
-        attrNodesCopy[i]->normalize();
-}
-
 void Element::updatePseudoElement(PseudoId pseudoId, StyleRecalcChange change)
 {
     ASSERT(!needsStyleRecalc());
     PseudoElement* element = pseudoElement(pseudoId);
 
     if (element && (change == UpdatePseudoElements || element->shouldCallRecalcStyle(change))) {
         if (pseudoId == FIRST_LETTER && updateFirstLetter(element))
             return;
 
         // Need to clear the cached style if the PseudoElement wants a recalc so it
@@ skipping 764 matching lines @@
 {
 #if ENABLE(OILPAN)
     if (hasRareData())
         visitor->trace(elementRareData());
     visitor->trace(m_elementData);
 #endif
     ContainerNode::trace(visitor);
 }
 
 } // namespace blink