Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixing bug 68493. document.body should point to the outermost frameset element in a frameset document. r=pollmann@netscape.com, sr=scc@mozilla.org

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@87753 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
jst%netscape.com
2001-02-23 02:01:30 +00:00
parent 1f709d7c7b
commit 2b8664ff14
1 changed files with 29 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
mozilla/content/html/document/src/nsHTMLDocument.cpp
View File

@@ -1842,10 +1842,36 @@ nsHTMLDocument::GetURL(nsAWritableString& aURL)
NS_IMETHODIMP
nsHTMLDocument::GetBody(nsIDOMHTMLElement** aBody)
{
if (mBodyContent == nsnull && PR_FALSE == GetBodyContent()) {
return NS_ERROR_FAILURE;
NS_ENSURE_ARG_POINTER(aBody);
*aBody = nsnull;
nsISupports* element = nsnull;
nsCOMPtr<nsIDOMNode> node;
if (mBodyContent || (GetBodyContent() && mBodyContent)) {
// There is a body element, return that as the body.
element = mBodyContent;
} else {
// The document is most likely a frameset document so look for the
// outer most frameset element
nsCOMPtr<nsIDOMNodeList> nodeList;
nsresult rv = GetElementsByTagName(NS_LITERAL_STRING("frameset"),
getter_AddRefs(nodeList));
if (NS_FAILED(rv))
return rv;
if (nodeList) {
rv = nodeList->Item(0, getter_AddRefs(node));
if (NS_FAILED(rv))
return rv;
element = node;
}
}
return mBodyContent->QueryInterface(NS_GET_IID(nsIDOMHTMLElement), (void **)aBody);
return element ? CallQueryInterface(element, aBody) : NS_OK;
}
NS_IMETHODIMP