diff --git a/mozilla/content/base/public/nsIContent.h b/mozilla/content/base/public/nsIContent.h
index 1d5fbcd746b..ab55b8a7c27 100644
--- a/mozilla/content/base/public/nsIContent.h
+++ b/mozilla/content/base/public/nsIContent.h
@@ -68,6 +68,8 @@ public:
 
   NS_IMETHOD GetTag(nsIAtom*& aResult) const = 0;
 
+  NS_IMETHOD GetNodeInfo(nsINodeInfo*& aResult) const = 0;
+
   NS_IMETHOD CanContainChildren(PRBool& aResult) const = 0;
 
   NS_IMETHOD ChildCount(PRInt32& aResult) const = 0;
diff --git a/mozilla/content/base/src/nsCommentNode.cpp b/mozilla/content/base/src/nsCommentNode.cpp
index f093d9755cb..6922802cca4 100644
--- a/mozilla/content/base/src/nsCommentNode.cpp
+++ b/mozilla/content/base/src/nsCommentNode.cpp
@@ -107,6 +107,9 @@ public:
     return mInner.GetNameSpaceID(aID);
   }
   NS_IMETHOD GetTag(nsIAtom*& aResult) const;
+  NS_IMETHOD GetNodeInfo(nsINodeInfo*& aResult) const {
+    aResult = nsnull; return NS_OK;
+  }
   NS_IMETHOD ParseAttributeString(const nsString& aStr,
                                   nsIAtom*& aName,
                                   PRInt32& aNameSpaceID) {
diff --git a/mozilla/content/base/src/nsDOMDocumentType.cpp b/mozilla/content/base/src/nsDOMDocumentType.cpp
index e05b3a6110c..2c5b94ba98e 100644
--- a/mozilla/content/base/src/nsDOMDocumentType.cpp
+++ b/mozilla/content/base/src/nsDOMDocumentType.cpp
@@ -150,6 +150,13 @@ nsDOMDocumentType::GetTag(nsIAtom*& aResult) const
   return NS_OK;
 }
 
+NS_IMETHODIMP 
+nsDOMDocumentType::GetNodeInfo(nsINodeInfo*& aResult) const
+{
+  aResult = nsnull;
+  return NS_OK;
+}
+
 NS_IMETHODIMP
 nsDOMDocumentType::GetNodeName(nsString& aNodeName)
 {
diff --git a/mozilla/content/base/src/nsDocumentFragment.cpp b/mozilla/content/base/src/nsDocumentFragment.cpp
index b9c3a0721da..b6a69fa92f2 100644
--- a/mozilla/content/base/src/nsDocumentFragment.cpp
+++ b/mozilla/content/base/src/nsDocumentFragment.cpp
@@ -140,6 +140,11 @@ public:
       aResult = nsnull;
       return NS_OK;
     }
+  NS_IMETHOD GetNodeInfo(nsINodeInfo*& aResult) const
+    {
+      aResult = nsnull;
+      return NS_OK;
+    }
   NS_IMETHOD CanContainChildren(PRBool& aResult) const
     { return mInner.CanContainChildren(aResult); }
   NS_IMETHOD ChildCount(PRInt32& aResult) const
diff --git a/mozilla/content/base/src/nsGenericDOMDataNode.h b/mozilla/content/base/src/nsGenericDOMDataNode.h
index 90ba96271a4..21878378443 100644
--- a/mozilla/content/base/src/nsGenericDOMDataNode.h
+++ b/mozilla/content/base/src/nsGenericDOMDataNode.h
@@ -50,6 +50,7 @@ class nsIStyleContext;
 class nsIStyleRule;
 class nsISupportsArray;
 class nsIDOMText;
+class nsINodeInfo;
 
 struct nsGenericDOMDataNode {
   nsGenericDOMDataNode();
@@ -477,6 +478,7 @@ struct nsGenericDOMDataNode {
     return _g.GetNameSpaceID(aID);                                         \
   }                                                                        \
   NS_IMETHOD GetTag(nsIAtom*& aResult) const;                              \
+  NS_IMETHOD GetNodeInfo(nsINodeInfo*& aResult) const;                     \
   NS_IMETHOD ParseAttributeString(const nsString& aStr,                    \
                                   nsIAtom*& aName,                         \
                                   PRInt32& aNameSpaceID) {                 \
diff --git a/mozilla/content/base/src/nsGenericElement.cpp b/mozilla/content/base/src/nsGenericElement.cpp
index d9448a02847..ab33a6c1d97 100644
--- a/mozilla/content/base/src/nsGenericElement.cpp
+++ b/mozilla/content/base/src/nsGenericElement.cpp
@@ -1031,6 +1031,15 @@ nsGenericElement::GetTag(nsIAtom*& aResult) const
   return mNodeInfo->GetNameAtom(aResult);
 }
 
+nsresult
+nsGenericElement::GetNodeInfo(nsINodeInfo*& aResult) const
+{
+  aResult = mNodeInfo;
+  NS_IF_ADDREF(aResult);
+
+  return NS_OK;
+}
+
 
 nsresult
 nsGenericElement::HandleDOMEvent(nsIPresContext* aPresContext,
diff --git a/mozilla/content/base/src/nsGenericElement.h b/mozilla/content/base/src/nsGenericElement.h
index 5375784c40b..b7245d83b02 100644
--- a/mozilla/content/base/src/nsGenericElement.h
+++ b/mozilla/content/base/src/nsGenericElement.h
@@ -171,6 +171,7 @@ public:
   }
   nsresult GetNameSpaceID(PRInt32& aNameSpaceID) const;
   nsresult GetTag(nsIAtom*& aResult) const;
+  nsresult GetNodeInfo(nsINodeInfo*& aResult) const;
   nsresult HandleDOMEvent(nsIPresContext* aPresContext,
                           nsEvent* aEvent,
                           nsIDOMEvent** aDOMEvent,
@@ -544,6 +545,9 @@ public:
   NS_IMETHOD GetTag(nsIAtom*& aResult) const {                             \
     return _g.GetTag(aResult);                                             \
   }                                                                        \
+  NS_IMETHOD GetNodeInfo(nsINodeInfo*& aResult) const {                    \
+    return _g.GetNodeInfo(aResult);                                        \
+  }                                                                        \
   NS_IMETHOD ParseAttributeString(const nsString& aStr,                    \
                                   nsIAtom*& aName,                         \
                                   PRInt32& aNameSpaceID) {                 \
@@ -663,6 +667,9 @@ public:
   NS_IMETHOD GetTag(nsIAtom*& aResult) const {                             \
     return _g.GetTag(aResult);                                             \
   }                                                                        \
+  NS_IMETHOD GetNodeInfo(nsINodeInfo*& aResult) const {                    \
+    return _g.GetNodeInfo(aResult);                                        \
+  }                                                                        \
   NS_IMETHOD ParseAttributeString(const nsString& aStr,                    \
                                   nsIAtom*& aName,                         \
                                   PRInt32& aNameSpaceID) {                 \
@@ -782,6 +789,9 @@ public:
   NS_IMETHOD GetTag(nsIAtom*& aResult) const {                             \
     return _g.GetTag(aResult);                                             \
   }                                                                        \
+  NS_IMETHOD GetNodeInfo(nsINodeInfo*& aResult) const {                    \
+    return _g.GetNodeInfo(aResult);                                        \
+  }                                                                        \
   NS_IMETHOD ParseAttributeString(const nsString& aStr,                    \
                                   nsIAtom*& aName,                         \
                                   PRInt32& aNameSpaceID) {                 \
@@ -899,6 +909,9 @@ public:
   NS_IMETHOD GetTag(nsIAtom*& aResult) const {                             \
     return _g.GetTag(aResult);                                             \
   }                                                                        \
+  NS_IMETHOD GetNodeInfo(nsINodeInfo*& aResult) const {                    \
+    return _g.GetNodeInfo(aResult);                                        \
+  }                                                                        \
   NS_IMETHOD ParseAttributeString(const nsString& aStr,                    \
                                   nsIAtom*& aName,                         \
                                   PRInt32& aNameSpaceID) {                 \
@@ -1020,6 +1033,9 @@ public:
   NS_IMETHOD GetTag(nsIAtom*& aResult) const {                             \
     return _g.GetTag(aResult);                                             \
   }                                                                        \
+  NS_IMETHOD GetNodeInfo(nsINodeInfo*& aResult) const {                    \
+    return _g.GetNodeInfo(aResult);                                        \
+  }                                                                        \
   NS_IMETHOD ParseAttributeString(const nsString& aStr,                    \
                                   nsIAtom*& aName,                         \
                                   PRInt32& aNameSpaceID) {                 \
@@ -1133,6 +1149,9 @@ public:
   NS_IMETHOD GetTag(nsIAtom*& aResult) const {                             \
     return _g.GetTag(aResult);                                             \
   }                                                                        \
+  NS_IMETHOD GetNodeInfo(nsINodeInfo*& aResult) const {                    \
+    return _g.GetNodeInfo(aResult);                                        \
+  }                                                                        \
   NS_IMETHOD ParseAttributeString(const nsString& aStr,                    \
                                   nsIAtom*& aName,                         \
                                   PRInt32& aNameSpaceID) {                 \
diff --git a/mozilla/content/base/src/nsTextNode.cpp b/mozilla/content/base/src/nsTextNode.cpp
index 2d294d8d18e..5e1e5a585aa 100644
--- a/mozilla/content/base/src/nsTextNode.cpp
+++ b/mozilla/content/base/src/nsTextNode.cpp
@@ -127,6 +127,13 @@ nsTextNode::GetTag(nsIAtom*& aResult) const
   return NS_OK;
 }
 
+NS_IMETHODIMP 
+nsTextNode::GetNodeInfo(nsINodeInfo*& aResult) const
+{
+  aResult = nsnull;
+  return NS_OK;
+}
+
 NS_IMETHODIMP
 nsTextNode::GetNodeName(nsString& aNodeName)
 {
diff --git a/mozilla/content/html/content/src/nsAttributeContent.cpp b/mozilla/content/html/content/src/nsAttributeContent.cpp
index e24d989c58d..f5135e4ab54 100644
--- a/mozilla/content/html/content/src/nsAttributeContent.cpp
+++ b/mozilla/content/html/content/src/nsAttributeContent.cpp
@@ -107,6 +107,11 @@ public:
     return NS_OK;
   }
 
+  NS_IMETHOD GetNodeInfo(nsINodeInfo*& aResult) const {
+    aResult = nsnull;
+    return NS_OK;
+  }
+
 
   NS_IMETHOD ParseAttributeString(const nsString& aStr, 
                                 nsIAtom*& aName,
diff --git a/mozilla/content/html/content/src/nsHTMLMapElement.cpp b/mozilla/content/html/content/src/nsHTMLMapElement.cpp
index 08fd0b3570c..4a1ba11a8d3 100644
--- a/mozilla/content/html/content/src/nsHTMLMapElement.cpp
+++ b/mozilla/content/html/content/src/nsHTMLMapElement.cpp
@@ -112,6 +112,9 @@ public:
   NS_IMETHOD GetTag(nsIAtom*& aResult) const {                             
     return mInner.GetTag(aResult);                                             
   }                                                                        
+  NS_IMETHOD GetNodeInfo(nsINodeInfo*& aResult) const {
+    return mInner.GetNodeInfo(aResult);
+  }
   NS_IMETHOD ParseAttributeString(const nsString& aStr,                    
                                   nsIAtom*& aName,                         
                                   PRInt32& aNameSpaceID) {                 
diff --git a/mozilla/content/html/content/src/nsHTMLUnknownElement.cpp b/mozilla/content/html/content/src/nsHTMLUnknownElement.cpp
index 2a9da8b90bc..2b0a2f9fd0f 100644
--- a/mozilla/content/html/content/src/nsHTMLUnknownElement.cpp
+++ b/mozilla/content/html/content/src/nsHTMLUnknownElement.cpp
@@ -111,6 +111,9 @@ public:
   NS_IMETHOD GetTag(nsIAtom*& aResult) const {
     return mInner.GetTag(aResult);
   }
+  NS_IMETHOD GetNodeInfo(nsINodeInfo*& aResult) const {
+    return mInner.GetNodeInfo(aResult);
+  }
   NS_IMETHOD ParseAttributeString(const nsString& aStr,
                                   nsIAtom*& aName,
                                   PRInt32& aNameSpaceID) {
diff --git a/mozilla/content/xml/content/src/nsXMLCDATASection.cpp b/mozilla/content/xml/content/src/nsXMLCDATASection.cpp
index b70b0edb103..58ede9c1908 100644
--- a/mozilla/content/xml/content/src/nsXMLCDATASection.cpp
+++ b/mozilla/content/xml/content/src/nsXMLCDATASection.cpp
@@ -134,6 +134,13 @@ nsXMLCDATASection::GetTag(nsIAtom*& aResult) const
   return NS_OK;
 }
 
+NS_IMETHODIMP 
+nsXMLCDATASection::GetNodeInfo(nsINodeInfo*& aResult) const
+{
+  aResult = nsnull;
+  return NS_OK;
+}
+
 NS_IMETHODIMP
 nsXMLCDATASection::GetNodeName(nsString& aNodeName)
 {
diff --git a/mozilla/content/xml/content/src/nsXMLElement.h b/mozilla/content/xml/content/src/nsXMLElement.h
index f68bc845543..8fa426dc35f 100644
--- a/mozilla/content/xml/content/src/nsXMLElement.h
+++ b/mozilla/content/xml/content/src/nsXMLElement.h
@@ -107,6 +107,9 @@ public:
   NS_IMETHOD GetTag(nsIAtom*& aResult) const {
     return mInner.GetTag(aResult);
   }
+  NS_IMETHOD GetNodeInfo(nsINodeInfo*& aResult) const {
+    return mInner.GetNodeInfo(aResult);
+  }
   NS_IMETHOD ParseAttributeString(const nsString& aStr,
                                   nsIAtom*& aName,
                                   PRInt32& aNameSpaceID) {
diff --git a/mozilla/content/xml/content/src/nsXMLEntity.cpp b/mozilla/content/xml/content/src/nsXMLEntity.cpp
index 66f2101893f..b37c163f0c2 100644
--- a/mozilla/content/xml/content/src/nsXMLEntity.cpp
+++ b/mozilla/content/xml/content/src/nsXMLEntity.cpp
@@ -227,6 +227,13 @@ nsXMLEntity::GetTag(nsIAtom*& aResult) const
   return NS_OK;
 }
 
+NS_IMETHODIMP 
+nsXMLEntity::GetNodeInfo(nsINodeInfo*& aResult) const
+{
+  aResult = nsnull;
+  return NS_OK;
+}
+
 NS_IMETHODIMP
 nsXMLEntity::GetNodeName(nsString& aNodeName)
 {
diff --git a/mozilla/content/xml/content/src/nsXMLNotation.cpp b/mozilla/content/xml/content/src/nsXMLNotation.cpp
index c9548d45a4d..35a88bf474c 100644
--- a/mozilla/content/xml/content/src/nsXMLNotation.cpp
+++ b/mozilla/content/xml/content/src/nsXMLNotation.cpp
@@ -216,6 +216,13 @@ nsXMLNotation::GetTag(nsIAtom*& aResult) const
   return NS_OK;
 }
 
+NS_IMETHODIMP 
+nsXMLNotation::GetNodeInfo(nsINodeInfo*& aResult) const
+{
+  aResult = nsnull;
+  return NS_OK;
+}
+
 NS_IMETHODIMP
 nsXMLNotation::GetNodeName(nsString& aNodeName)
 {
diff --git a/mozilla/content/xml/content/src/nsXMLProcessingInstruction.cpp b/mozilla/content/xml/content/src/nsXMLProcessingInstruction.cpp
index 4cd8cb02298..9c582f35342 100644
--- a/mozilla/content/xml/content/src/nsXMLProcessingInstruction.cpp
+++ b/mozilla/content/xml/content/src/nsXMLProcessingInstruction.cpp
@@ -214,6 +214,13 @@ nsXMLProcessingInstruction::GetTag(nsIAtom*& aResult) const
   return NS_OK;
 }
 
+NS_IMETHODIMP 
+nsXMLProcessingInstruction::GetNodeInfo(nsINodeInfo*& aResult) const
+{
+  aResult = nsnull;
+  return NS_OK;
+}
+
 NS_IMETHODIMP
 nsXMLProcessingInstruction::GetNodeName(nsString& aNodeName)
 {
diff --git a/mozilla/content/xul/content/src/nsXULElement.cpp b/mozilla/content/xul/content/src/nsXULElement.cpp
index 71cf8ca0ca9..78f0dabfa71 100644
--- a/mozilla/content/xul/content/src/nsXULElement.cpp
+++ b/mozilla/content/xul/content/src/nsXULElement.cpp
@@ -1427,6 +1427,14 @@ nsXULElement::GetTagName(nsString& aTagName)
     return NodeInfo()->GetQualifiedName(aTagName);
 }
 
+NS_IMETHODIMP
+nsXULElement::GetNodeInfo(nsINodeInfo*& aResult) const
+{
+    aResult = NodeInfo();
+    NS_IF_ADDREF(aResult);
+
+    return NS_OK;
+}
 
 NS_IMETHODIMP
 nsXULElement::GetAttribute(const nsString& aName, nsString& aReturn)
diff --git a/mozilla/content/xul/content/src/nsXULElement.h b/mozilla/content/xul/content/src/nsXULElement.h
index 345dda43ffb..d751e5fda9b 100644
--- a/mozilla/content/xul/content/src/nsXULElement.h
+++ b/mozilla/content/xul/content/src/nsXULElement.h
@@ -392,6 +392,7 @@ public:
     NS_IMETHOD IsSynthetic(PRBool& aResult);
     NS_IMETHOD GetNameSpaceID(PRInt32& aNameSpeceID) const;
     NS_IMETHOD GetTag(nsIAtom*& aResult) const;
+    NS_IMETHOD GetNodeInfo(nsINodeInfo*& aResult) const;
     NS_IMETHOD ParseAttributeString(const nsString& aStr, nsIAtom*& aName, PRInt32& aNameSpaceID);
     NS_IMETHOD GetNameSpacePrefixFromId(PRInt32 aNameSpaceID, nsIAtom*& aPrefix);
     NS_IMETHOD SetAttribute(PRInt32 aNameSpaceID, nsIAtom* aName, const nsString& aValue, PRBool aNotify);
diff --git a/mozilla/layout/base/public/nsIContent.h b/mozilla/layout/base/public/nsIContent.h
index 1d5fbcd746b..ab55b8a7c27 100644
--- a/mozilla/layout/base/public/nsIContent.h
+++ b/mozilla/layout/base/public/nsIContent.h
@@ -68,6 +68,8 @@ public:
 
   NS_IMETHOD GetTag(nsIAtom*& aResult) const = 0;
 
+  NS_IMETHOD GetNodeInfo(nsINodeInfo*& aResult) const = 0;
+
   NS_IMETHOD CanContainChildren(PRBool& aResult) const = 0;
 
   NS_IMETHOD ChildCount(PRInt32& aResult) const = 0;
diff --git a/mozilla/layout/base/src/nsCommentNode.cpp b/mozilla/layout/base/src/nsCommentNode.cpp
index f093d9755cb..6922802cca4 100644
--- a/mozilla/layout/base/src/nsCommentNode.cpp
+++ b/mozilla/layout/base/src/nsCommentNode.cpp
@@ -107,6 +107,9 @@ public:
     return mInner.GetNameSpaceID(aID);
   }
   NS_IMETHOD GetTag(nsIAtom*& aResult) const;
+  NS_IMETHOD GetNodeInfo(nsINodeInfo*& aResult) const {
+    aResult = nsnull; return NS_OK;
+  }
   NS_IMETHOD ParseAttributeString(const nsString& aStr,
                                   nsIAtom*& aName,
                                   PRInt32& aNameSpaceID) {
diff --git a/mozilla/layout/base/src/nsDOMDocumentType.cpp b/mozilla/layout/base/src/nsDOMDocumentType.cpp
index e05b3a6110c..2c5b94ba98e 100644
--- a/mozilla/layout/base/src/nsDOMDocumentType.cpp
+++ b/mozilla/layout/base/src/nsDOMDocumentType.cpp
@@ -150,6 +150,13 @@ nsDOMDocumentType::GetTag(nsIAtom*& aResult) const
   return NS_OK;
 }
 
+NS_IMETHODIMP 
+nsDOMDocumentType::GetNodeInfo(nsINodeInfo*& aResult) const
+{
+  aResult = nsnull;
+  return NS_OK;
+}
+
 NS_IMETHODIMP
 nsDOMDocumentType::GetNodeName(nsString& aNodeName)
 {
diff --git a/mozilla/layout/base/src/nsDocumentFragment.cpp b/mozilla/layout/base/src/nsDocumentFragment.cpp
index b9c3a0721da..b6a69fa92f2 100644
--- a/mozilla/layout/base/src/nsDocumentFragment.cpp
+++ b/mozilla/layout/base/src/nsDocumentFragment.cpp
@@ -140,6 +140,11 @@ public:
       aResult = nsnull;
       return NS_OK;
     }
+  NS_IMETHOD GetNodeInfo(nsINodeInfo*& aResult) const
+    {
+      aResult = nsnull;
+      return NS_OK;
+    }
   NS_IMETHOD CanContainChildren(PRBool& aResult) const
     { return mInner.CanContainChildren(aResult); }
   NS_IMETHOD ChildCount(PRInt32& aResult) const
diff --git a/mozilla/layout/base/src/nsGenericDOMDataNode.h b/mozilla/layout/base/src/nsGenericDOMDataNode.h
index 90ba96271a4..21878378443 100644
--- a/mozilla/layout/base/src/nsGenericDOMDataNode.h
+++ b/mozilla/layout/base/src/nsGenericDOMDataNode.h
@@ -50,6 +50,7 @@ class nsIStyleContext;
 class nsIStyleRule;
 class nsISupportsArray;
 class nsIDOMText;
+class nsINodeInfo;
 
 struct nsGenericDOMDataNode {
   nsGenericDOMDataNode();
@@ -477,6 +478,7 @@ struct nsGenericDOMDataNode {
     return _g.GetNameSpaceID(aID);                                         \
   }                                                                        \
   NS_IMETHOD GetTag(nsIAtom*& aResult) const;                              \
+  NS_IMETHOD GetNodeInfo(nsINodeInfo*& aResult) const;                     \
   NS_IMETHOD ParseAttributeString(const nsString& aStr,                    \
                                   nsIAtom*& aName,                         \
                                   PRInt32& aNameSpaceID) {                 \
diff --git a/mozilla/layout/base/src/nsGenericElement.cpp b/mozilla/layout/base/src/nsGenericElement.cpp
index d9448a02847..ab33a6c1d97 100644
--- a/mozilla/layout/base/src/nsGenericElement.cpp
+++ b/mozilla/layout/base/src/nsGenericElement.cpp
@@ -1031,6 +1031,15 @@ nsGenericElement::GetTag(nsIAtom*& aResult) const
   return mNodeInfo->GetNameAtom(aResult);
 }
 
+nsresult
+nsGenericElement::GetNodeInfo(nsINodeInfo*& aResult) const
+{
+  aResult = mNodeInfo;
+  NS_IF_ADDREF(aResult);
+
+  return NS_OK;
+}
+
 
 nsresult
 nsGenericElement::HandleDOMEvent(nsIPresContext* aPresContext,
diff --git a/mozilla/layout/base/src/nsGenericElement.h b/mozilla/layout/base/src/nsGenericElement.h
index 5375784c40b..b7245d83b02 100644
--- a/mozilla/layout/base/src/nsGenericElement.h
+++ b/mozilla/layout/base/src/nsGenericElement.h
@@ -171,6 +171,7 @@ public:
   }
   nsresult GetNameSpaceID(PRInt32& aNameSpaceID) const;
   nsresult GetTag(nsIAtom*& aResult) const;
+  nsresult GetNodeInfo(nsINodeInfo*& aResult) const;
   nsresult HandleDOMEvent(nsIPresContext* aPresContext,
                           nsEvent* aEvent,
                           nsIDOMEvent** aDOMEvent,
@@ -544,6 +545,9 @@ public:
   NS_IMETHOD GetTag(nsIAtom*& aResult) const {                             \
     return _g.GetTag(aResult);                                             \
   }                                                                        \
+  NS_IMETHOD GetNodeInfo(nsINodeInfo*& aResult) const {                    \
+    return _g.GetNodeInfo(aResult);                                        \
+  }                                                                        \
   NS_IMETHOD ParseAttributeString(const nsString& aStr,                    \
                                   nsIAtom*& aName,                         \
                                   PRInt32& aNameSpaceID) {                 \
@@ -663,6 +667,9 @@ public:
   NS_IMETHOD GetTag(nsIAtom*& aResult) const {                             \
     return _g.GetTag(aResult);                                             \
   }                                                                        \
+  NS_IMETHOD GetNodeInfo(nsINodeInfo*& aResult) const {                    \
+    return _g.GetNodeInfo(aResult);                                        \
+  }                                                                        \
   NS_IMETHOD ParseAttributeString(const nsString& aStr,                    \
                                   nsIAtom*& aName,                         \
                                   PRInt32& aNameSpaceID) {                 \
@@ -782,6 +789,9 @@ public:
   NS_IMETHOD GetTag(nsIAtom*& aResult) const {                             \
     return _g.GetTag(aResult);                                             \
   }                                                                        \
+  NS_IMETHOD GetNodeInfo(nsINodeInfo*& aResult) const {                    \
+    return _g.GetNodeInfo(aResult);                                        \
+  }                                                                        \
   NS_IMETHOD ParseAttributeString(const nsString& aStr,                    \
                                   nsIAtom*& aName,                         \
                                   PRInt32& aNameSpaceID) {                 \
@@ -899,6 +909,9 @@ public:
   NS_IMETHOD GetTag(nsIAtom*& aResult) const {                             \
     return _g.GetTag(aResult);                                             \
   }                                                                        \
+  NS_IMETHOD GetNodeInfo(nsINodeInfo*& aResult) const {                    \
+    return _g.GetNodeInfo(aResult);                                        \
+  }                                                                        \
   NS_IMETHOD ParseAttributeString(const nsString& aStr,                    \
                                   nsIAtom*& aName,                         \
                                   PRInt32& aNameSpaceID) {                 \
@@ -1020,6 +1033,9 @@ public:
   NS_IMETHOD GetTag(nsIAtom*& aResult) const {                             \
     return _g.GetTag(aResult);                                             \
   }                                                                        \
+  NS_IMETHOD GetNodeInfo(nsINodeInfo*& aResult) const {                    \
+    return _g.GetNodeInfo(aResult);                                        \
+  }                                                                        \
   NS_IMETHOD ParseAttributeString(const nsString& aStr,                    \
                                   nsIAtom*& aName,                         \
                                   PRInt32& aNameSpaceID) {                 \
@@ -1133,6 +1149,9 @@ public:
   NS_IMETHOD GetTag(nsIAtom*& aResult) const {                             \
     return _g.GetTag(aResult);                                             \
   }                                                                        \
+  NS_IMETHOD GetNodeInfo(nsINodeInfo*& aResult) const {                    \
+    return _g.GetNodeInfo(aResult);                                        \
+  }                                                                        \
   NS_IMETHOD ParseAttributeString(const nsString& aStr,                    \
                                   nsIAtom*& aName,                         \
                                   PRInt32& aNameSpaceID) {                 \
diff --git a/mozilla/layout/base/src/nsTextNode.cpp b/mozilla/layout/base/src/nsTextNode.cpp
index 2d294d8d18e..5e1e5a585aa 100644
--- a/mozilla/layout/base/src/nsTextNode.cpp
+++ b/mozilla/layout/base/src/nsTextNode.cpp
@@ -127,6 +127,13 @@ nsTextNode::GetTag(nsIAtom*& aResult) const
   return NS_OK;
 }
 
+NS_IMETHODIMP 
+nsTextNode::GetNodeInfo(nsINodeInfo*& aResult) const
+{
+  aResult = nsnull;
+  return NS_OK;
+}
+
 NS_IMETHODIMP
 nsTextNode::GetNodeName(nsString& aNodeName)
 {
diff --git a/mozilla/layout/html/content/src/nsAttributeContent.cpp b/mozilla/layout/html/content/src/nsAttributeContent.cpp
index e24d989c58d..f5135e4ab54 100644
--- a/mozilla/layout/html/content/src/nsAttributeContent.cpp
+++ b/mozilla/layout/html/content/src/nsAttributeContent.cpp
@@ -107,6 +107,11 @@ public:
     return NS_OK;
   }
 
+  NS_IMETHOD GetNodeInfo(nsINodeInfo*& aResult) const {
+    aResult = nsnull;
+    return NS_OK;
+  }
+
 
   NS_IMETHOD ParseAttributeString(const nsString& aStr, 
                                 nsIAtom*& aName,
diff --git a/mozilla/layout/html/content/src/nsHTMLMapElement.cpp b/mozilla/layout/html/content/src/nsHTMLMapElement.cpp
index 08fd0b3570c..4a1ba11a8d3 100644
--- a/mozilla/layout/html/content/src/nsHTMLMapElement.cpp
+++ b/mozilla/layout/html/content/src/nsHTMLMapElement.cpp
@@ -112,6 +112,9 @@ public:
   NS_IMETHOD GetTag(nsIAtom*& aResult) const {                             
     return mInner.GetTag(aResult);                                             
   }                                                                        
+  NS_IMETHOD GetNodeInfo(nsINodeInfo*& aResult) const {
+    return mInner.GetNodeInfo(aResult);
+  }
   NS_IMETHOD ParseAttributeString(const nsString& aStr,                    
                                   nsIAtom*& aName,                         
                                   PRInt32& aNameSpaceID) {                 
diff --git a/mozilla/layout/html/content/src/nsHTMLUnknownElement.cpp b/mozilla/layout/html/content/src/nsHTMLUnknownElement.cpp
index 2a9da8b90bc..2b0a2f9fd0f 100644
--- a/mozilla/layout/html/content/src/nsHTMLUnknownElement.cpp
+++ b/mozilla/layout/html/content/src/nsHTMLUnknownElement.cpp
@@ -111,6 +111,9 @@ public:
   NS_IMETHOD GetTag(nsIAtom*& aResult) const {
     return mInner.GetTag(aResult);
   }
+  NS_IMETHOD GetNodeInfo(nsINodeInfo*& aResult) const {
+    return mInner.GetNodeInfo(aResult);
+  }
   NS_IMETHOD ParseAttributeString(const nsString& aStr,
                                   nsIAtom*& aName,
                                   PRInt32& aNameSpaceID) {
diff --git a/mozilla/layout/xml/content/src/nsXMLCDATASection.cpp b/mozilla/layout/xml/content/src/nsXMLCDATASection.cpp
index b70b0edb103..58ede9c1908 100644
--- a/mozilla/layout/xml/content/src/nsXMLCDATASection.cpp
+++ b/mozilla/layout/xml/content/src/nsXMLCDATASection.cpp
@@ -134,6 +134,13 @@ nsXMLCDATASection::GetTag(nsIAtom*& aResult) const
   return NS_OK;
 }
 
+NS_IMETHODIMP 
+nsXMLCDATASection::GetNodeInfo(nsINodeInfo*& aResult) const
+{
+  aResult = nsnull;
+  return NS_OK;
+}
+
 NS_IMETHODIMP
 nsXMLCDATASection::GetNodeName(nsString& aNodeName)
 {
diff --git a/mozilla/layout/xml/content/src/nsXMLDocumentType.cpp b/mozilla/layout/xml/content/src/nsXMLDocumentType.cpp
index 954a92a12e1..dd936f930a8 100644
--- a/mozilla/layout/xml/content/src/nsXMLDocumentType.cpp
+++ b/mozilla/layout/xml/content/src/nsXMLDocumentType.cpp
@@ -284,6 +284,13 @@ nsXMLDocumentType::GetTag(nsIAtom*& aResult) const
   return NS_OK;
 }
 
+NS_IMETHODIMP 
+nsXMLDocumentType::GetNodeInfo(nsINodeInfo*& aResult) const
+{
+  aResult = nsnull;
+  return NS_OK;
+}
+
 NS_IMETHODIMP
 nsXMLDocumentType::GetNodeName(nsString& aNodeName)
 {
diff --git a/mozilla/layout/xml/content/src/nsXMLElement.h b/mozilla/layout/xml/content/src/nsXMLElement.h
index f68bc845543..8fa426dc35f 100644
--- a/mozilla/layout/xml/content/src/nsXMLElement.h
+++ b/mozilla/layout/xml/content/src/nsXMLElement.h
@@ -107,6 +107,9 @@ public:
   NS_IMETHOD GetTag(nsIAtom*& aResult) const {
     return mInner.GetTag(aResult);
   }
+  NS_IMETHOD GetNodeInfo(nsINodeInfo*& aResult) const {
+    return mInner.GetNodeInfo(aResult);
+  }
   NS_IMETHOD ParseAttributeString(const nsString& aStr,
                                   nsIAtom*& aName,
                                   PRInt32& aNameSpaceID) {
diff --git a/mozilla/layout/xml/content/src/nsXMLEntity.cpp b/mozilla/layout/xml/content/src/nsXMLEntity.cpp
index 66f2101893f..b37c163f0c2 100644
--- a/mozilla/layout/xml/content/src/nsXMLEntity.cpp
+++ b/mozilla/layout/xml/content/src/nsXMLEntity.cpp
@@ -227,6 +227,13 @@ nsXMLEntity::GetTag(nsIAtom*& aResult) const
   return NS_OK;
 }
 
+NS_IMETHODIMP 
+nsXMLEntity::GetNodeInfo(nsINodeInfo*& aResult) const
+{
+  aResult = nsnull;
+  return NS_OK;
+}
+
 NS_IMETHODIMP
 nsXMLEntity::GetNodeName(nsString& aNodeName)
 {
diff --git a/mozilla/layout/xml/content/src/nsXMLNotation.cpp b/mozilla/layout/xml/content/src/nsXMLNotation.cpp
index c9548d45a4d..35a88bf474c 100644
--- a/mozilla/layout/xml/content/src/nsXMLNotation.cpp
+++ b/mozilla/layout/xml/content/src/nsXMLNotation.cpp
@@ -216,6 +216,13 @@ nsXMLNotation::GetTag(nsIAtom*& aResult) const
   return NS_OK;
 }
 
+NS_IMETHODIMP 
+nsXMLNotation::GetNodeInfo(nsINodeInfo*& aResult) const
+{
+  aResult = nsnull;
+  return NS_OK;
+}
+
 NS_IMETHODIMP
 nsXMLNotation::GetNodeName(nsString& aNodeName)
 {
diff --git a/mozilla/layout/xml/content/src/nsXMLProcessingInstruction.cpp b/mozilla/layout/xml/content/src/nsXMLProcessingInstruction.cpp
index 4cd8cb02298..9c582f35342 100644
--- a/mozilla/layout/xml/content/src/nsXMLProcessingInstruction.cpp
+++ b/mozilla/layout/xml/content/src/nsXMLProcessingInstruction.cpp
@@ -214,6 +214,13 @@ nsXMLProcessingInstruction::GetTag(nsIAtom*& aResult) const
   return NS_OK;
 }
 
+NS_IMETHODIMP 
+nsXMLProcessingInstruction::GetNodeInfo(nsINodeInfo*& aResult) const
+{
+  aResult = nsnull;
+  return NS_OK;
+}
+
 NS_IMETHODIMP
 nsXMLProcessingInstruction::GetNodeName(nsString& aNodeName)
 {
diff --git a/mozilla/rdf/content/src/nsXULElement.cpp b/mozilla/rdf/content/src/nsXULElement.cpp
index 71cf8ca0ca9..78f0dabfa71 100644
--- a/mozilla/rdf/content/src/nsXULElement.cpp
+++ b/mozilla/rdf/content/src/nsXULElement.cpp
@@ -1427,6 +1427,14 @@ nsXULElement::GetTagName(nsString& aTagName)
     return NodeInfo()->GetQualifiedName(aTagName);
 }
 
+NS_IMETHODIMP
+nsXULElement::GetNodeInfo(nsINodeInfo*& aResult) const
+{
+    aResult = NodeInfo();
+    NS_IF_ADDREF(aResult);
+
+    return NS_OK;
+}
 
 NS_IMETHODIMP
 nsXULElement::GetAttribute(const nsString& aName, nsString& aReturn)
diff --git a/mozilla/rdf/content/src/nsXULElement.h b/mozilla/rdf/content/src/nsXULElement.h
index 345dda43ffb..d751e5fda9b 100644
--- a/mozilla/rdf/content/src/nsXULElement.h
+++ b/mozilla/rdf/content/src/nsXULElement.h
@@ -392,6 +392,7 @@ public:
     NS_IMETHOD IsSynthetic(PRBool& aResult);
     NS_IMETHOD GetNameSpaceID(PRInt32& aNameSpeceID) const;
     NS_IMETHOD GetTag(nsIAtom*& aResult) const;
+    NS_IMETHOD GetNodeInfo(nsINodeInfo*& aResult) const;
     NS_IMETHOD ParseAttributeString(const nsString& aStr, nsIAtom*& aName, PRInt32& aNameSpaceID);
     NS_IMETHOD GetNameSpacePrefixFromId(PRInt32 aNameSpaceID, nsIAtom*& aPrefix);
     NS_IMETHOD SetAttribute(PRInt32 aNameSpaceID, nsIAtom* aName, const nsString& aValue, PRBool aNotify);