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

nsbeta2+ fix for 17169, cheking in ftang's patch

This commit is contained in:
av%netscape.com 2000-05-26 22:24:35 +00:00
Родитель da25677b5d
Коммит deabeb18c2
2 изменённых файлов: 28 добавлений и 0 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

14
layout/generic/nsObjectFrame.cpp
Просмотреть файл

@ -1529,6 +1529,8 @@ NS_IMETHODIMP nsPluginInstanceOwner::GetAttributes(PRUint16& n,
nsAutoString name; nsAutoString name;
atom->ToString(name); atom->ToString(name);
/* Changing to ToNewUTF8String addressing 17169, 39789
mAttrNames[mNumAttrs] = (char *)PR_Malloc(name.Length() + 1); mAttrNames[mNumAttrs] = (char *)PR_Malloc(name.Length() + 1);
mAttrVals[mNumAttrs] = (char *)PR_Malloc(value.Length() + 1); mAttrVals[mNumAttrs] = (char *)PR_Malloc(value.Length() + 1);
@ -1553,6 +1555,10 @@ NS_IMETHODIMP nsPluginInstanceOwner::GetAttributes(PRUint16& n,
mAttrVals[mNumAttrs] = nsnull; mAttrVals[mNumAttrs] = nsnull;
} }
} }
*/
mAttrNames[mNumAttrs] = name.ToNewUTF8String();
mAttrVals[mNumAttrs] = value.ToNewUTF8String();
mNumAttrs++;
} }
NS_RELEASE(atom); NS_RELEASE(atom);
} }
@ -1865,6 +1871,9 @@ NS_IMETHODIMP nsPluginInstanceOwner::GetParameters(PRUint16& n, const char*const
if ((NS_CONTENT_ATTR_HAS_VALUE == kid->GetAttribute(kNameSpaceID_HTML, nsHTMLAtoms::name, name)) && if ((NS_CONTENT_ATTR_HAS_VALUE == kid->GetAttribute(kNameSpaceID_HTML, nsHTMLAtoms::name, name)) &&
(NS_CONTENT_ATTR_HAS_VALUE == kid->GetAttribute(kNameSpaceID_HTML, nsHTMLAtoms::value, val))) (NS_CONTENT_ATTR_HAS_VALUE == kid->GetAttribute(kNameSpaceID_HTML, nsHTMLAtoms::value, val)))
{ {
/* Changing to ToNewUTF8String addressing 17169, 39789
mParamNames[mNumParams] = (char *)PR_Malloc(name.Length() + 1); mParamNames[mNumParams] = (char *)PR_Malloc(name.Length() + 1);
mParamVals[mNumParams] = (char *)PR_Malloc(val.Length() + 1); mParamVals[mNumParams] = (char *)PR_Malloc(val.Length() + 1);
@ -1890,6 +1899,10 @@ NS_IMETHODIMP nsPluginInstanceOwner::GetParameters(PRUint16& n, const char*const
mParamVals[mNumParams] = nsnull; mParamVals[mNumParams] = nsnull;
} }
} }
*/
mParamNames[mNumParams] = name.ToNewUTF8String();
mParamVals[mNumParams] = val.ToNewUTF8String();
mNumParams++;
} }
} }
@ -2389,6 +2402,7 @@ NS_IMETHODIMP nsPluginInstanceOwner::CreateWidget(void)
} }
else else
{ {
mWidget->Resize(mPluginWindow.width, mPluginWindow.height, PR_FALSE);
mPluginWindow.window = GetPluginPort(); mPluginWindow.window = GetPluginPort();
mPluginWindow.type = nsPluginWindowType_Window; mPluginWindow.type = nsPluginWindowType_Window;

14
layout/html/base/src/nsObjectFrame.cpp
Просмотреть файл

@ -1529,6 +1529,8 @@ NS_IMETHODIMP nsPluginInstanceOwner::GetAttributes(PRUint16& n,
nsAutoString name; nsAutoString name;
atom->ToString(name); atom->ToString(name);
/* Changing to ToNewUTF8String addressing 17169, 39789
mAttrNames[mNumAttrs] = (char *)PR_Malloc(name.Length() + 1); mAttrNames[mNumAttrs] = (char *)PR_Malloc(name.Length() + 1);
mAttrVals[mNumAttrs] = (char *)PR_Malloc(value.Length() + 1); mAttrVals[mNumAttrs] = (char *)PR_Malloc(value.Length() + 1);
@ -1553,6 +1555,10 @@ NS_IMETHODIMP nsPluginInstanceOwner::GetAttributes(PRUint16& n,
mAttrVals[mNumAttrs] = nsnull; mAttrVals[mNumAttrs] = nsnull;
} }
} }
*/
mAttrNames[mNumAttrs] = name.ToNewUTF8String();
mAttrVals[mNumAttrs] = value.ToNewUTF8String();
mNumAttrs++;
} }
NS_RELEASE(atom); NS_RELEASE(atom);
} }
@ -1865,6 +1871,9 @@ NS_IMETHODIMP nsPluginInstanceOwner::GetParameters(PRUint16& n, const char*const
if ((NS_CONTENT_ATTR_HAS_VALUE == kid->GetAttribute(kNameSpaceID_HTML, nsHTMLAtoms::name, name)) && if ((NS_CONTENT_ATTR_HAS_VALUE == kid->GetAttribute(kNameSpaceID_HTML, nsHTMLAtoms::name, name)) &&
(NS_CONTENT_ATTR_HAS_VALUE == kid->GetAttribute(kNameSpaceID_HTML, nsHTMLAtoms::value, val))) (NS_CONTENT_ATTR_HAS_VALUE == kid->GetAttribute(kNameSpaceID_HTML, nsHTMLAtoms::value, val)))
{ {
/* Changing to ToNewUTF8String addressing 17169, 39789
mParamNames[mNumParams] = (char *)PR_Malloc(name.Length() + 1); mParamNames[mNumParams] = (char *)PR_Malloc(name.Length() + 1);
mParamVals[mNumParams] = (char *)PR_Malloc(val.Length() + 1); mParamVals[mNumParams] = (char *)PR_Malloc(val.Length() + 1);
@ -1890,6 +1899,10 @@ NS_IMETHODIMP nsPluginInstanceOwner::GetParameters(PRUint16& n, const char*const
mParamVals[mNumParams] = nsnull; mParamVals[mNumParams] = nsnull;
} }
} }
*/
mParamNames[mNumParams] = name.ToNewUTF8String();
mParamVals[mNumParams] = val.ToNewUTF8String();
mNumParams++;
} }
} }
@ -2389,6 +2402,7 @@ NS_IMETHODIMP nsPluginInstanceOwner::CreateWidget(void)
} }
else else
{ {
mWidget->Resize(mPluginWindow.width, mPluginWindow.height, PR_FALSE);
mPluginWindow.window = GetPluginPort(); mPluginWindow.window = GetPluginPort();
mPluginWindow.type = nsPluginWindowType_Window; mPluginWindow.type = nsPluginWindowType_Window;