HTMLCollection should not inherit NodeList

Source/core/dom/LiveNodeList.h

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2004, 2006, 2007 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 23 matching lines @@
 namespace WebCore {
 
 class Element;
 
 enum NodeListRootType {
     NodeListIsRootedAtNode,
     NodeListIsRootedAtDocument,
     NodeListIsRootedAtDocumentIfOwnerHasItemrefAttr,
 };
 
-class LiveNodeListBase : public NodeList {
+class LiveNodeListBase {
 public:
     enum ItemAfterOverrideType {
         OverridesItemAfter,
         DoesNotOverrideItemAfter,
     };
 
     LiveNodeListBase(Node* ownerNode, NodeListRootType rootType, NodeListInvalidationType invalidationType,
         bool shouldOnlyIncludeDirectChildren, CollectionType collectionType, ItemAfterOverrideType itemAfterOverrideType)
         : m_ownerNode(ownerNode)
         , m_cachedItem(0)
@@ skipping 15 matching lines @@
         if (collectionType != ChildNodeListType)
             document().registerNodeList(this);
     }
 
     virtual ~LiveNodeListBase()
     {
         if (type() != ChildNodeListType)
             document().unregisterNodeList(this);
     }
 
-    // DOM API
-    virtual unsigned length() const OVERRIDE;
-    virtual Node* item(unsigned offset) const OVERRIDE;
+    unsigned length() const;
+    Node* item(unsigned offset) const;
 
     ALWAYS_INLINE bool hasIdNameCache() const { return !isNodeList(type()); }
     ALWAYS_INLINE bool isRootedAtDocument() const { return m_rootType == NodeListIsRootedAtDocument || m_rootType == NodeListIsRootedAtDocumentIfOwnerHasItemrefAttr; }
     ALWAYS_INLINE NodeListInvalidationType invalidationType() const { return static_cast<NodeListInvalidationType>(m_invalidationType); }
     ALWAYS_INLINE CollectionType type() const { return static_cast<CollectionType>(m_collectionType); }
     Node* ownerNode() const { return m_ownerNode.get(); }
     ALWAYS_INLINE void invalidateCache(const QualifiedName* attrName) const
     {
         if (!attrName || shouldInvalidateTypeOnAttributeChange(invalidationType(), *attrName))
             invalidateCache();
@@ skipping 86 matching lines @@
         return attrName == HTMLNames::hrefAttr;
     case InvalidateOnItemAttrChange:
     case DoNotInvalidateOnAttributeChanges:
         return false;
     case InvalidateOnAnyAttrChange:
         return true;
     }
     return false;
 }
 
-class LiveNodeList : public LiveNodeListBase {
+class LiveNodeList : public NodeList, public LiveNodeListBase {
 public:
     LiveNodeList(PassRefPtr<Node> ownerNode, CollectionType collectionType, NodeListInvalidationType invalidationType, NodeListRootType rootType = NodeListIsRootedAtNode)
         : LiveNodeListBase(ownerNode.get(), rootType, invalidationType, collectionType == ChildNodeListType,
         collectionType, DoesNotOverrideItemAfter)
     { }
 
-    virtual Node* namedItem(const AtomicString&) const OVERRIDE;
+    virtual unsigned length() const OVERRIDE FINAL { return LiveNodeListBase::length(); }
+    virtual Node* item(unsigned offset) const OVERRIDE FINAL { return LiveNodeListBase::item(offset); }
+    virtual Node* namedItem(const AtomicString&) const OVERRIDE FINAL;
     virtual bool nodeMatches(Element*) const = 0;
 
 private:
-    virtual bool isLiveNodeList() const OVERRIDE { return true; }
+    virtual bool isLiveNodeList() const OVERRIDE FINAL { return true; }
 };
 
 } // namespace WebCore
 
 #endif // LiveNodeList_h