Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixing bug 123078. Making document.<n> === document['<n>'] for backwards compatibility reasons. r=peterv@netscape.com, sr=rpotts@netscape.com

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@113689 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
jst%netscape.com 2002-02-05 06:44:04 +00:00
parent 5190a48a4e
commit a9d86459c5
2 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
mozilla/dom/src/base/nsDOMClassInfo.cpp
View File

@ -4214,7 +4214,8 @@ nsDocumentSH::SetProperty(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
// static
nsresult
nsHTMLDocumentSH::ResolveImpl(nsIXPConnectWrappedNative *wrapper, jsval id,
nsHTMLDocumentSH::ResolveImpl(JSContext *cx,
nsIXPConnectWrappedNative *wrapper, jsval id,
nsISupports **result)
{
nsCOMPtr<nsISupports> native;
@ -4225,7 +4226,10 @@ nsHTMLDocumentSH::ResolveImpl(nsIXPConnectWrappedNative *wrapper, jsval id,
nsCOMPtr<nsIHTMLDocument> doc(do_QueryInterface(native));
NS_ENSURE_TRUE(doc, NS_ERROR_UNEXPECTED);
JSString *str = JSVAL_TO_STRING(id);
// 'id' is not always a string, it can be a number since document.1
// should map to <input name="1">. Thus we can't use
// JSVAL_TO_STRING() here.
JSString *str = JS_ValueToString(cx, id);
const nsDependentString name(NS_REINTERPRET_CAST(const PRUnichar *,
::JS_GetStringChars(str)),
@ -4278,14 +4282,14 @@ nsHTMLDocumentSH::NewResolve(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
JSObject *obj, jsval id, PRUint32 flags,
JSObject **objp, PRBool *_retval)
{
if (!(flags & JSRESOLVE_ASSIGNING) && JSVAL_IS_STRING(id)) {
if (!(flags & JSRESOLVE_ASSIGNING)) {
nsCOMPtr<nsISupports> result;
nsresult rv = ResolveImpl(wrapper, id, getter_AddRefs(result));
nsresult rv = ResolveImpl(cx, wrapper, id, getter_AddRefs(result));
NS_ENSURE_SUCCESS(rv, rv);
if (result) {
JSString *str = JSVAL_TO_STRING(id);
JSString *str = JS_ValueToString(cx, id);
JSBool ok = *_retval =
::JS_DefineUCProperty(cx, obj, ::JS_GetStringChars(str),
@ -4315,16 +4319,14 @@ nsHTMLDocumentSH::GetProperty(nsIXPConnectWrappedNative *wrapper,
JSContext *cx, JSObject *obj, jsval id,
jsval *vp, PRBool *_retval)
{
if (JSVAL_IS_STRING(id)) {
nsCOMPtr<nsISupports> result;
nsCOMPtr<nsISupports> result;
nsresult rv = ResolveImpl(wrapper, id, getter_AddRefs(result));
NS_ENSURE_SUCCESS(rv, rv);
nsresult rv = ResolveImpl(cx, wrapper, id, getter_AddRefs(result));
NS_ENSURE_SUCCESS(rv, rv);
if (result) {
return WrapNative(cx, ::JS_GetGlobalObject(cx), result,
NS_GET_IID(nsISupports), vp);
}
if (result) {
return WrapNative(cx, ::JS_GetGlobalObject(cx), result,
NS_GET_IID(nsISupports), vp);
}
return NS_OK;

13
mozilla/dom/src/base/nsDOMClassInfo.h
View File

@ -508,10 +508,12 @@ protected:
{
}
static nsresult ResolveImpl(nsIXPConnectWrappedNative *wrapper, jsval id,
static nsresult ResolveImpl(JSContext *cx,
nsIXPConnectWrappedNative *wrapper, jsval id,
nsISupports **result);
static JSBool JS_DLL_CALLBACK DocumentOpen(JSContext *cx, JSObject *obj, uintN argc,
jsval *argv, jsval *rval);
static JSBool JS_DLL_CALLBACK DocumentOpen(JSContext *cx, JSObject *obj,
uintN argc, jsval *argv,
jsval *rval);
public:
NS_IMETHOD NewResolve(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
@ -540,8 +542,9 @@ protected:
{
}
static JSBool JS_DLL_CALLBACK ScrollIntoView(JSContext *cx, JSObject *obj, uintN argc,
jsval *argv, jsval *rval);
static JSBool JS_DLL_CALLBACK ScrollIntoView(JSContext *cx, JSObject *obj,
uintN argc, jsval *argv,
jsval *rval);
public:
NS_IMETHOD NewResolve(nsIXPConnectWrappedNative *wrapper, JSContext *cx,