Merge webkit.org at r61121: Initial merge by git.

Change-Id: Icd6db395c62285be384d137164d95d7466c98760

1 files changed, 6 insertions, 6 deletions

diff --git a/WebCore/bindings/js/JSHTMLCollectionCustom.cpp b/WebCore/bindings/js/JSHTMLCollectionCustom.cpp
index 24059b7..b0cfd99 100644
--- a/WebCore/bindings/js/JSHTMLCollectionCustom.cpp
+++ b/WebCore/bindings/js/JSHTMLCollectionCustom.cpp
@@ -55,10 +55,10 @@ static JSValue getNamedItems(ExecState* exec, JSHTMLCollection* collection, cons
 
 // HTMLCollections are strange objects, they support both get and call,
 // so that document.forms.item(0) and document.forms(0) both work.
-static JSValue JSC_HOST_CALL callHTMLCollection(ExecState* exec)
+static EncodedJSValue JSC_HOST_CALL callHTMLCollection(ExecState* exec)
 {
     if (exec->argumentCount() < 1)
-        return jsUndefined();
+        return JSValue::encode(jsUndefined());
 
     // Do not use thisObj here. It can be the JSHTMLDocument, in the document.forms(i) case.
     JSHTMLCollection* jsCollection = static_cast<JSHTMLCollection*>(exec->callee());
@@ -72,10 +72,10 @@ static JSValue JSC_HOST_CALL callHTMLCollection(ExecState* exec)
         UString string = exec->argument(0).toString(exec);
         unsigned index = string.toUInt32(&ok, false);
         if (ok)
-            return toJS(exec, jsCollection->globalObject(), collection->item(index));
+            return JSValue::encode(toJS(exec, jsCollection->globalObject(), collection->item(index)));
 
         // Support for document.images('<name>') etc.
-        return getNamedItems(exec, jsCollection, Identifier(exec, string));
+        return JSValue::encode(getNamedItems(exec, jsCollection, Identifier(exec, string)));
     }
 
     // The second arg, if set, is the index of the item we want
@@ -87,13 +87,13 @@ static JSValue JSC_HOST_CALL callHTMLCollection(ExecState* exec)
         Node* node = collection->namedItem(pstr);
         while (node) {
             if (!index)
-                return toJS(exec, jsCollection->globalObject(), node);
+                return JSValue::encode(toJS(exec, jsCollection->globalObject(), node));
             node = collection->nextNamedItem(pstr);
             --index;
         }
     }
 
-    return jsUndefined();
+    return JSValue::encode(jsUndefined());
 }
 
 CallType JSHTMLCollection::getCallData(CallData& callData)