diff --git a/mozilla/content/base/src/nsDOMAttributeMap.cpp b/mozilla/content/base/src/nsDOMAttributeMap.cpp
index d3fac0cace4..7ca9eb63589 100644
--- a/mozilla/content/base/src/nsDOMAttributeMap.cpp
+++ b/mozilla/content/base/src/nsDOMAttributeMap.cpp
@@ -238,8 +238,8 @@ nsDOMAttributeMap::Item(PRUint32 aIndex, nsIDOMNode** aReturn)
     nsCOMPtr<nsINodeInfo> ni(mContent->GetNodeInfo());
     NS_ENSURE_TRUE(ni, NS_ERROR_FAILURE);
 
-    ni->NodeInfoManager()->GetNodeInfo(nameAtom, prefix, nameSpaceID,
-                                       getter_AddRefs(ni));
+    nsCOMPtr<nsINodeInfoManager> nimgr = ni->NodeInfoManager();
+    nimgr->GetNodeInfo(nameAtom, prefix, nameSpaceID, getter_AddRefs(ni));
     NS_ENSURE_TRUE(ni, NS_ERROR_FAILURE);
 
     nsDOMAttribute* domAttribute = new nsDOMAttribute(mContent, ni, value);
@@ -300,8 +300,8 @@ nsDOMAttributeMap::GetNamedItemNS(const nsAString& aNamespaceURI,
                                    getter_AddRefs(prefix), value);
 
     if (NS_CONTENT_ATTR_NOT_THERE != attrResult && NS_SUCCEEDED(attrResult)) {
-      ni->NodeInfoManager()->GetNodeInfo(nameAtom, prefix,
-                                         nameSpaceID, getter_AddRefs(ni));
+      nsCOMPtr<nsINodeInfoManager> nimgr = ni->NodeInfoManager();
+      nimgr->GetNodeInfo(nameAtom, prefix, nameSpaceID, getter_AddRefs(ni));
       NS_ENSURE_TRUE(ni, NS_ERROR_FAILURE);
 
       nsDOMAttribute* domAttribute = new nsDOMAttribute(mContent, ni, value);
@@ -352,7 +352,8 @@ nsDOMAttributeMap::SetNamedItemNS(nsIDOMNode* aArg, nsIDOMNode** aReturn)
     nsCOMPtr<nsINodeInfo> ni(mContent->GetNodeInfo());
     NS_ENSURE_TRUE(ni, NS_ERROR_FAILURE);
 
-    ni->NodeInfoManager()->GetNodeInfo(name, nsURI, getter_AddRefs(ni));
+    nsCOMPtr<nsINodeInfoManager> nimgr = ni->NodeInfoManager();
+    nimgr->GetNodeInfo(name, nsURI, getter_AddRefs(ni));
     NS_ENSURE_TRUE(ni, NS_ERROR_FAILURE);
 
     nsresult attrResult = mContent->GetAttr(ni->NamespaceID(),
@@ -416,8 +417,8 @@ nsDOMAttributeMap::RemoveNamedItemNS(const nsAString& aNamespaceURI,
                                    getter_AddRefs(prefix), value);
 
     if (NS_CONTENT_ATTR_NOT_THERE != attrResult && NS_SUCCEEDED(attrResult)) {
-      ni->NodeInfoManager()->GetNodeInfo(nameAtom, prefix, nameSpaceID,
-                                         getter_AddRefs(ni));
+      nsCOMPtr<nsINodeInfoManager> nimgr = ni->NodeInfoManager();
+      nimgr->GetNodeInfo(nameAtom, prefix, nameSpaceID, getter_AddRefs(ni));
       NS_ENSURE_TRUE(ni, NS_ERROR_FAILURE);
 
       nsDOMAttribute* domAttribute = new nsDOMAttribute(nsnull, ni, value);
diff --git a/mozilla/content/xul/document/src/nsXULDocument.cpp b/mozilla/content/xul/document/src/nsXULDocument.cpp
index a8caadbd508..ff005a34f68 100644
--- a/mozilla/content/xul/document/src/nsXULDocument.cpp
+++ b/mozilla/content/xul/document/src/nsXULDocument.cpp
@@ -3833,8 +3833,9 @@ nsXULDocument::OverlayForwardReference::Merge(nsIContent* aTargetNode,
         nsCOMPtr<nsINodeInfo> ni = aTargetNode->GetNodeInfo();
 
         if (ni) {
-            ni->NodeInfoManager()->GetNodeInfo(attr, prefix, nameSpaceID,
-                                               getter_AddRefs(ni));
+            nsCOMPtr<nsINodeInfoManager> manager = ni->NodeInfoManager();
+            manager->GetNodeInfo(attr, prefix, nameSpaceID,
+                                 getter_AddRefs(ni));
         }
 
         rv = aTargetNode->SetAttr(ni, value, PR_FALSE);