Bug 155748 - "Can't use a global variable named 'parent'"

r=bzbarsky sr=jst
This commit is contained in:
caillon%returnzero.com 2002-07-08 06:51:54 +00:00
parent 64fd02fac7
commit 91f5178701
2 changed files with 5 additions and 0 deletions

View File

@ -796,6 +796,7 @@ PRBool nsDOMClassInfo::sIsInitialized = PR_FALSE;
JSString *nsDOMClassInfo::sTop_id = nsnull;
JSString *nsDOMClassInfo::sParent_id = nsnull;
JSString *nsDOMClassInfo::sScrollbars_id = nsnull;
JSString *nsDOMClassInfo::sLocation_id = nsnull;
JSString *nsDOMClassInfo::sComponents_id = nsnull;
@ -873,6 +874,7 @@ nsresult
nsDOMClassInfo::DefineStaticJSStrings(JSContext *cx)
{
sTop_id = ::JS_InternString(cx, "top");
sParent_id = ::JS_InternString(cx, "parent");
sScrollbars_id = ::JS_InternString(cx, "scrollbars");
sLocation_id = ::JS_InternString(cx, "location");
sComponents_id = ::JS_InternString(cx, "Components");
@ -2637,6 +2639,7 @@ nsDOMClassInfo::ShutDown()
#endif
sTop_id = jsnullstring;
sParent_id = jsnullstring;
sScrollbars_id = jsnullstring;
sLocation_id = jsnullstring;
sComponents_id = jsnullstring;

View File

@ -144,6 +144,7 @@ protected:
static inline PRBool IsReadonlyReplaceable(JSString *str)
{
return (str == sTop_id ||
str == sParent_id ||
str == sScrollbars_id ||
str == sContent_id ||
str == sSidebar_id ||
@ -182,6 +183,7 @@ protected:
static PRBool sIsInitialized;
static JSString *sTop_id;
static JSString *sParent_id;
static JSString *sScrollbars_id;
static JSString *sLocation_id;
static JSString *sComponents_id;