Merge 120979

Source/WebCore/dom/MicroDataItemList.cpp

 /*
  * Copyright (c) 2011 Motorola Mobility, 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:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 14 matching lines @@
 
 #include "config.h"
 
 #if ENABLE(MICRODATA)
 #include "MicroDataItemList.h"
 
 #include "DOMSettableTokenList.h"
 #include "Document.h"
 #include "HTMLElement.h"
 #include "HTMLNames.h"
+#include "NodeRareData.h"
 
 namespace WebCore {
 
 using namespace HTMLNames;
 
 MicroDataItemList::MicroDataItemList(PassRefPtr<Node> rootNode, const String& typeNames)
     : DynamicSubtreeNodeList(rootNode)
     , m_typeNames(typeNames, node()->document()->inQuirksMode())
     , m_originalTypeNames(typeNames)
 {
 }
 
 MicroDataItemList::~MicroDataItemList()
 {
-    rootNode()->document()->removeCachedMicroDataItemList(this, m_originalTypeNames);
+    String localTypeNames = m_originalTypeNames.isNull() ? String("http://webkit.org/microdata/undefinedItemType") : m_originalTypeNames;
+    m_node->nodeLists()->removeCacheWithName(this, DynamicNodeList::MicroDataItemListType, localTypeNames);
 }
 
 bool MicroDataItemList::nodeMatches(Element* testNode) const
 {
     if (!testNode->isHTMLElement())
         return false;
 
     HTMLElement* testElement = toHTMLElement(testNode);
     if (!testElement->fastHasAttribute(itemscopeAttr) || testElement->fastHasAttribute(itempropAttr))
         return false;
 
     if (!m_typeNames.size())
         return true;
 
     return testElement->itemType()->tokens().containsAll(m_typeNames);
 }
 
 } // namespace WebCore
 
 #endif // ENABLE(MICRODATA)