Refactor adding and removing named and IDed elements

Source/core/dom/Element.h

Index: Source/core/dom/Element.h
diff --git a/Source/core/dom/Element.h b/Source/core/dom/Element.h
index 2672aeb1f73d56ad09841d9bd69310d8f6fcd68d..a31b16fa11e94bbd6756e53e2f9c26b961e6ebb0 100644
--- a/Source/core/dom/Element.h
+++ b/Source/core/dom/Element.h
@@ -49,6 +49,7 @@ class Element;
 class ElementRareData;
 class ElementShadow;
 class ExceptionState;
+class HTMLDocument;
 class Image;
 class InputMethodContext;
 class IntSize;
@@ -723,9 +724,12 @@ private:
     void synchronizeAttribute(const QualifiedName&) const;
     void synchronizeAttribute(const AtomicString& localName) const;
 
-    void updateId(const AtomicString& oldId, const AtomicString& newId);
-    void updateId(TreeScope*, const AtomicString& oldId, const AtomicString& newId);
     void updateName(const AtomicString& oldName, const AtomicString& newName);
+    void updateNameForTreeScope(TreeScope*, const AtomicString& oldName, const AtomicString& newName);
+    void updateNameForDocument(HTMLDocument*, const AtomicString& oldName, const AtomicString& newName);
+    void updateId(const AtomicString& oldId, const AtomicString& newId);
+    void updateIdForTreeScope(TreeScope*, const AtomicString& oldId, const AtomicString& newId);
+    void updateIdForDocument(HTMLDocument*, const AtomicString& oldId, const AtomicString& newId);
     void updateLabel(TreeScope*, const AtomicString& oldForAttributeValue, const AtomicString& newForAttributeValue);
 
     void scrollByUnits(int units, ScrollGranularity);