Merge 140103

Source/WebCore/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 151 matching lines @@
     {
         return adoptPtr(new NodeListsNodeData);
     }
 
     void invalidateCaches(const QualifiedName* attrName = 0);
     bool isEmpty() const
     {
         return m_atomicNameCaches.isEmpty() && m_nameCaches.isEmpty() && m_tagNodeListCacheNS.isEmpty();
     }
 
-    void adoptTreeScope(Document* oldDocument, Document* newDocument)
+    void adoptTreeScope()
+    {
+        invalidateCaches();
+    }
+
+    void adoptDocument(Document* oldDocument, Document* newDocument)
     {
         invalidateCaches();
 
         if (oldDocument != newDocument) {
             NodeListAtomicNameCacheMap::const_iterator atomicNameCacheEnd = m_atomicNameCaches.end();
             for (NodeListAtomicNameCacheMap::const_iterator it = m_atomicNameCaches.begin(); it != atomicNameCacheEnd; ++it) {
                 LiveNodeListBase* list = it->value;
                 oldDocument->unregisterNodeList(list);
                 newDocument->registerNodeList(list);
             }
@@ skipping 216 matching lines @@
 #endif
 
 #if ENABLE(MICRODATA)
     mutable OwnPtr<NodeMicroDataTokenLists> m_microDataTokenLists;
 #endif
 };
 
 } // namespace WebCore
 
 #endif // NodeRareData_h