From 5ef7074e9b65172626c86caa9dd5ec0fc1f08102 Mon Sep 17 00:00:00 2001
From: Peter Van der Beken <peterv@propagandism.org>
Date: Tue, 14 Jun 2011 10:41:14 +0200
Subject: [PATCH] Bug 648801 (new DOM list bindings) - Return named items in
 more places (get[Own]PropertyDescriptor/hasOwn). r=bz/jst/mrbkap.

--HG--
extra : rebase_source : 7c8d1275b1e794cf28699e7dbbad0d110e9532e0
---
 js/src/xpconnect/src/dombindings.cpp | 44 +++++++++++++++++++++++++++-
 js/src/xpconnect/src/dombindings.h   |  2 ++
 2 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/js/src/xpconnect/src/dombindings.cpp b/js/src/xpconnect/src/dombindings.cpp
index 0fb54b2ed7d..501973463cb 100644
--- a/js/src/xpconnect/src/dombindings.cpp
+++ b/js/src/xpconnect/src/dombindings.cpp
@@ -196,6 +196,21 @@ NodeList<T>::length_getter(JSContext *cx, JSObject *obj, jsid id, Value *vp)
     return true;
 }
 
+template<>
+nsISupports*
+NodeList<nsINodeList>::getNamedItem(nsINodeList *list, const nsAString& aName,
+                                    nsWrapperCache **aCache)
+{
+    return NULL;
+}
+template<>
+nsISupports*
+NodeList<nsIHTMLCollection>::getNamedItem(nsIHTMLCollection *list, const nsAString& aName,
+                                          nsWrapperCache **aCache)
+{
+    return list->GetNamedItem(aName, aCache);
+}
+
 template<class T>
 JSBool
 NodeList<T>::item(JSContext *cx, uintN argc, jsval *vp)
@@ -227,7 +242,7 @@ NodeList<nsIHTMLCollection>::namedItem(JSContext *cx, JSObject *obj, jsval *name
         return JS_FALSE;
     nsIHTMLCollection *collection = getNodeList(obj);
     nsWrapperCache *cache;
-    nsISupports *result = collection->GetNamedItem(nameString, &cache);
+    nsISupports *result = getNamedItem(collection, nameString, &cache);
     if (!result) {
         *vp = JSVAL_NULL;
         return JS_TRUE;
@@ -373,6 +388,19 @@ NodeList<T>::getOwnPropertyDescriptor(JSContext *cx, JSObject *proxy, jsid id, b
             return true;
         }
     }
+
+    bool ok;
+    Value v;
+    if (namedItem(cx, proxy, id, &v, &ok)) {
+        desc->obj = proxy;
+        desc->value = v;
+        desc->attrs = JSPROP_READONLY | JSPROP_ENUMERATE;
+        desc->getter = NULL;
+        desc->setter = NULL;
+        desc->shortid = 0;
+        return ok;
+    }
+
     desc->obj = NULL;
     return true;
 }
@@ -456,6 +484,7 @@ NodeList<T>::getOwnPropertyNames(JSContext *cx, JSObject *proxy, AutoIdVector &p
         if (!props.append(INT_TO_JSID(i)))
             return false;
     }
+    // FIXME: Add named items?
     return true;
 }
 
@@ -515,6 +544,19 @@ NodeList<T>::hasOwn(JSContext *cx, JSObject *proxy, jsid id, bool *bp)
             return true;
         }
     }
+
+    if (JSID_IS_STRING(id)) {
+        jsval v = STRING_TO_JSVAL(JSID_TO_STRING(id));
+        xpc_qsDOMString nameString(cx, v, &v,
+                                   xpc_qsDOMString::eDefaultNullBehavior,
+                                   xpc_qsDOMString::eDefaultUndefinedBehavior);
+        nsWrapperCache *cache;
+        if (getNamedItem(getNodeList(proxy), nameString, &cache)) {
+            *bp = true;
+            return true;
+        }
+    }
+
     *bp = false;
     return true;
 }
diff --git a/js/src/xpconnect/src/dombindings.h b/js/src/xpconnect/src/dombindings.h
index 799299b5782..6b0029d9b88 100644
--- a/js/src/xpconnect/src/dombindings.h
+++ b/js/src/xpconnect/src/dombindings.h
@@ -95,6 +95,8 @@ class NodeList : public NodeListBase {
     static JSBool namedItem(JSContext *cx, JSObject *obj, jsval *name, jsval *vp);
     static bool namedItem(JSContext *cx, JSObject *proxy, jsid id, js::Value *vp, bool *result);
 
+    static nsISupports *getNamedItem(T *list, const nsAString& aName, nsWrapperCache **aCache);
+
     static bool cacheProtoShape(JSContext *cx, JSObject *proxy, JSObject *proto);
     static bool checkForCacheHit(JSContext *cx, JSObject *proxy, JSObject *receiver, JSObject *proto,
                                  jsid id, js::Value *vp, bool *hitp);