Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-03-05 08:09:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixing a cloneNode() regression in the HTML code, doing a deep clone on a element that didn't have a style attribute was failing to clone it's chil nodes. r=pollmann@netscape.com

Browse Source
This commit is contained in:
jst%netscape.com 2000-09-06 05:03:34 +00:00
parent ad5e1c0d3c
commit 4e563c4a15
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
content/html/content/src/nsGenericHTMLElement.cpp
View File

@ -425,9 +425,9 @@ nsGenericHTMLElement::CopyInnerTo(nsIContent* aSrcContent,
if (NS_SUCCEEDED(result)) {
nsHTMLValue val;
result = aDst->GetHTMLAttribute(nsHTMLAtoms::style, val);
nsresult rv = aDst->GetHTMLAttribute(nsHTMLAtoms::style, val);
if (result == NS_CONTENT_ATTR_HAS_VALUE &&
if (rv == NS_CONTENT_ATTR_HAS_VALUE &&
val.GetUnit() == eHTMLUnit_ISupports) {
nsCOMPtr<nsISupports> supports(dont_AddRef(val.GetISupportsValue()));
nsCOMPtr<nsICSSStyleRule> rule(do_QueryInterface(supports));
@ -3265,7 +3265,7 @@ nsGenericHTMLContainerElement::CopyInnerTo(nsIContent* aSrcContent,
nsresult result = nsGenericHTMLElement::CopyInnerTo(aSrcContent,
aDst,
aDeep);
if (NS_OK != result) {
if (NS_FAILED(result)) {
return result;
}

6
layout/html/content/src/nsGenericHTMLElement.cpp
View File

@ -425,9 +425,9 @@ nsGenericHTMLElement::CopyInnerTo(nsIContent* aSrcContent,
if (NS_SUCCEEDED(result)) {
nsHTMLValue val;
result = aDst->GetHTMLAttribute(nsHTMLAtoms::style, val);
nsresult rv = aDst->GetHTMLAttribute(nsHTMLAtoms::style, val);
if (result == NS_CONTENT_ATTR_HAS_VALUE &&
if (rv == NS_CONTENT_ATTR_HAS_VALUE &&
val.GetUnit() == eHTMLUnit_ISupports) {
nsCOMPtr<nsISupports> supports(dont_AddRef(val.GetISupportsValue()));
nsCOMPtr<nsICSSStyleRule> rule(do_QueryInterface(supports));
@ -3265,7 +3265,7 @@ nsGenericHTMLContainerElement::CopyInnerTo(nsIContent* aSrcContent,
nsresult result = nsGenericHTMLElement::CopyInnerTo(aSrcContent,
aDst,
aDeep);
if (NS_OK != result) {
if (NS_FAILED(result)) {
return result;
}