Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-03-01 13:57:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 705110 - Suppress warning spam on DOMAttrModified event. r=smaug

Browse Source
This commit is contained in:
Masatoshi Kimura 2012-02-27 18:57:28 -05:00
parent 6b6f7e4458
commit fcffee46fd
3 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
content/base/src/nsGenericElement.cpp
View File

@ -2899,6 +2899,14 @@ nsGenericElement::GetAttributeNodeNS(const nsAString& aNamespaceURI,
OwnerDoc()->WarnOnceAbout(nsIDocument::eGetAttributeNodeNS); OwnerDoc()->WarnOnceAbout(nsIDocument::eGetAttributeNodeNS);
return GetAttributeNodeNSInternal(aNamespaceURI, aLocalName, aReturn);
}
nsresult
nsGenericElement::GetAttributeNodeNSInternal(const nsAString& aNamespaceURI,
const nsAString& aLocalName,
nsIDOMAttr** aReturn)
{
nsCOMPtr<nsIDOMNamedNodeMap> map; nsCOMPtr<nsIDOMNamedNodeMap> map;
nsresult rv = GetAttributes(getter_AddRefs(map)); nsresult rv = GetAttributes(getter_AddRefs(map));
NS_ENSURE_SUCCESS(rv, rv); NS_ENSURE_SUCCESS(rv, rv);
@ -5206,8 +5214,8 @@ nsGenericElement::SetAttrAndNotify(PRInt32 aNamespaceID,
nsCOMPtr<nsIDOMAttr> attrNode; nsCOMPtr<nsIDOMAttr> attrNode;
nsAutoString ns; nsAutoString ns;
nsContentUtils::NameSpaceManager()->GetNameSpaceURI(aNamespaceID, ns); nsContentUtils::NameSpaceManager()->GetNameSpaceURI(aNamespaceID, ns);
GetAttributeNodeNS(ns, nsDependentAtomString(aName), GetAttributeNodeNSInternal(ns, nsDependentAtomString(aName),
getter_AddRefs(attrNode)); getter_AddRefs(attrNode));
mutation.mRelatedNode = attrNode; mutation.mRelatedNode = attrNode;
mutation.mAttrName = aName; mutation.mAttrName = aName;
@ -5386,8 +5394,8 @@ nsGenericElement::UnsetAttr(PRInt32 aNameSpaceID, nsIAtom* aName,
if (hasMutationListeners) { if (hasMutationListeners) {
nsAutoString ns; nsAutoString ns;
nsContentUtils::NameSpaceManager()->GetNameSpaceURI(aNameSpaceID, ns); nsContentUtils::NameSpaceManager()->GetNameSpaceURI(aNameSpaceID, ns);
GetAttributeNodeNS(ns, nsDependentAtomString(aName), GetAttributeNodeNSInternal(ns, nsDependentAtomString(aName),
getter_AddRefs(attrNode)); getter_AddRefs(attrNode));
} }
// Clear binding to nsIDOMNamedNodeMap // Clear binding to nsIDOMNamedNodeMap

4
content/base/src/nsGenericElement.h
View File

@ -794,6 +794,10 @@ protected:
return this; return this;
} }
nsresult GetAttributeNodeNSInternal(const nsAString& aNamespaceURI,
const nsAString& aLocalName,
nsIDOMAttr** aReturn);
public: public:
// Because of a bug in MS C++ compiler nsDOMSlots must be declared public, // Because of a bug in MS C++ compiler nsDOMSlots must be declared public,
// otherwise nsXULElement::nsXULSlots doesn't compile. // otherwise nsXULElement::nsXULSlots doesn't compile.

3
content/xul/content/src/nsXULElement.cpp
View File

@ -1368,7 +1368,8 @@ nsXULElement::UnsetAttr(PRInt32 aNameSpaceID, nsIAtom* aName, bool aNotify)
if (hasMutationListeners) { if (hasMutationListeners) {
nsAutoString ns; nsAutoString ns;
nsContentUtils::NameSpaceManager()->GetNameSpaceURI(aNameSpaceID, ns); nsContentUtils::NameSpaceManager()->GetNameSpaceURI(aNameSpaceID, ns);
GetAttributeNodeNS(ns, nsDependentAtomString(aName), getter_AddRefs(attrNode)); GetAttributeNodeNSInternal(ns, nsDependentAtomString(aName),
getter_AddRefs(attrNode));
} }
nsDOMSlots *slots = GetExistingDOMSlots(); nsDOMSlots *slots = GetExistingDOMSlots();