Have getElementsByClassName() / getElementsByTagName*() return an HTMLCollection

Source/web/WebNodeList.cpp

Index: Source/web/WebNodeList.cpp
diff --git a/Source/web/WebNodeList.cpp b/Source/web/WebNodeList.cpp
index 3a162831a1aeb4101f19fd5f96bd01d52e812581..83519509fbbf42b5b03cab605805f0ed88c0009c 100644
--- a/Source/web/WebNodeList.cpp
+++ b/Source/web/WebNodeList.cpp
@@ -31,8 +31,10 @@
 #include "config.h"
 #include "WebNodeList.h"
 
+#include "core/dom/Element.h"
 #include "core/dom/Node.h"
 #include "core/dom/NodeList.h"
+#include "core/html/HTMLCollection.h"
 #include "wtf/PassRefPtr.h"
 
 #include "WebNode.h"
@@ -41,6 +43,37 @@ using namespace WebCore;
 
 namespace blink {
 
+// FIXME(crbug.com/235008): Remove once chromium has been updated to stop using
+// WebCollection as a WebNodeList.
+class NodeListWithInternalCollection FINAL : public NodeList {
+public:
+    static PassRefPtr<NodeListWithInternalCollection> create(HTMLCollection* collection)
+    {
+        return adoptRef(new NodeListWithInternalCollection(collection));
+    }
+
+    // We have null checks in the following methods because WebNodeList does not have a isNull() method
+    // and callers need to be moved to WebNodeCollection and need to handle null using
+    // WebNodeCollection::isNull().
+    virtual unsigned length() const OVERRIDE { return m_collection ? m_collection->length() : 0; }
+    virtual Node* item(unsigned index) const OVERRIDE { return m_collection ? m_collection->item(index) : 0; }
+    virtual Node* namedItem(const AtomicString& elementId) const OVERRIDE { return m_collection ? m_collection->namedItem(elementId) : 0; }
+
+private:
+    explicit NodeListWithInternalCollection(HTMLCollection* collection)
+        : m_collection(collection)
+    {
+    }
+
+    RefPtr<HTMLCollection> m_collection;
+};
+
+WebNodeList::WebNodeList(const WebNodeCollection& n)
+    : m_private(0)
+{
+    assign(NodeListWithInternalCollection::create(n.m_private).leakRef());
+}
+
 void WebNodeList::reset()
 {
     assign(0);