Merge 115398

Source/WebCore/html/HTMLCollection.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2011, 2012 Apple Inc. All rights reserved.
  *
  * 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.
  *
@@ skipping 82 matching lines @@
 
     if (m_cache.version == docversion)
         return;
 
     m_cache.clear();
     m_cache.version = docversion;
 }
 
 inline bool HTMLCollection::isAcceptableElement(Element* element) const
 {
+    if (!element->isHTMLElement() && !(m_type == DocAll || m_type == NodeChildren))
+        return false;
+
     switch (m_type) {
     case DocImages:
         return element->hasLocalName(imgTag);
     case DocScripts:
         return element->hasLocalName(scriptTag);
     case DocForms:
         return element->hasLocalName(formTag);
     case TableTBodies:
         return element->hasLocalName(tbodyTag);
     case TRCells:
@@ skipping 26 matching lines @@
         return element->hasLocalName(objectTag);
     case DocLinks:
         return (element->hasLocalName(aTag) || element->hasLocalName(areaTag)) && element->fastHasAttribute(hrefAttr);
     case DocAnchors:
         return element->hasLocalName(aTag) && element->fastHasAttribute(nameAttr);
     case DocAll:
     case NodeChildren:
         return true;
 #if ENABLE(MICRODATA)
     case ItemProperties:
-        return element->isHTMLElement() && element->fastHasAttribute(itempropAttr);
+        return element->fastHasAttribute(itempropAttr);
 #endif
     case DocumentNamedItems:
     case OtherCollection:
     case WindowNamedItems:
         ASSERT_NOT_REACHED();
     }
     return false;
 }
 
 static Node* nextNodeOrSibling(Node* base, Node* node, bool includeChildren)
@@ skipping 199 matching lines @@
 
 void HTMLCollection::append(NodeCacheMap& map, const AtomicString& key, Element* element)
 {
     OwnPtr<Vector<Element*> >& vector = map.add(key.impl(), nullptr).first->second;
     if (!vector)
         vector = adoptPtr(new Vector<Element*>);
     vector->append(element);
 }
 
 } // namespace WebCore