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

r=bzbarsky sr=jst a=asa

dom/src/base/nsDOMClassInfo.cpp

@@ -830,6 +830,7 @@ PRBool nsDOMClassInfo::sIsInitialized = PR_FALSE;
 
 
 jsval nsDOMClassInfo::sTop_id             = JSVAL_VOID;
+jsval nsDOMClassInfo::sParent_id          = JSVAL_VOID;
 jsval nsDOMClassInfo::sScrollbars_id      = JSVAL_VOID;
 jsval nsDOMClassInfo::sLocation_id        = JSVAL_VOID;
 jsval nsDOMClassInfo::sComponents_id      = JSVAL_VOID;
@@ -931,6 +932,7 @@ nsDOMClassInfo::DefineStaticJSVals(JSContext *cx)
   }
 
   SET_JSVAL_TO_STRING(sTop_id,             cx, "top");
+  SET_JSVAL_TO_STRING(sParent_id,          cx, "parent");
   SET_JSVAL_TO_STRING(sScrollbars_id,      cx, "scrollbars");
   SET_JSVAL_TO_STRING(sLocation_id,        cx, "location");
   SET_JSVAL_TO_STRING(sComponents_id,      cx, "Components");
@@ -2767,6 +2769,7 @@ nsDOMClassInfo::ShutDown()
   }
 
   sTop_id             = JSVAL_VOID;
+  sParent_id          = JSVAL_VOID;
   sScrollbars_id      = JSVAL_VOID;
   sLocation_id        = JSVAL_VOID;
   sComponents_id      = JSVAL_VOID;

dom/src/base/nsDOMClassInfo.h

@@ -151,6 +151,7 @@ protected:
   static inline PRBool IsReadonlyReplaceable(jsval id)
   {
     return (id == sTop_id          ||
+            id == sParent_id       ||
             id == sScrollbars_id   ||
             id == sContent_id      ||
             id == sSidebar_id      ||
@@ -198,6 +199,7 @@ protected:
   static PRBool sIsInitialized;
 
   static jsval sTop_id;
+  static jsval sParent_id;
   static jsval sScrollbars_id;
   static jsval sLocation_id;
   static jsval sComponents_id;