Code drop from //branches/cupcake/...@124589

1 files changed, 7 insertions, 10 deletions

diff --git a/WebCore/dom/ChildNodeList.cpp b/WebCore/dom/ChildNodeList.cpp
index 4befe40..3328c7c 100644
--- a/WebCore/dom/ChildNodeList.cpp
+++ b/WebCore/dom/ChildNodeList.cpp
@@ -2,7 +2,7 @@
  * 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, 2007 Apple Inc. All rights reserved.
+ * Copyright (C) 2004, 2007, 2008 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
@@ -23,12 +23,12 @@
 #include "config.h"
 #include "ChildNodeList.h"
 
-#include "Node.h"
+#include "Element.h"
 
 namespace WebCore {
 
 ChildNodeList::ChildNodeList(PassRefPtr<Node> rootNode, DynamicNodeList::Caches* info)
-    : DynamicNodeList(rootNode, info, false)
+    : DynamicNodeList(rootNode, info)
 {
 }
 
@@ -98,15 +98,12 @@ Node* ChildNodeList::item(unsigned index) const
     return 0;
 }
 
-bool ChildNodeList::nodeMatches(Node* testNode) const
+bool ChildNodeList::nodeMatches(Element* testNode) const
 {
+    // Note: Due to the overrides of the length and item functions above,
+    // this function will be called only by DynamicNodeList::itemWithName,
+    // for an element that was located with getElementById.
     return testNode->parentNode() == m_rootNode;
 }
 
-void ChildNodeList::rootNodeChildrenChanged()
-{
-    // For child node lists, the common cache is reset in Node::notifyLocalNodeListsChildrenChanged()
-    ASSERT(!m_ownsCaches);
-}
-
 } // namespace WebCore