mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Fixing bug 110397. Making the read-write properties innerHeight, innerWidth, outerHeight, outerWidth, screenX, screenY, status, and name 'replaceable' by making assignment to these properties replace the real properties if the propery name is not fully qualified when doing the assignment. This is an attempt at fixing backwards compatibility problems where these properties are used a global variables (which worked in NS4x). r=peterv@netscape.com, rs=vidur@netscape.com, sr=brendan@mozilla.org

This commit is contained in:
jst%netscape.com 2001-11-18 06:45:10 +00:00
Родитель a7e995344b
Коммит 18f5fc256f
2 изменённых файлов: 69 добавлений и 17 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

50
dom/src/base/nsDOMClassInfo.cpp
Просмотреть файл

@ -689,6 +689,14 @@ JSString *nsDOMClassInfo::sStatusbar_id = nsnull;
JSString *nsDOMClassInfo::sDirectories_id = nsnull;
JSString *nsDOMClassInfo::sControllers_id = nsnull;
JSString *nsDOMClassInfo::sLength_id = nsnull;
JSString *nsDOMClassInfo::sInnerHeight_id = nsnull;
JSString *nsDOMClassInfo::sInnerWidth_id = nsnull;
JSString *nsDOMClassInfo::sOuterHeight_id = nsnull;
JSString *nsDOMClassInfo::sOuterWidth_id = nsnull;
JSString *nsDOMClassInfo::sScreenX_id = nsnull;
JSString *nsDOMClassInfo::sScreenY_id = nsnull;
JSString *nsDOMClassInfo::sStatus_id = nsnull;
JSString *nsDOMClassInfo::sName_id = nsnull;
JSString *nsDOMClassInfo::sOnmousedown_id = nsnull;
JSString *nsDOMClassInfo::sOnmouseup_id = nsnull;
JSString *nsDOMClassInfo::sOnclick_id = nsnull;
@ -736,6 +744,14 @@ nsDOMClassInfo::DefineStaticJSStrings(JSContext *cx)
sDirectories_id = ::JS_InternString(cx, "directories");
sControllers_id = ::JS_InternString(cx, "controllers");
sLength_id = ::JS_InternString(cx, "length");
sInnerHeight_id = ::JS_InternString(cx, "innerHeight");
sInnerWidth_id = ::JS_InternString(cx, "innerWidth");
sOuterHeight_id = ::JS_InternString(cx, "outerWidth");
sOuterWidth_id = ::JS_InternString(cx, "outerWidth");
sScreenX_id = ::JS_InternString(cx, "screenX");
sScreenY_id = ::JS_InternString(cx, "screenY");
sStatus_id = ::JS_InternString(cx, "status");
sName_id = ::JS_InternString(cx, "name");
sOnmousedown_id = ::JS_InternString(cx, "onmousedown");
sOnmouseup_id = ::JS_InternString(cx, "onmouseup");
sOnclick_id = ::JS_InternString(cx, "onclick");
@ -1886,7 +1902,7 @@ nsDOMClassInfo::PostCreate(nsIXPConnectWrappedNative *wrapper,
if (ci_data.mHasClassInterface) {
nsCOMPtr<nsIInterfaceInfoManager> iim =
dont_AddRef(XPTI_GetInterfaceInfoManager());
if (iim) {
nsCOMPtr<nsIInterfaceInfo> if_info;
iim->GetInfoForIID(ci_data.mProtoChainInterface,
@ -2158,6 +2174,14 @@ nsDOMClassInfo::ShutDown()
sDirectories_id = jsnullstring;
sControllers_id = jsnullstring;
sLength_id = jsnullstring;
sInnerHeight_id = jsnullstring;
sInnerWidth_id = jsnullstring;
sOuterHeight_id = jsnullstring;
sOuterWidth_id = jsnullstring;
sScreenX_id = jsnullstring;
sScreenY_id = jsnullstring;
sStatus_id = jsnullstring;
sName_id = jsnullstring;
sOnmousedown_id = jsnullstring;
sOnmouseup_id = jsnullstring;
sOnclick_id = jsnullstring;
@ -3043,7 +3067,7 @@ nsWindowSH::NewResolve(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
nsCAutoString("_content"),
0,
nsnull,
NS_LITERAL_STRING("return this.content;"),
NS_LITERAL_STRING("return this.content;"),
"",
0,
PR_FALSE,
@ -3083,20 +3107,12 @@ nsWindowSH::NewResolve(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
return NS_OK;
}
if (str == sTop_id ||
str == sScrollbars_id ||
str == sContent_id ||
str == sSidebar_id ||
str == sMenubar_id ||
str == sToolbar_id ||
str == sLocationbar_id ||
str == sPersonalbar_id ||
str == sStatusbar_id ||
str == sDirectories_id ||
str == sControllers_id ||
str == sLength_id) {
// A "replaceable" property is being set, define the property on
// obj with the value undefined.
if (IsReadonlyReplaceable(str) ||
(!(flags & JSRESOLVE_QUALIFIED) && IsWritableReplaceable(str))) {
// A readonly "replaceable" property is being set, or a
// readwrite "replaceable" property is being set w/o being
// fully qualified. Define the property on obj with the value
// undefined to override the predefined property.
*_retval = ::JS_DefineUCProperty(cx, obj, ::JS_GetStringChars(str),
::JS_GetStringLength(str),
@ -3855,7 +3871,7 @@ nsHTMLElementSH::ScrollIntoView(JSContext *cx, JSObject *obj, uintN argc,
}
rv = element->ScrollIntoView(top);
*rval = JSVAL_VOID;
return NS_SUCCEEDED(rv);

36
dom/src/base/nsDOMClassInfo.h
Просмотреть файл

@ -98,6 +98,34 @@ protected:
static PRInt32 GetArrayIndexFromId(JSContext *cx, jsval id,
PRBool *aIsNumber = nsnull);
static inline IsReadonlyReplaceable(JSString *str)
{
return (str == sTop_id ||
str == sScrollbars_id ||
str == sContent_id ||
str == sSidebar_id ||
str == sMenubar_id ||
str == sToolbar_id ||
str == sLocationbar_id ||
str == sPersonalbar_id ||
str == sStatusbar_id ||
str == sDirectories_id ||
str == sControllers_id ||
str == sLength_id);
}
static inline IsWritableReplaceable(JSString *str)
{
return (str == sInnerHeight_id ||
str == sInnerWidth_id ||
str == sOuterHeight_id ||
str == sOuterWidth_id ||
str == sScreenX_id ||
str == sScreenY_id ||
str == sStatus_id ||
str == sName_id);
}
static JSClass sDOMConstructorProtoClass;
static nsIXPConnect *sXPConnect;
@ -123,6 +151,14 @@ protected:
static JSString *sDirectories_id;
static JSString *sControllers_id;
static JSString *sLength_id;
static JSString *sInnerHeight_id;
static JSString *sInnerWidth_id;
static JSString *sOuterHeight_id;
static JSString *sOuterWidth_id;
static JSString *sScreenX_id;
static JSString *sScreenY_id;
static JSString *sStatus_id;
static JSString *sName_id;
static JSString *sOnmousedown_id;
static JSString *sOnmouseup_id;
static JSString *sOnclick_id;