Remove a level of indirection in HTMLCollection.

third_party/WebKit/Source/core/html/HTMLCollection.h

 /*
  * 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.
  * Copyright (C) 2014 Samsung Electronics. 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
@@ skipping 104 matching lines @@
 
   DECLARE_VIRTUAL_TRACE();
 
  protected:
   HTMLCollection(ContainerNode& base, CollectionType, ItemAfterOverrideType);
 
   class NamedItemCache final : public GarbageCollected<NamedItemCache> {
    public:
     static NamedItemCache* create() { return new NamedItemCache; }
 
-    HeapVector<Member<Element>>* getElementsById(const AtomicString& id) const {
-      return m_idCache.at(id.impl());
+    const HeapVector<Member<Element>>* getElementsById(
+        const AtomicString& id) const {
+      auto it = m_idCache.find(id.impl());
+      if (it == m_idCache.end())
+        return nullptr;
+      return &it->value;
     }
-    HeapVector<Member<Element>>* getElementsByName(
+    const HeapVector<Member<Element>>* getElementsByName(
         const AtomicString& name) const {
-      return m_nameCache.at(name.impl());
+      auto it = m_nameCache.find(name.impl());
+      if (it == m_nameCache.end())
+        return nullptr;
+      return &it->value;
     }
     void addElementWithId(const AtomicString& id, Element* element) {
       addElementToMap(m_idCache, id, element);
     }
     void addElementWithName(const AtomicString& name, Element* element) {
       addElementToMap(m_nameCache, name, element);
     }
 
     DEFINE_INLINE_TRACE() {
       visitor->trace(m_idCache);
       visitor->trace(m_nameCache);
     }
 
    private:
     NamedItemCache();
-    typedef HeapHashMap<StringImpl*, Member<HeapVector<Member<Element>>>>
+    typedef HeapHashMap<StringImpl*, HeapVector<Member<Element>>>
         StringToElementsMap;
     static void addElementToMap(StringToElementsMap& map,
                                 const AtomicString& key,
                                 Element* element) {
-      Member<HeapVector<Member<Element>>>& vector =
-          map.insert(key.impl(), nullptr).storedValue->value;
-      if (!vector)
-        vector = new HeapVector<Member<Element>>;
-      vector->push_back(element);
+      HeapVector<Member<Element>>& vector =
+          map.insert(key.impl(), HeapVector<Member<Element>>())
+              .storedValue->value;
+      vector.push_back(element);
     }
 
     StringToElementsMap m_idCache;
     StringToElementsMap m_nameCache;
   };
 
   bool overridesItemAfter() const { return m_overridesItemAfter; }
   virtual Element* virtualItemAfter(Element*) const;
   bool shouldOnlyIncludeDirectChildren() const {
     return m_shouldOnlyIncludeDirectChildren;
@@ skipping 54 matching lines @@
   if (!attrName ||
       shouldInvalidateTypeOnAttributeChange(invalidationType(), *attrName))
     invalidateCache();
   else if (*attrName == HTMLNames::idAttr || *attrName == HTMLNames::nameAttr)
     invalidateIdNameCacheMaps();
 }
 
 }  // namespace blink
 
 #endif  // HTMLCollection_h