mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-12-04 11:26:09 +00:00
Fixing logic goofup in my nsIContent::GetTag() deCOMtamination patch. r+sr=bzbarsky@mit.edu, a=dbaron@dbaron.org
This commit is contained in:
parent
12b93eb3b7
commit
b040a2500a
@ -501,8 +501,8 @@ nsXBLPrototypeBinding::AttributeChanged(nsIAtom* aAttribute,
|
|||||||
// xbl:text set on us.
|
// xbl:text set on us.
|
||||||
|
|
||||||
if (dstAttr == nsXBLAtoms::xbltext ||
|
if (dstAttr == nsXBLAtoms::xbltext ||
|
||||||
(realElement->Tag() == nsHTMLAtoms::html &&
|
realElement->GetNodeInfo()->Equals(nsHTMLAtoms::html,
|
||||||
realElement->IsContentOfType(nsIContent::eHTML)) &&
|
kNameSpaceID_XUL) &&
|
||||||
dstAttr == nsHTMLAtoms::value) {
|
dstAttr == nsHTMLAtoms::value) {
|
||||||
// Flush out all our kids.
|
// Flush out all our kids.
|
||||||
PRUint32 childCount = realElement->GetChildCount();
|
PRUint32 childCount = realElement->GetChildCount();
|
||||||
@ -898,8 +898,8 @@ PRBool PR_CALLBACK SetAttrs(nsHashKey* aKey, void* aData, void* aClosure)
|
|||||||
realElement->SetAttr(kNameSpaceID_None, dst, value, PR_FALSE);
|
realElement->SetAttr(kNameSpaceID_None, dst, value, PR_FALSE);
|
||||||
|
|
||||||
if (dst == nsXBLAtoms::xbltext ||
|
if (dst == nsXBLAtoms::xbltext ||
|
||||||
(realElement->Tag() == nsHTMLAtoms::html &&
|
(realElement->GetNodeInfo()->Equals(nsHTMLAtoms::html,
|
||||||
realElement->IsContentOfType(nsIContent::eHTML) &&
|
kNameSpaceID_XUL) &&
|
||||||
dst == nsHTMLAtoms::value && !value.IsEmpty())) {
|
dst == nsHTMLAtoms::value && !value.IsEmpty())) {
|
||||||
nsCOMPtr<nsIDOMText> textNode;
|
nsCOMPtr<nsIDOMText> textNode;
|
||||||
nsCOMPtr<nsIDOMDocument> domDoc =
|
nsCOMPtr<nsIDOMDocument> domDoc =
|
||||||
|
Loading…
Reference in New Issue
Block a user