it's been a long day

content/svg/content/src/nsSVGAttributes.cpp

@@ -212,7 +212,8 @@ nsSVGAttribute::GetNamespaceURI(nsAString& aNamespaceURI)
 NS_IMETHODIMP
 nsSVGAttribute::GetPrefix(nsAString& aPrefix)
 {
-  return mNodeInfo->GetPrefix(aPrefix);
+  mNodeInfo->GetPrefix(aPrefix);
+  return NS_OK;
 }
 
 NS_IMETHODIMP
@@ -240,7 +241,8 @@ nsSVGAttribute::SetPrefix(const nsAString& aPrefix)
 NS_IMETHODIMP
 nsSVGAttribute::GetLocalName(nsAString& aLocalName)
 {
-  return mNodeInfo->GetLocalName(aLocalName);
+  mNodeInfo->GetLocalName(aLocalName);
+  return NS_OK;
 }
 
 NS_IMETHODIMP
@@ -821,8 +823,9 @@ nsSVGAttributes::AddMappedSVGValue(nsIAtom* name, nsISupports* value)
   if (!mContent) return NS_ERROR_FAILURE;
   
   nsCOMPtr<nsINodeInfo> ni;
-  mContent->NodeInfoManager()->GetNodeInfo(name, nsnull, kNameSpaceID_None,
+  mContent->GetNodeInfo()->NodeInfoManager()->GetNodeInfo(name, nsnull,
-                                           getter_AddRefs(ni));
+                                                          kNameSpaceID_None,
+                                                          getter_AddRefs(ni));
   NS_ENSURE_TRUE(ni, NS_ERROR_FAILURE);
 
   nsSVGAttribute* attrib = nsnull;

content/svg/content/src/nsSVGElement.cpp

@@ -282,7 +282,8 @@ nsSVGElement::GetInlineStyleRule(nsIStyleRule** aStyleRule)
 NS_IMETHODIMP
 nsSVGElement::GetNodeName(nsAString& aNodeName)
 {
-  return mNodeInfo->GetQualifiedName(aNodeName);
+  mNodeInfo->GetQualifiedName(aNodeName);
+  return NS_OK;
 }
 
 NS_IMETHODIMP