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

Fix .innerHTML regression (from the XIF converter update), and add a null document check.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@69789 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
jst%netscape.com
2000-05-15 14:07:36 +00:00
parent 6775ad1391
commit 63ee09a339
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mozilla/content/html/content/src/nsGenericHTMLElement.cpp
View File

@@ -794,6 +794,12 @@ nsGenericHTMLElement::GetOffsetParent(nsIDOMElement** aOffsetParent)
nsresult
nsGenericHTMLElement::GetInnerHTML(nsString& aInnerHTML)
{
aInnerHTML.Truncate();
if (!mDocument) {
return NS_OK; // We rely on the document for doing XIF conversion
}
nsCOMPtr<nsIDOMNode> thisNode(do_QueryInterface(mContent));
nsresult rv = NS_OK;
@@ -805,7 +811,7 @@ nsGenericHTMLElement::GetInnerHTML(nsString& aInnerHTML)
NS_GET_IID(nsIXIFConverter),
getter_AddRefs(xifc));
NS_ENSURE_TRUE(xifc,NS_ERROR_FAILURE);
xifc->Init(aInnerHTML);
xifc->Init(buf);
PRUint32 i, count = 0;
nsCOMPtr<nsIDOMNodeList> childNodes;

8
mozilla/layout/html/content/src/nsGenericHTMLElement.cpp
View File

@@ -794,6 +794,12 @@ nsGenericHTMLElement::GetOffsetParent(nsIDOMElement** aOffsetParent)
nsresult
nsGenericHTMLElement::GetInnerHTML(nsString& aInnerHTML)
{
aInnerHTML.Truncate();
if (!mDocument) {
return NS_OK; // We rely on the document for doing XIF conversion
}
nsCOMPtr<nsIDOMNode> thisNode(do_QueryInterface(mContent));
nsresult rv = NS_OK;
@@ -805,7 +811,7 @@ nsGenericHTMLElement::GetInnerHTML(nsString& aInnerHTML)
NS_GET_IID(nsIXIFConverter),
getter_AddRefs(xifc));
NS_ENSURE_TRUE(xifc,NS_ERROR_FAILURE);
xifc->Init(aInnerHTML);
xifc->Init(buf);
PRUint32 i, count = 0;
nsCOMPtr<nsIDOMNodeList> childNodes;