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

Fix Bug 3878: Get the form element from our containing select element. 

Also, remove a spurioius NS_RELEASE that was causing crashes in GetSelected()
This commit is contained in:
pollmann%netscape.com 1999-04-27 19:58:15 +00:00
Родитель a313581a3f
Коммит d1d123adba
2 изменённых файлов: 22 добавлений и 28 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

25
content/html/content/src/nsHTMLOptionElement.cpp
Просмотреть файл

@ -103,7 +103,6 @@ public:
protected:
nsGenericHTMLContainerElement mInner;
nsIForm* mForm;
// Get the primary frame associated with this content
nsresult GetPrimaryFrame(nsIFormControlFrame *&aFormControlFrame);
@ -130,14 +129,10 @@ nsHTMLOptionElement::nsHTMLOptionElement(nsIAtom* aTag)
{
NS_INIT_REFCNT();
mInner.Init(this, aTag);
mForm = nsnull;
}
nsHTMLOptionElement::~nsHTMLOptionElement()
{
if (mForm) {
NS_RELEASE(mForm);
}
}
// ISupports
@ -188,16 +183,19 @@ nsHTMLOptionElement::CloneNode(PRBool aDeep, nsIDOMNode** aReturn)
NS_IMETHODIMP
nsHTMLOptionElement::GetForm(nsIDOMHTMLFormElement** aForm)
{
nsresult result = NS_OK;
*aForm = nsnull;
if (nsnull != mForm) {
nsIDOMHTMLFormElement* formElem = nsnull;
result = mForm->QueryInterface(kIDOMHTMLFormElementIID, (void**)&formElem);
if (NS_OK == result) {
*aForm = formElem;
nsIDOMHTMLSelectElement* selectElement = nsnull;
nsresult res = GetSelect(selectElement);
if (NS_OK == res) {
nsIFormControl* selectControl = nsnull;
res = selectElement->QueryInterface(kIFormControlIID, (void**)&selectControl);
NS_RELEASE(selectElement);
if (NS_OK == res) {
res = selectControl->GetForm(aForm);
NS_RELEASE(selectControl);
}
}
return result;
return res;
}
NS_IMETHODIMP
@ -216,7 +214,6 @@ nsHTMLOptionElement::GetSelected(PRBool* aValue)
else
*aValue = PR_FALSE;
}
NS_RELEASE(formControlFrame);
}
return rv;
}

25
layout/html/content/src/nsHTMLOptionElement.cpp
Просмотреть файл

@ -103,7 +103,6 @@ public:
protected:
nsGenericHTMLContainerElement mInner;
nsIForm* mForm;
// Get the primary frame associated with this content
nsresult GetPrimaryFrame(nsIFormControlFrame *&aFormControlFrame);
@ -130,14 +129,10 @@ nsHTMLOptionElement::nsHTMLOptionElement(nsIAtom* aTag)
{
NS_INIT_REFCNT();
mInner.Init(this, aTag);
mForm = nsnull;
}
nsHTMLOptionElement::~nsHTMLOptionElement()
{
if (mForm) {
NS_RELEASE(mForm);
}
}
// ISupports
@ -188,16 +183,19 @@ nsHTMLOptionElement::CloneNode(PRBool aDeep, nsIDOMNode** aReturn)
NS_IMETHODIMP
nsHTMLOptionElement::GetForm(nsIDOMHTMLFormElement** aForm)
{
nsresult result = NS_OK;
*aForm = nsnull;
if (nsnull != mForm) {
nsIDOMHTMLFormElement* formElem = nsnull;
result = mForm->QueryInterface(kIDOMHTMLFormElementIID, (void**)&formElem);
if (NS_OK == result) {
*aForm = formElem;
nsIDOMHTMLSelectElement* selectElement = nsnull;
nsresult res = GetSelect(selectElement);
if (NS_OK == res) {
nsIFormControl* selectControl = nsnull;
res = selectElement->QueryInterface(kIFormControlIID, (void**)&selectControl);
NS_RELEASE(selectElement);
if (NS_OK == res) {
res = selectControl->GetForm(aForm);
NS_RELEASE(selectControl);
}
}
return result;
return res;
}
NS_IMETHODIMP
@ -216,7 +214,6 @@ nsHTMLOptionElement::GetSelected(PRBool* aValue)
else
*aValue = PR_FALSE;
}
NS_RELEASE(formControlFrame);
}
return rv;
}