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

Backing out bug 275196, xml:id, to fix tp regression

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@231054 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
Olli.Pettay%helsinki.fi
2007-07-26 14:16:21 +00:00
parent cd72164fbb
commit bd9a96d5b9
28 changed files with 114 additions and 397 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1493,21 +1493,9 @@ nsGenericHTMLElement::GetClasses() const
}
nsIAtom *
nsGenericHTMLElement::GetIDAttributeName(PRInt32& aNameSpaceID) const
nsGenericHTMLElement::GetIDAttributeName() const
{
if (HasAttr(kNameSpaceID_None, nsGkAtoms::id)) {
aNameSpaceID = kNameSpaceID_None;
return nsGkAtoms::id;
}
return nsGenericElement::GetIDAttributeName(aNameSpaceID);
}
PRBool
nsGenericHTMLElement::IsPotentialIDAttributeName(PRInt32 aNameSpaceID,
nsIAtom* aAtom) const
{
return (aNameSpaceID == kNameSpaceID_None && aAtom == nsGkAtoms::id) ||
nsGenericElement::IsPotentialIDAttributeName(aNameSpaceID, aAtom);
return nsGkAtoms::id;
}
nsIAtom *

4
mozilla/content/html/content/src/nsGenericHTMLElement.h
View File

@@ -241,9 +241,7 @@ public:
virtual void UpdateEditableState();
virtual const nsAttrValue* GetClasses() const;
virtual nsIAtom *GetIDAttributeName(PRInt32& aNameSpaceID) const;
virtual PRBool IsPotentialIDAttributeName(PRInt32 aNameSpaceID,
nsIAtom* aAtom) const;
virtual nsIAtom *GetIDAttributeName() const;
virtual nsIAtom *GetClassAttributeName() const;
NS_IMETHOD WalkContentStyleRules(nsRuleWalker* aRuleWalker);
virtual nsICSSStyleRule* GetInlineStyleRule();

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

@@ -1376,7 +1376,8 @@ nsHTMLDocument::AttributeWillChange(nsIContent* aContent, PRInt32 aNameSpaceID,
return;
}
}
} else if (aContent->IsPotentialIDAttributeName(aNameSpaceID, aAttribute)) {
} else if (aAttribute == aContent->GetIDAttributeName() &&
aNameSpaceID == kNameSpaceID_None) {
nsresult rv = RemoveFromIdTable(aContent);
if (NS_FAILED(rv)) {
@@ -1405,7 +1406,8 @@ nsHTMLDocument::AttributeChanged(nsIDocument* aDocument,
if (name) {
UpdateNameTableEntry(name, aContent);
}
} else if (aContent->IsPotentialIDAttributeName(aNameSpaceID, aAttribute)) {
} else if (aAttribute == aContent->GetIDAttributeName() &&
aNameSpaceID == kNameSpaceID_None) {
nsIAtom* id = aContent->GetID();
if (id) {
UpdateIdTableEntry(id, aContent);