diff --git a/content/base/src/nsCommentNode.cpp b/content/base/src/nsCommentNode.cpp
index c07bebddf062..88c53f164cd1 100644
--- a/content/base/src/nsCommentNode.cpp
+++ b/content/base/src/nsCommentNode.cpp
@@ -127,6 +127,18 @@ nsCommentNode::GetNodeName(nsAString& aNodeName)
   return NS_OK;
 }
 
+NS_IMETHODIMP
+nsCommentNode::GetNodeValue(nsAString& aNodeValue)
+{
+  return nsGenericDOMDataNode::GetNodeValue(aNodeValue);
+}
+
+NS_IMETHODIMP
+nsCommentNode::SetNodeValue(const nsAString& aNodeValue)
+{
+  return nsGenericDOMDataNode::SetNodeValue(aNodeValue);
+}
+
 NS_IMETHODIMP
 nsCommentNode::GetNodeType(PRUint16* aNodeType)
 {
diff --git a/content/base/src/nsDOMDocumentType.cpp b/content/base/src/nsDOMDocumentType.cpp
index d73be225b6de..229317e75e0a 100644
--- a/content/base/src/nsDOMDocumentType.cpp
+++ b/content/base/src/nsDOMDocumentType.cpp
@@ -180,6 +180,20 @@ nsDOMDocumentType::GetNodeName(nsAString& aNodeName)
   return NS_OK;
 }
 
+NS_IMETHODIMP
+nsDOMDocumentType::GetNodeValue(nsAString& aNodeValue)
+{
+  SetDOMStringToNull(aNodeValue);
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsDOMDocumentType::SetNodeValue(const nsAString& aNodeValue)
+{
+  return NS_OK;
+}
+
 NS_IMETHODIMP
 nsDOMDocumentType::GetNodeType(PRUint16* aNodeType)
 {
diff --git a/content/base/src/nsGenericDOMDataNode.h b/content/base/src/nsGenericDOMDataNode.h
index fbe73f2df91a..b6cb71bf8139 100644
--- a/content/base/src/nsGenericDOMDataNode.h
+++ b/content/base/src/nsGenericDOMDataNode.h
@@ -324,12 +324,8 @@ private:
   NS_IMETHOD GetLocalName(nsAString& aLocalName) {                          \
     return nsGenericDOMDataNode::GetLocalName(aLocalName);                  \
   }                                                                         \
-  NS_IMETHOD GetNodeValue(nsAString& aNodeValue) {                          \
-    return nsGenericDOMDataNode::GetNodeValue(aNodeValue);                  \
-  }                                                                         \
-  NS_IMETHOD SetNodeValue(const nsAString& aNodeValue) {                    \
-    return nsGenericDOMDataNode::SetNodeValue(aNodeValue);                  \
-  }                                                                         \
+  NS_IMETHOD GetNodeValue(nsAString& aNodeValue);                           \
+  NS_IMETHOD SetNodeValue(const nsAString& aNodeValue);                     \
   NS_IMETHOD GetNodeType(PRUint16* aNodeType);                              \
   NS_IMETHOD GetParentNode(nsIDOMNode** aParentNode) {                      \
     return nsGenericDOMDataNode::GetParentNode(aParentNode);                \
diff --git a/content/base/src/nsTextNode.cpp b/content/base/src/nsTextNode.cpp
index 5c18e6d71f94..b43dba42ddc1 100644
--- a/content/base/src/nsTextNode.cpp
+++ b/content/base/src/nsTextNode.cpp
@@ -120,6 +120,18 @@ nsTextNode::GetNodeName(nsAString& aNodeName)
   return NS_OK;
 }
 
+NS_IMETHODIMP
+nsTextNode::GetNodeValue(nsAString& aNodeValue)
+{
+  return nsGenericDOMDataNode::GetNodeValue(aNodeValue);
+}
+
+NS_IMETHODIMP
+nsTextNode::SetNodeValue(const nsAString& aNodeValue)
+{
+  return nsGenericDOMDataNode::SetNodeValue(aNodeValue);
+}
+
 NS_IMETHODIMP
 nsTextNode::GetNodeType(PRUint16* aNodeType)
 {
diff --git a/content/xml/content/src/nsXMLCDATASection.cpp b/content/xml/content/src/nsXMLCDATASection.cpp
index c7c7fdf64a37..90baa5ae9dd8 100644
--- a/content/xml/content/src/nsXMLCDATASection.cpp
+++ b/content/xml/content/src/nsXMLCDATASection.cpp
@@ -134,6 +134,18 @@ nsXMLCDATASection::GetNodeName(nsAString& aNodeName)
   return NS_OK;
 }
 
+NS_IMETHODIMP
+nsXMLCDATASection::GetNodeValue(nsAString& aNodeValue)
+{
+  return nsGenericDOMDataNode::GetNodeValue(aNodeValue);
+}
+
+NS_IMETHODIMP
+nsXMLCDATASection::SetNodeValue(const nsAString& aNodeValue)
+{
+  return nsGenericDOMDataNode::SetNodeValue(aNodeValue);
+}
+
 NS_IMETHODIMP
 nsXMLCDATASection::GetNodeType(PRUint16* aNodeType)
 {
diff --git a/content/xml/content/src/nsXMLProcessingInstruction.cpp b/content/xml/content/src/nsXMLProcessingInstruction.cpp
index 637c244d09d7..f562de0727d5 100644
--- a/content/xml/content/src/nsXMLProcessingInstruction.cpp
+++ b/content/xml/content/src/nsXMLProcessingInstruction.cpp
@@ -133,6 +133,18 @@ nsXMLProcessingInstruction::GetNodeName(nsAString& aNodeName)
   return NS_OK;
 }
 
+NS_IMETHODIMP
+nsXMLProcessingInstruction::GetNodeValue(nsAString& aNodeValue)
+{
+  return nsGenericDOMDataNode::GetNodeValue(aNodeValue);
+}
+
+NS_IMETHODIMP
+nsXMLProcessingInstruction::SetNodeValue(const nsAString& aNodeValue)
+{
+  return nsGenericDOMDataNode::SetNodeValue(aNodeValue);
+}
+
 NS_IMETHODIMP
 nsXMLProcessingInstruction::GetNodeType(PRUint16* aNodeType)
 {