diff --git a/mozilla/content/svg/content/src/nsISVGValue.h b/mozilla/content/svg/content/src/nsISVGValue.h
index 7680b733660..25bca83fc24 100644
--- a/mozilla/content/svg/content/src/nsISVGValue.h
+++ b/mozilla/content/svg/content/src/nsISVGValue.h
@@ -67,15 +67,15 @@ class nsISVGValue : public nsISupports
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_ISVGVALUE_IID; return iid; }
   
-  NS_IMETHOD SetValueString(const nsAReadableString& aValue)=0;
-  NS_IMETHOD GetValueString(nsAWritableString& aValue)=0;
+  NS_IMETHOD SetValueString(const nsAString& aValue)=0;
+  NS_IMETHOD GetValueString(nsAString& aValue)=0;
 
   NS_IMETHOD AddObserver(nsISVGValueObserver* observer)=0;
   NS_IMETHOD RemoveObserver(nsISVGValueObserver* observer)=0;
 };
 
 extern nsresult
-NS_CreateSVGGenericStringValue(const nsAReadableString& aValue, nsISVGValue** aResult);
+NS_CreateSVGGenericStringValue(const nsAString& aValue, nsISVGValue** aResult);
 
 #endif // __NS_ISVGVALUE_H__
 
diff --git a/mozilla/content/svg/content/src/nsSVGAnimatedLength.cpp b/mozilla/content/svg/content/src/nsSVGAnimatedLength.cpp
index b44fc4b6954..75ed55f7876 100644
--- a/mozilla/content/svg/content/src/nsSVGAnimatedLength.cpp
+++ b/mozilla/content/svg/content/src/nsSVGAnimatedLength.cpp
@@ -65,8 +65,8 @@ public:
   NS_DECL_NSIDOMSVGANIMATEDLENGTH
 
   // remainder of nsISVGValue interface:
-  NS_IMETHOD SetValueString(const nsAReadableString& aValue);
-  NS_IMETHOD GetValueString(nsAWritableString& aValue);
+  NS_IMETHOD SetValueString(const nsAString& aValue);
+  NS_IMETHOD GetValueString(nsAString& aValue);
 
   // nsISVGValueObserver
   NS_IMETHOD WillModifySVGObservable(nsISVGValue* observable);
@@ -128,14 +128,14 @@ NS_INTERFACE_MAP_END
 // nsISVGValue methods:
 
 NS_IMETHODIMP
-nsSVGAnimatedLength::SetValueString(const nsAReadableString& aValue)
+nsSVGAnimatedLength::SetValueString(const nsAString& aValue)
 {
   nsCOMPtr<nsISVGValue> value = do_QueryInterface(mBaseVal);
   return value->SetValueString(aValue);
 }
 
 NS_IMETHODIMP
-nsSVGAnimatedLength::GetValueString(nsAWritableString& aValue)
+nsSVGAnimatedLength::GetValueString(nsAString& aValue)
 {
   nsCOMPtr<nsISVGValue> value = do_QueryInterface(mBaseVal);
   return value->GetValueString(aValue);
diff --git a/mozilla/content/svg/content/src/nsSVGAnimatedRect.cpp b/mozilla/content/svg/content/src/nsSVGAnimatedRect.cpp
index 8925e3c0153..63f1afaa526 100644
--- a/mozilla/content/svg/content/src/nsSVGAnimatedRect.cpp
+++ b/mozilla/content/svg/content/src/nsSVGAnimatedRect.cpp
@@ -65,8 +65,8 @@ public:
   NS_DECL_NSIDOMSVGANIMATEDRECT
 
   // remainder of nsISVGValue interface:
-  NS_IMETHOD SetValueString(const nsAReadableString& aValue);
-  NS_IMETHOD GetValueString(nsAWritableString& aValue);
+  NS_IMETHOD SetValueString(const nsAString& aValue);
+  NS_IMETHOD GetValueString(nsAString& aValue);
 
   // nsISVGValueObserver
   NS_IMETHOD WillModifySVGObservable(nsISVGValue* observable);
@@ -119,14 +119,14 @@ NS_IMPL_ISUPPORTS4(nsSVGAnimatedRect,
 // nsISVGValue methods:
 
 NS_IMETHODIMP
-nsSVGAnimatedRect::SetValueString(const nsAReadableString& aValue)
+nsSVGAnimatedRect::SetValueString(const nsAString& aValue)
 {
   nsCOMPtr<nsISVGValue> value = do_QueryInterface(mBaseVal);
   return value->SetValueString(aValue);
 }
 
 NS_IMETHODIMP
-nsSVGAnimatedRect::GetValueString(nsAWritableString& aValue)
+nsSVGAnimatedRect::GetValueString(nsAString& aValue)
 {
   nsCOMPtr<nsISVGValue> value = do_QueryInterface(mBaseVal);
   return value->GetValueString(aValue);
diff --git a/mozilla/content/svg/content/src/nsSVGAnimatedTransformList.cpp b/mozilla/content/svg/content/src/nsSVGAnimatedTransformList.cpp
index 37275c7b2e6..2b558e2c396 100644
--- a/mozilla/content/svg/content/src/nsSVGAnimatedTransformList.cpp
+++ b/mozilla/content/svg/content/src/nsSVGAnimatedTransformList.cpp
@@ -66,8 +66,8 @@ public:
   NS_DECL_NSIDOMSVGANIMATEDTRANSFORMLIST
 
   // remainder of nsISVGValue interface:
-  NS_IMETHOD SetValueString(const nsAReadableString& aValue);
-  NS_IMETHOD GetValueString(nsAWritableString& aValue);
+  NS_IMETHOD SetValueString(const nsAString& aValue);
+  NS_IMETHOD GetValueString(nsAString& aValue);
 
   // nsISVGValueObserver
   NS_IMETHOD WillModifySVGObservable(nsISVGValue* observable);
@@ -127,14 +127,14 @@ NS_INTERFACE_MAP_END
 // nsISVGValue methods:
 
 NS_IMETHODIMP
-nsSVGAnimatedTransformList::SetValueString(const nsAReadableString& aValue)
+nsSVGAnimatedTransformList::SetValueString(const nsAString& aValue)
 {
   nsCOMPtr<nsISVGValue> value = do_QueryInterface(mBaseVal);
   return value->SetValueString(aValue);
 }
 
 NS_IMETHODIMP
-nsSVGAnimatedTransformList::GetValueString(nsAWritableString& aValue)
+nsSVGAnimatedTransformList::GetValueString(nsAString& aValue)
 {
   nsCOMPtr<nsISVGValue> value = do_QueryInterface(mBaseVal);
   return value->GetValueString(aValue);
diff --git a/mozilla/content/svg/content/src/nsSVGAttributes.cpp b/mozilla/content/svg/content/src/nsSVGAttributes.cpp
index e5899b8ce4a..70a4678965a 100644
--- a/mozilla/content/svg/content/src/nsSVGAttributes.cpp
+++ b/mozilla/content/svg/content/src/nsSVGAttributes.cpp
@@ -76,7 +76,7 @@ nsSVGAttribute::Create(nsINodeInfo* aNodeInfo,
 
 nsresult
 nsSVGAttribute::Create(nsINodeInfo* aNodeInfo,
-                       const nsAReadableString& value,
+                       const nsAString& value,
                        nsSVGAttribute** aResult)
 {
   nsCOMPtr<nsISVGValue> svg_value;
@@ -123,20 +123,20 @@ NS_INTERFACE_MAP_END
 // nsIDOMNode interface
 
 NS_IMETHODIMP
-nsSVGAttribute::GetNodeName(nsAWritableString& aNodeName)
+nsSVGAttribute::GetNodeName(nsAString& aNodeName)
 {
   GetQualifiedName(aNodeName);
   return NS_OK;
 }
 
 NS_IMETHODIMP
-nsSVGAttribute::GetNodeValue(nsAWritableString& aNodeValue)
+nsSVGAttribute::GetNodeValue(nsAString& aNodeValue)
 {
   return GetValue()->GetValueString(aNodeValue);
 }
 
 NS_IMETHODIMP
-nsSVGAttribute::SetNodeValue(const nsAReadableString& aNodeValue)
+nsSVGAttribute::SetNodeValue(const nsAString& aNodeValue)
 {
   return SetValue(aNodeValue);
 }
@@ -205,19 +205,19 @@ nsSVGAttribute::GetOwnerDocument(nsIDOMDocument** aOwnerDocument)
 }
 
 NS_IMETHODIMP
-nsSVGAttribute::GetNamespaceURI(nsAWritableString& aNamespaceURI)
+nsSVGAttribute::GetNamespaceURI(nsAString& aNamespaceURI)
 {
   return mNodeInfo->GetNamespaceURI(aNamespaceURI);
 }
 
 NS_IMETHODIMP
-nsSVGAttribute::GetPrefix(nsAWritableString& aPrefix)
+nsSVGAttribute::GetPrefix(nsAString& aPrefix)
 {
   return mNodeInfo->GetPrefix(aPrefix);
 }
 
 NS_IMETHODIMP
-nsSVGAttribute::SetPrefix(const nsAReadableString& aPrefix)
+nsSVGAttribute::SetPrefix(const nsAString& aPrefix)
 {
   // XXX: Validate the prefix string!
   
@@ -238,7 +238,7 @@ nsSVGAttribute::SetPrefix(const nsAReadableString& aPrefix)
 }
 
 NS_IMETHODIMP
-nsSVGAttribute::GetLocalName(nsAWritableString& aLocalName)
+nsSVGAttribute::GetLocalName(nsAString& aLocalName)
 {
   return mNodeInfo->GetLocalName(aLocalName);
 }
@@ -297,8 +297,8 @@ nsSVGAttribute::Normalize()
 }
 
 NS_IMETHODIMP
-nsSVGAttribute::IsSupported(const nsAReadableString& aFeature,
-                            const nsAReadableString& aVersion,
+nsSVGAttribute::IsSupported(const nsAString& aFeature,
+                            const nsAString& aVersion,
                             PRBool* aReturn)
 {
   NS_NOTYETIMPLEMENTED("write me");
@@ -309,7 +309,7 @@ nsSVGAttribute::IsSupported(const nsAReadableString& aFeature,
 // nsIDOMAttr interface
 
 NS_IMETHODIMP
-nsSVGAttribute::GetName(nsAWritableString& aName)
+nsSVGAttribute::GetName(nsAString& aName)
 {
   GetQualifiedName(aName);
   return NS_OK;
@@ -324,13 +324,13 @@ nsSVGAttribute::GetSpecified(PRBool* aSpecified)
 }
 
 NS_IMETHODIMP
-nsSVGAttribute::GetValue(nsAWritableString& aValue)
+nsSVGAttribute::GetValue(nsAString& aValue)
 {
   return GetValue()->GetValueString(aValue);
 }
 
 NS_IMETHODIMP
-nsSVGAttribute::SetValue(const nsAReadableString& aValue)
+nsSVGAttribute::SetValue(const nsAString& aValue)
 {
   if (mOwner) {
     return mOwner->SetAttr(mNodeInfo, aValue, PR_TRUE);
@@ -390,7 +390,7 @@ nsSVGAttribute::DidModifySVGObservable (nsISVGValue* observable)
 // Implementation functions
 
 void
-nsSVGAttribute::GetQualifiedName(nsAWritableString& aQualifiedName)const
+nsSVGAttribute::GetQualifiedName(nsAString& aQualifiedName)const
 {
   mNodeInfo->GetQualifiedName(aQualifiedName);
 }
@@ -535,7 +535,7 @@ nsSVGAttributes::Count() const
 NS_IMETHODIMP
 nsSVGAttributes::GetAttr(PRInt32 aNameSpaceID, nsIAtom* aName, 
                          nsIAtom*& aPrefix,
-                         nsAWritableString& aResult)
+                         nsAString& aResult)
 {
   NS_ASSERTION(nsnull != aName, "must have attribute name");
   if (nsnull == aName) {
@@ -576,7 +576,7 @@ nsSVGAttributes::GetAttr(PRInt32 aNameSpaceID, nsIAtom* aName,
 
 NS_IMETHODIMP
 nsSVGAttributes::SetAttr(nsINodeInfo* aNodeInfo,
-                         const nsAReadableString& aValue,
+                         const nsAString& aValue,
                          PRBool aNotify)
 {
   NS_ENSURE_ARG_POINTER(aNodeInfo);
@@ -765,7 +765,7 @@ nsSVGAttributes::HasAttr(PRInt32 aNameSpaceID, nsIAtom* aName) const
 }
 
 NS_IMETHODIMP
-nsSVGAttributes::NormalizeAttrString(const nsAReadableString& aStr,
+nsSVGAttributes::NormalizeAttrString(const nsAString& aStr,
                                      nsINodeInfo*& aNodeInfo)
 {
   PRInt32 indx, count = Count();
@@ -886,7 +886,7 @@ nsSVGAttributes::GetLength(PRUint32* aLength)
 }
 
 NS_IMETHODIMP
-nsSVGAttributes::GetNamedItem(const nsAReadableString& aName,
+nsSVGAttributes::GetNamedItem(const nsAString& aName,
                               nsIDOMNode** aReturn)
 {
   NS_PRECONDITION(aReturn != nsnull, "null ptr");
@@ -923,7 +923,7 @@ nsSVGAttributes::SetNamedItem(nsIDOMNode* aArg, nsIDOMNode** aReturn)
 }
 
 NS_IMETHODIMP
-nsSVGAttributes::RemoveNamedItem(const nsAReadableString& aName,
+nsSVGAttributes::RemoveNamedItem(const nsAString& aName,
                                  nsIDOMNode** aReturn)
 {
   nsCOMPtr<nsIDOMElement> element( do_QueryInterface(mContent) );
@@ -946,8 +946,8 @@ nsSVGAttributes::Item(PRUint32 aIndex, nsIDOMNode** aReturn)
 }
 
 nsresult
-nsSVGAttributes::GetNamedItemNS(const nsAReadableString& aNamespaceURI, 
-                                const nsAReadableString& aLocalName,
+nsSVGAttributes::GetNamedItemNS(const nsAString& aNamespaceURI, 
+                                const nsAString& aLocalName,
                                 nsIDOMNode** aReturn)
 {
   NS_NOTYETIMPLEMENTED("write me");
@@ -962,8 +962,8 @@ nsSVGAttributes::SetNamedItemNS(nsIDOMNode* aArg, nsIDOMNode** aReturn)
 }
 
 nsresult
-nsSVGAttributes::RemoveNamedItemNS(const nsAReadableString& aNamespaceURI, 
-                                   const nsAReadableString& aLocalName,
+nsSVGAttributes::RemoveNamedItemNS(const nsAString& aNamespaceURI, 
+                                   const nsAString& aLocalName,
                                    nsIDOMNode** aReturn)
 {
   NS_NOTYETIMPLEMENTED("write me");
diff --git a/mozilla/content/svg/content/src/nsSVGAttributes.h b/mozilla/content/svg/content/src/nsSVGAttributes.h
index 43cbd55b742..aba90089b82 100644
--- a/mozilla/content/svg/content/src/nsSVGAttributes.h
+++ b/mozilla/content/svg/content/src/nsSVGAttributes.h
@@ -88,7 +88,7 @@ public:
   // create a generic string attribute:
   static nsresult
   Create(nsINodeInfo* aNodeInfo,
-         const nsAReadableString& value,
+         const nsAString& value,
          nsSVGAttribute** aResult);
 
 protected:
@@ -122,7 +122,7 @@ public:
   
   // other implementation functions
   nsINodeInfo* GetNodeInfo()const { return mNodeInfo; }
-  void GetQualifiedName(nsAWritableString& aQualifiedName)const;
+  void GetQualifiedName(nsAString& aQualifiedName)const;
 
   nsISVGValue* GetValue() { return mValue; }
 
@@ -164,15 +164,15 @@ public:
   PRInt32 Count() const;
   NS_IMETHOD GetAttr(PRInt32 aNameSpaceID, nsIAtom* aName, 
                      nsIAtom*& aPrefix,
-                     nsAWritableString& aResult);
+                     nsAString& aResult);
   NS_IMETHOD SetAttr(nsINodeInfo* aNodeInfo,
-                     const nsAReadableString& aValue,
+                     const nsAString& aValue,
                      PRBool aNotify);
   NS_IMETHOD UnsetAttr(PRInt32 aNameSpaceID, nsIAtom* aName, 
                        PRBool aNotify);
   NS_IMETHOD_(PRBool) HasAttr(PRInt32 aNameSpaceID,
                               nsIAtom* aName) const;
-  NS_IMETHOD NormalizeAttrString(const nsAReadableString& aStr,
+  NS_IMETHOD NormalizeAttrString(const nsAString& aStr,
                                  nsINodeInfo*& aNodeInfo);
   NS_IMETHOD GetAttrNameAt(PRInt32 aIndex,
                            PRInt32& aNameSpaceID, 
diff --git a/mozilla/content/svg/content/src/nsSVGElement.cpp b/mozilla/content/svg/content/src/nsSVGElement.cpp
index f12f2968b0f..683966b3e37 100644
--- a/mozilla/content/svg/content/src/nsSVGElement.cpp
+++ b/mozilla/content/svg/content/src/nsSVGElement.cpp
@@ -324,7 +324,7 @@ nsSVGElement::RemoveChildAt(PRInt32 aIndex, PRBool aNotify)
 }
 
 NS_IMETHODIMP
-nsSVGElement::NormalizeAttrString(const nsAReadableString& aStr,
+nsSVGElement::NormalizeAttrString(const nsAString& aStr,
                                        nsINodeInfo*& aNodeInfo)
 {
   return mAttributes->NormalizeAttrString(aStr, aNodeInfo);
@@ -332,7 +332,7 @@ nsSVGElement::NormalizeAttrString(const nsAReadableString& aStr,
 
 NS_IMETHODIMP
 nsSVGElement::SetAttr(PRInt32 aNameSpaceID, nsIAtom* aName, 
-                      const nsAReadableString& aValue,
+                      const nsAString& aValue,
                       PRBool aNotify)
 {
     nsCOMPtr<nsINodeInfoManager> nimgr;
@@ -348,7 +348,7 @@ nsSVGElement::SetAttr(PRInt32 aNameSpaceID, nsIAtom* aName,
 
 NS_IMETHODIMP
 nsSVGElement::SetAttr(nsINodeInfo* aNodeInfo,
-                      const nsAReadableString& aValue,
+                      const nsAString& aValue,
                       PRBool aNotify)
 {
   return mAttributes->SetAttr(aNodeInfo, aValue, aNotify);  
@@ -356,7 +356,7 @@ nsSVGElement::SetAttr(nsINodeInfo* aNodeInfo,
 
 NS_IMETHODIMP
 nsSVGElement::GetAttr(PRInt32 aNameSpaceID, nsIAtom* aName, 
-                           nsAWritableString& aResult) const
+                           nsAString& aResult) const
 {
   nsCOMPtr<nsIAtom> prefix;
   return GetAttr(aNameSpaceID, aName, *getter_AddRefs(prefix), aResult);
@@ -365,7 +365,7 @@ nsSVGElement::GetAttr(PRInt32 aNameSpaceID, nsIAtom* aName,
 NS_IMETHODIMP
 nsSVGElement::GetAttr(PRInt32 aNameSpaceID, nsIAtom* aName, 
                       nsIAtom*& aPrefix,
-                      nsAWritableString& aResult) const
+                      nsAString& aResult) const
 {
   return mAttributes->GetAttr(aNameSpaceID, aName, aPrefix, aResult);
 }
@@ -500,20 +500,20 @@ nsSVGElement::GetMappedAttributeImpact(const nsIAtom* aAttribute, PRInt32 aModTy
 // nsIDOMNode methods
 
 NS_IMETHODIMP
-nsSVGElement::GetNodeName(nsAWritableString& aNodeName)
+nsSVGElement::GetNodeName(nsAString& aNodeName)
 {
   return mNodeInfo->GetQualifiedName(aNodeName);
 }
 
 NS_IMETHODIMP
-nsSVGElement::GetNodeValue(nsAWritableString& aNodeValue)
+nsSVGElement::GetNodeValue(nsAString& aNodeValue)
 {
   aNodeValue.Truncate();
   return NS_OK;
 }
 
 NS_IMETHODIMP
-nsSVGElement::SetNodeValue(const nsAReadableString& aNodeValue)
+nsSVGElement::SetNodeValue(const nsAString& aNodeValue)
 {
   return NS_ERROR_DOM_NO_MODIFICATION_ALLOWED_ERR;
 }
@@ -614,25 +614,25 @@ nsSVGElement::GetOwnerDocument(nsIDOMDocument** aOwnerDocument)
 }
 
 NS_IMETHODIMP
-nsSVGElement::GetNamespaceURI(nsAWritableString& aNamespaceURI)
+nsSVGElement::GetNamespaceURI(nsAString& aNamespaceURI)
 {
   return mNodeInfo->GetNamespaceURI(aNamespaceURI);
 }
 
 NS_IMETHODIMP
-nsSVGElement::GetPrefix(nsAWritableString& aPrefix)
+nsSVGElement::GetPrefix(nsAString& aPrefix)
 {
   return nsGenericElement::GetPrefix(aPrefix);
 }
 
 NS_IMETHODIMP
-nsSVGElement::SetPrefix(const nsAReadableString& aPrefix)
+nsSVGElement::SetPrefix(const nsAString& aPrefix)
 {
   return nsGenericElement::SetPrefix(aPrefix);
 }
 
 NS_IMETHODIMP
-nsSVGElement::GetLocalName(nsAWritableString& aLocalName)
+nsSVGElement::GetLocalName(nsAString& aLocalName)
 {
   return nsGenericElement::GetLocalName(aLocalName);
 }
@@ -687,7 +687,7 @@ nsSVGElement::Normalize()
 }
 
 NS_IMETHODIMP
-nsSVGElement::IsSupported(const nsAReadableString& aFeature, const nsAReadableString& aVersion, PRBool* aReturn)
+nsSVGElement::IsSupported(const nsAString& aFeature, const nsAString& aVersion, PRBool* aReturn)
 {
   NS_NOTYETIMPLEMENTED("write me!");
   return NS_ERROR_NOT_IMPLEMENTED;
@@ -717,12 +717,12 @@ nsSVGElement::HasAttributes(PRBool* aReturn)
 // nsIDOMSVGElement methods
 
 /* attribute DOMString id; */
-NS_IMETHODIMP nsSVGElement::GetId(nsAWritableString & aId)
+NS_IMETHODIMP nsSVGElement::GetId(nsAString & aId)
 {
   return GetAttribute(NS_LITERAL_STRING("id"), aId);
 }
 
-NS_IMETHODIMP nsSVGElement::SetId(const nsAReadableString & aId)
+NS_IMETHODIMP nsSVGElement::SetId(const nsAString & aId)
 {
   return SetAttribute(NS_LITERAL_STRING("id"), aId);
 }
diff --git a/mozilla/content/svg/content/src/nsSVGElement.h b/mozilla/content/svg/content/src/nsSVGElement.h
index 8ccc27d64bb..d5034b72dbd 100644
--- a/mozilla/content/svg/content/src/nsSVGElement.h
+++ b/mozilla/content/svg/content/src/nsSVGElement.h
@@ -94,19 +94,19 @@ public:
   NS_IMETHOD AppendChildTo(nsIContent* aKid, PRBool aNotify,
                            PRBool aDeepSetDocument);
   NS_IMETHOD RemoveChildAt(PRInt32 aIndex, PRBool aNotify);
-  NS_IMETHOD NormalizeAttrString(const nsAReadableString& aStr,
+  NS_IMETHOD NormalizeAttrString(const nsAString& aStr,
                                  nsINodeInfo*& aNodeInfo);
   NS_IMETHOD SetAttr(PRInt32 aNameSpaceID, nsIAtom* aName, 
-                     const nsAReadableString& aValue,
+                     const nsAString& aValue,
                           PRBool aNotify);
   NS_IMETHOD SetAttr(nsINodeInfo* aNodeInfo,
-                     const nsAReadableString& aValue,
+                     const nsAString& aValue,
                      PRBool aNotify);
   NS_IMETHOD GetAttr(PRInt32 aNameSpaceID, nsIAtom* aName, 
-                     nsAWritableString& aResult) const;
+                     nsAString& aResult) const;
   NS_IMETHOD GetAttr(PRInt32 aNameSpaceID, nsIAtom* aName, 
                      nsIAtom*& aPrefix,
-                     nsAWritableString& aResult) const;
+                     nsAString& aResult) const;
   NS_IMETHOD_(PRBool) HasAttr(PRInt32 aNameSpaceID, nsIAtom* aName) const;
   NS_IMETHOD UnsetAttr(PRInt32 aNameSpaceID, nsIAtom* aAttribute, 
                        PRBool aNotify);
diff --git a/mozilla/content/svg/content/src/nsSVGGenericStringValue.cpp b/mozilla/content/svg/content/src/nsSVGGenericStringValue.cpp
index ecdc9f3e221..84405627882 100644
--- a/mozilla/content/svg/content/src/nsSVGGenericStringValue.cpp
+++ b/mozilla/content/svg/content/src/nsSVGGenericStringValue.cpp
@@ -45,17 +45,17 @@ class nsSVGGenericStringValue : public nsSVGValue
 {
 protected:
   friend nsresult
-  NS_CreateSVGGenericStringValue(const nsAReadableString& aValue, nsISVGValue** aResult);
+  NS_CreateSVGGenericStringValue(const nsAString& aValue, nsISVGValue** aResult);
   
-  nsSVGGenericStringValue(const nsAReadableString& aValue);
+  nsSVGGenericStringValue(const nsAString& aValue);
   virtual ~nsSVGGenericStringValue();
   
 public:
   NS_DECL_ISUPPORTS
 
   // nsISVGValue interface: 
-  NS_IMETHOD SetValueString(const nsAReadableString& aValue);
-  NS_IMETHOD GetValueString(nsAWritableString& aValue);
+  NS_IMETHOD SetValueString(const nsAString& aValue);
+  NS_IMETHOD GetValueString(nsAString& aValue);
 
 protected:
   nsString mValue;
@@ -63,7 +63,7 @@ protected:
 
 
 nsresult
-NS_CreateSVGGenericStringValue(const nsAReadableString& aValue,
+NS_CreateSVGGenericStringValue(const nsAString& aValue,
                                nsISVGValue** aResult)
 {
   NS_PRECONDITION(aResult != nsnull, "null ptr");
@@ -76,7 +76,7 @@ NS_CreateSVGGenericStringValue(const nsAReadableString& aValue,
   return NS_OK;
 }
 
-nsSVGGenericStringValue::nsSVGGenericStringValue(const nsAReadableString& aValue)
+nsSVGGenericStringValue::nsSVGGenericStringValue(const nsAString& aValue)
 {
   NS_INIT_ISUPPORTS();
   mValue = aValue;
@@ -95,7 +95,7 @@ NS_IMPL_ISUPPORTS1(nsSVGGenericStringValue, nsISVGValue);
 // nsISVGValue methods:
 
 NS_IMETHODIMP
-nsSVGGenericStringValue::SetValueString(const nsAReadableString& aValue)
+nsSVGGenericStringValue::SetValueString(const nsAString& aValue)
 {
   WillModify();
   mValue = aValue;
@@ -104,7 +104,7 @@ nsSVGGenericStringValue::SetValueString(const nsAReadableString& aValue)
 }
 
 NS_IMETHODIMP
-nsSVGGenericStringValue::GetValueString(nsAWritableString& aValue)
+nsSVGGenericStringValue::GetValueString(nsAString& aValue)
 {
   aValue = mValue;
   return NS_OK;
diff --git a/mozilla/content/svg/content/src/nsSVGLength.cpp b/mozilla/content/svg/content/src/nsSVGLength.cpp
index c488b110630..c07a8d0731f 100644
--- a/mozilla/content/svg/content/src/nsSVGLength.cpp
+++ b/mozilla/content/svg/content/src/nsSVGLength.cpp
@@ -74,8 +74,8 @@ public:
   NS_DECL_NSIDOMSVGLENGTH
 
   // nsISVGValue interface:
-  NS_IMETHOD SetValueString(const nsAReadableString& aValue);
-  NS_IMETHOD GetValueString(nsAWritableString& aValue);
+  NS_IMETHOD SetValueString(const nsAString& aValue);
+  NS_IMETHOD GetValueString(nsAString& aValue);
   
   
 protected:
@@ -83,7 +83,7 @@ protected:
   float UserUnitsPerPixel();
   float mmPerPixel();
   float ViewportDimension();
-  void  GetUnitString(nsAWritableString& unit);
+  void  GetUnitString(nsAString& unit);
   PRUint16 GetUnitTypeForString(const char* unitStr);
   PRBool IsValidUnitType(PRUint16 unit);
   
@@ -149,13 +149,13 @@ NS_INTERFACE_MAP_END
 //----------------------------------------------------------------------
 // nsISVGValue methods:
 NS_IMETHODIMP
-nsSVGLength::SetValueString(const nsAReadableString& aValue)
+nsSVGLength::SetValueString(const nsAString& aValue)
 {
   return SetValueAsString(aValue);
 }
 
 NS_IMETHODIMP
-nsSVGLength::GetValueString(nsAWritableString& aValue)
+nsSVGLength::GetValueString(nsAString& aValue)
 {
   return GetValueAsString(aValue);
 }
@@ -277,7 +277,7 @@ nsSVGLength::SetValueInSpecifiedUnits(float aValueInSpecifiedUnits)
 
 /* attribute DOMString valueAsString; */
 NS_IMETHODIMP
-nsSVGLength::GetValueAsString(nsAWritableString & aValueAsString)
+nsSVGLength::GetValueAsString(nsAString & aValueAsString)
 {
   aValueAsString.Truncate();
 
@@ -293,7 +293,7 @@ nsSVGLength::GetValueAsString(nsAWritableString & aValueAsString)
 }
 
 NS_IMETHODIMP
-nsSVGLength::SetValueAsString(const nsAReadableString & aValueAsString)
+nsSVGLength::SetValueAsString(const nsAString & aValueAsString)
 {
   nsresult rv = NS_OK;
   
@@ -528,7 +528,7 @@ float nsSVGLength::ViewportDimension()
   return d;
 }
 
-void nsSVGLength::GetUnitString(nsAWritableString& unit)
+void nsSVGLength::GetUnitString(nsAString& unit)
 {
   nsIAtom* UnitAtom = nsnull;
   
diff --git a/mozilla/content/svg/content/src/nsSVGMatrix.cpp b/mozilla/content/svg/content/src/nsSVGMatrix.cpp
index 9365d4fd769..3df5f45a283 100644
--- a/mozilla/content/svg/content/src/nsSVGMatrix.cpp
+++ b/mozilla/content/svg/content/src/nsSVGMatrix.cpp
@@ -337,14 +337,14 @@ NS_IMETHODIMP nsSVGMatrix::SkewY(float angle, nsIDOMSVGMatrix **_retval)
 //----------------------------------------------------------------------
 // nsISVGValue methods:
 NS_IMETHODIMP
-nsSVGMatrix::SetValueString(const nsAReadableString& aValue)
+nsSVGMatrix::SetValueString(const nsAString& aValue)
 {
   NS_NOTYETIMPLEMENTED("write me!");
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
 NS_IMETHODIMP
-nsSVGMatrix::GetValueString(nsAWritableString& aValue)
+nsSVGMatrix::GetValueString(nsAString& aValue)
 {
   NS_NOTYETIMPLEMENTED("write me!");
   return NS_ERROR_NOT_IMPLEMENTED;
diff --git a/mozilla/content/svg/content/src/nsSVGMatrix.h b/mozilla/content/svg/content/src/nsSVGMatrix.h
index cb9722c85fc..bf44de383d3 100644
--- a/mozilla/content/svg/content/src/nsSVGMatrix.h
+++ b/mozilla/content/svg/content/src/nsSVGMatrix.h
@@ -64,8 +64,8 @@ public:
   NS_DECL_NSIDOMSVGMATRIX
 
   // nsISVGValue interface:
-  NS_IMETHOD SetValueString(const nsAReadableString& aValue);
-  NS_IMETHOD GetValueString(nsAWritableString& aValue);
+  NS_IMETHOD SetValueString(const nsAString& aValue);
+  NS_IMETHOD GetValueString(nsAString& aValue);
   
   
 protected:
diff --git a/mozilla/content/svg/content/src/nsSVGPathSeg.cpp b/mozilla/content/svg/content/src/nsSVGPathSeg.cpp
index 1147010dfd3..097703e6b1e 100644
--- a/mozilla/content/svg/content/src/nsSVGPathSeg.cpp
+++ b/mozilla/content/svg/content/src/nsSVGPathSeg.cpp
@@ -53,7 +53,7 @@ cname::GetPathSegType(PRUint16 *aPathSegType)                           \
 }                                                                       \
                                                                         \
 NS_IMETHODIMP                                                           \
-cname::GetPathSegTypeAsLetter(nsAWritableString & aPathSegTypeAsLetter) \
+cname::GetPathSegTypeAsLetter(nsAString & aPathSegTypeAsLetter)         \
 {                                                                       \
   aPathSegTypeAsLetter.Truncate();                                      \
   aPathSegTypeAsLetter.Append(NS_LITERAL_STRING(letter));               \
@@ -91,8 +91,8 @@ public:
   NS_DECL_NSIDOMSVGPATHSEGCLOSEPATH
   
   // nsISVGValue interface:
-  NS_IMETHOD SetValueString(const nsAReadableString& aValue);
-  NS_IMETHOD GetValueString(nsAWritableString& aValue);
+  NS_IMETHOD SetValueString(const nsAString& aValue);
+  NS_IMETHOD GetValueString(nsAString& aValue);
 };
 
 //----------------------------------------------------------------------
@@ -121,14 +121,14 @@ NS_IMPL_NSISUPPORTS_SVGPATHSEG(SVGPathSegClosePath)
 //----------------------------------------------------------------------
 // nsISVGValue methods:
 NS_IMETHODIMP
-nsSVGPathSegClosePath::SetValueString(const nsAReadableString& aValue)
+nsSVGPathSegClosePath::SetValueString(const nsAString& aValue)
 {
   NS_NOTYETIMPLEMENTED("write me!");
   return NS_ERROR_UNEXPECTED;
 }
 
 NS_IMETHODIMP
-nsSVGPathSegClosePath::GetValueString(nsAWritableString& aValue)
+nsSVGPathSegClosePath::GetValueString(nsAString& aValue)
 {
   aValue.Truncate();
   aValue.Append(NS_LITERAL_STRING("z"));
@@ -159,8 +159,8 @@ public:
   NS_DECL_NSIDOMSVGPATHSEG
   
   // nsISVGValue interface:
-  NS_IMETHOD SetValueString(const nsAReadableString& aValue);
-  NS_IMETHOD GetValueString(nsAWritableString& aValue);
+  NS_IMETHOD SetValueString(const nsAString& aValue);
+  NS_IMETHOD GetValueString(nsAString& aValue);
   
   
 protected:
@@ -195,14 +195,14 @@ NS_IMPL_NSISUPPORTS_SVGPATHSEG(SVGPathSegMovetoAbs)
 //----------------------------------------------------------------------
 // nsISVGValue methods:
 NS_IMETHODIMP
-nsSVGPathSegMovetoAbs::SetValueString(const nsAReadableString& aValue)
+nsSVGPathSegMovetoAbs::SetValueString(const nsAString& aValue)
 {
   NS_NOTYETIMPLEMENTED("write me!");
   return NS_ERROR_UNEXPECTED;
 }
 
 NS_IMETHODIMP
-nsSVGPathSegMovetoAbs::GetValueString(nsAWritableString& aValue)
+nsSVGPathSegMovetoAbs::GetValueString(nsAString& aValue)
 {
   aValue.Truncate();
 
@@ -268,8 +268,8 @@ public:
   NS_DECL_NSIDOMSVGPATHSEG
   
   // nsISVGValue interface:
-  NS_IMETHOD SetValueString(const nsAReadableString& aValue);
-  NS_IMETHOD GetValueString(nsAWritableString& aValue);
+  NS_IMETHOD SetValueString(const nsAString& aValue);
+  NS_IMETHOD GetValueString(nsAString& aValue);
   
   
 protected:
@@ -304,14 +304,14 @@ NS_IMPL_NSISUPPORTS_SVGPATHSEG(SVGPathSegMovetoRel)
 //----------------------------------------------------------------------
 // nsISVGValue methods:
 NS_IMETHODIMP
-nsSVGPathSegMovetoRel::SetValueString(const nsAReadableString& aValue)
+nsSVGPathSegMovetoRel::SetValueString(const nsAString& aValue)
 {
   NS_NOTYETIMPLEMENTED("write me!");
   return NS_ERROR_UNEXPECTED;
 }
 
 NS_IMETHODIMP
-nsSVGPathSegMovetoRel::GetValueString(nsAWritableString& aValue)
+nsSVGPathSegMovetoRel::GetValueString(nsAString& aValue)
 {
   aValue.Truncate();
 
@@ -376,8 +376,8 @@ public:
   NS_DECL_NSIDOMSVGPATHSEG
   
   // nsISVGValue interface:
-  NS_IMETHOD SetValueString(const nsAReadableString& aValue);
-  NS_IMETHOD GetValueString(nsAWritableString& aValue);
+  NS_IMETHOD SetValueString(const nsAString& aValue);
+  NS_IMETHOD GetValueString(nsAString& aValue);
   
   
 protected:
@@ -412,14 +412,14 @@ NS_IMPL_NSISUPPORTS_SVGPATHSEG(SVGPathSegLinetoAbs)
 //----------------------------------------------------------------------
 // nsISVGValue methods:
 NS_IMETHODIMP
-nsSVGPathSegLinetoAbs::SetValueString(const nsAReadableString& aValue)
+nsSVGPathSegLinetoAbs::SetValueString(const nsAString& aValue)
 {
   NS_NOTYETIMPLEMENTED("write me!");
   return NS_ERROR_UNEXPECTED;
 }
 
 NS_IMETHODIMP
-nsSVGPathSegLinetoAbs::GetValueString(nsAWritableString& aValue)
+nsSVGPathSegLinetoAbs::GetValueString(nsAString& aValue)
 {
   aValue.Truncate();
 
@@ -485,8 +485,8 @@ public:
   NS_DECL_NSIDOMSVGPATHSEG
   
   // nsISVGValue interface:
-  NS_IMETHOD SetValueString(const nsAReadableString& aValue);
-  NS_IMETHOD GetValueString(nsAWritableString& aValue);
+  NS_IMETHOD SetValueString(const nsAString& aValue);
+  NS_IMETHOD GetValueString(nsAString& aValue);
   
   
 protected:
@@ -521,14 +521,14 @@ NS_IMPL_NSISUPPORTS_SVGPATHSEG(SVGPathSegLinetoRel)
 //----------------------------------------------------------------------
 // nsISVGValue methods:
 NS_IMETHODIMP
-nsSVGPathSegLinetoRel::SetValueString(const nsAReadableString& aValue)
+nsSVGPathSegLinetoRel::SetValueString(const nsAString& aValue)
 {
   NS_NOTYETIMPLEMENTED("write me!");
   return NS_ERROR_UNEXPECTED;
 }
 
 NS_IMETHODIMP
-nsSVGPathSegLinetoRel::GetValueString(nsAWritableString& aValue)
+nsSVGPathSegLinetoRel::GetValueString(nsAString& aValue)
 {
   aValue.Truncate();
 
@@ -596,8 +596,8 @@ public:
   NS_DECL_NSIDOMSVGPATHSEG
   
   // nsISVGValue interface:
-  NS_IMETHOD SetValueString(const nsAReadableString& aValue);
-  NS_IMETHOD GetValueString(nsAWritableString& aValue);
+  NS_IMETHOD SetValueString(const nsAString& aValue);
+  NS_IMETHOD GetValueString(nsAString& aValue);
   
   
 protected:
@@ -636,14 +636,14 @@ NS_IMPL_NSISUPPORTS_SVGPATHSEG(SVGPathSegCurvetoCubicAbs)
 //----------------------------------------------------------------------
 // nsISVGValue methods:
 NS_IMETHODIMP
-nsSVGPathSegCurvetoCubicAbs::SetValueString(const nsAReadableString& aValue)
+nsSVGPathSegCurvetoCubicAbs::SetValueString(const nsAString& aValue)
 {
   NS_NOTYETIMPLEMENTED("write me!");
   return NS_ERROR_UNEXPECTED;
 }
 
 NS_IMETHODIMP
-nsSVGPathSegCurvetoCubicAbs::GetValueString(nsAWritableString& aValue)
+nsSVGPathSegCurvetoCubicAbs::GetValueString(nsAString& aValue)
 {
   aValue.Truncate();
 
@@ -768,8 +768,8 @@ public:
   NS_DECL_NSIDOMSVGPATHSEG
   
   // nsISVGValue interface:
-  NS_IMETHOD SetValueString(const nsAReadableString& aValue);
-  NS_IMETHOD GetValueString(nsAWritableString& aValue);
+  NS_IMETHOD SetValueString(const nsAString& aValue);
+  NS_IMETHOD GetValueString(nsAString& aValue);
   
   
 protected:
@@ -808,14 +808,14 @@ NS_IMPL_NSISUPPORTS_SVGPATHSEG(SVGPathSegCurvetoCubicRel)
 //----------------------------------------------------------------------
 // nsISVGValue methods:
 NS_IMETHODIMP
-nsSVGPathSegCurvetoCubicRel::SetValueString(const nsAReadableString& aValue)
+nsSVGPathSegCurvetoCubicRel::SetValueString(const nsAString& aValue)
 {
   NS_NOTYETIMPLEMENTED("write me!");
   return NS_ERROR_UNEXPECTED;
 }
 
 NS_IMETHODIMP
-nsSVGPathSegCurvetoCubicRel::GetValueString(nsAWritableString& aValue)
+nsSVGPathSegCurvetoCubicRel::GetValueString(nsAString& aValue)
 {
   aValue.Truncate();
 
@@ -938,8 +938,8 @@ public:
   NS_DECL_NSIDOMSVGPATHSEG
   
   // nsISVGValue interface:
-  NS_IMETHOD SetValueString(const nsAReadableString& aValue);
-  NS_IMETHOD GetValueString(nsAWritableString& aValue);
+  NS_IMETHOD SetValueString(const nsAString& aValue);
+  NS_IMETHOD GetValueString(nsAString& aValue);
   
   
 protected:
@@ -976,14 +976,14 @@ NS_IMPL_NSISUPPORTS_SVGPATHSEG(SVGPathSegCurvetoQuadraticAbs)
 //----------------------------------------------------------------------
 // nsISVGValue methods:
 NS_IMETHODIMP
-nsSVGPathSegCurvetoQuadraticAbs::SetValueString(const nsAReadableString& aValue)
+nsSVGPathSegCurvetoQuadraticAbs::SetValueString(const nsAString& aValue)
 {
   NS_NOTYETIMPLEMENTED("write me!");
   return NS_ERROR_UNEXPECTED;
 }
 
 NS_IMETHODIMP
-nsSVGPathSegCurvetoQuadraticAbs::GetValueString(nsAWritableString& aValue)
+nsSVGPathSegCurvetoQuadraticAbs::GetValueString(nsAString& aValue)
 {
   aValue.Truncate();
 
@@ -1079,8 +1079,8 @@ public:
   NS_DECL_NSIDOMSVGPATHSEG
   
   // nsISVGValue interface:
-  NS_IMETHOD SetValueString(const nsAReadableString& aValue);
-  NS_IMETHOD GetValueString(nsAWritableString& aValue);
+  NS_IMETHOD SetValueString(const nsAString& aValue);
+  NS_IMETHOD GetValueString(nsAString& aValue);
   
   
 protected:
@@ -1117,14 +1117,14 @@ NS_IMPL_NSISUPPORTS_SVGPATHSEG(SVGPathSegCurvetoQuadraticRel)
 //----------------------------------------------------------------------
 // nsISVGValue methods:
 NS_IMETHODIMP
-nsSVGPathSegCurvetoQuadraticRel::SetValueString(const nsAReadableString& aValue)
+nsSVGPathSegCurvetoQuadraticRel::SetValueString(const nsAString& aValue)
 {
   NS_NOTYETIMPLEMENTED("write me!");
   return NS_ERROR_UNEXPECTED;
 }
 
 NS_IMETHODIMP
-nsSVGPathSegCurvetoQuadraticRel::GetValueString(nsAWritableString& aValue)
+nsSVGPathSegCurvetoQuadraticRel::GetValueString(nsAString& aValue)
 {
   aValue.Truncate();
 
@@ -1221,8 +1221,8 @@ public:
   NS_DECL_NSIDOMSVGPATHSEG
   
   // nsISVGValue interface:
-  NS_IMETHOD SetValueString(const nsAReadableString& aValue);
-  NS_IMETHOD GetValueString(nsAWritableString& aValue);
+  NS_IMETHOD SetValueString(const nsAString& aValue);
+  NS_IMETHOD GetValueString(nsAString& aValue);
   
   
 protected:
@@ -1264,14 +1264,14 @@ NS_IMPL_NSISUPPORTS_SVGPATHSEG(SVGPathSegArcAbs)
 //----------------------------------------------------------------------
 // nsISVGValue methods:
 NS_IMETHODIMP
-nsSVGPathSegArcAbs::SetValueString(const nsAReadableString& aValue)
+nsSVGPathSegArcAbs::SetValueString(const nsAString& aValue)
 {
   NS_NOTYETIMPLEMENTED("write me!");
   return NS_ERROR_UNEXPECTED;
 }
 
 NS_IMETHODIMP
-nsSVGPathSegArcAbs::GetValueString(nsAWritableString& aValue)
+nsSVGPathSegArcAbs::GetValueString(nsAString& aValue)
 {
   aValue.Truncate();
 
@@ -1411,8 +1411,8 @@ public:
   NS_DECL_NSIDOMSVGPATHSEG
   
   // nsISVGValue interface:
-  NS_IMETHOD SetValueString(const nsAReadableString& aValue);
-  NS_IMETHOD GetValueString(nsAWritableString& aValue);
+  NS_IMETHOD SetValueString(const nsAString& aValue);
+  NS_IMETHOD GetValueString(nsAString& aValue);
   
   
 protected:
@@ -1454,14 +1454,14 @@ NS_IMPL_NSISUPPORTS_SVGPATHSEG(SVGPathSegArcRel)
 //----------------------------------------------------------------------
 // nsISVGValue methods:
 NS_IMETHODIMP
-nsSVGPathSegArcRel::SetValueString(const nsAReadableString& aValue)
+nsSVGPathSegArcRel::SetValueString(const nsAString& aValue)
 {
   NS_NOTYETIMPLEMENTED("write me!");
   return NS_ERROR_UNEXPECTED;
 }
 
 NS_IMETHODIMP
-nsSVGPathSegArcRel::GetValueString(nsAWritableString& aValue)
+nsSVGPathSegArcRel::GetValueString(nsAString& aValue)
 {
   aValue.Truncate();
 
@@ -1598,8 +1598,8 @@ public:
   NS_DECL_NSIDOMSVGPATHSEG
   
   // nsISVGValue interface:
-  NS_IMETHOD SetValueString(const nsAReadableString& aValue);
-  NS_IMETHOD GetValueString(nsAWritableString& aValue);
+  NS_IMETHOD SetValueString(const nsAString& aValue);
+  NS_IMETHOD GetValueString(nsAString& aValue);
   
   
 protected:
@@ -1633,14 +1633,14 @@ NS_IMPL_NSISUPPORTS_SVGPATHSEG(SVGPathSegLinetoHorizontalAbs)
 //----------------------------------------------------------------------
 // nsISVGValue methods:
 NS_IMETHODIMP
-nsSVGPathSegLinetoHorizontalAbs::SetValueString(const nsAReadableString& aValue)
+nsSVGPathSegLinetoHorizontalAbs::SetValueString(const nsAString& aValue)
 {
   NS_NOTYETIMPLEMENTED("write me!");
   return NS_ERROR_UNEXPECTED;
 }
 
 NS_IMETHODIMP
-nsSVGPathSegLinetoHorizontalAbs::GetValueString(nsAWritableString& aValue)
+nsSVGPathSegLinetoHorizontalAbs::GetValueString(nsAString& aValue)
 {
   aValue.Truncate();
 
@@ -1691,8 +1691,8 @@ public:
   NS_DECL_NSIDOMSVGPATHSEG
   
   // nsISVGValue interface:
-  NS_IMETHOD SetValueString(const nsAReadableString& aValue);
-  NS_IMETHOD GetValueString(nsAWritableString& aValue);
+  NS_IMETHOD SetValueString(const nsAString& aValue);
+  NS_IMETHOD GetValueString(nsAString& aValue);
   
   
 protected:
@@ -1726,14 +1726,14 @@ NS_IMPL_NSISUPPORTS_SVGPATHSEG(SVGPathSegLinetoHorizontalRel)
 //----------------------------------------------------------------------
 // nsISVGValue methods:
 NS_IMETHODIMP
-nsSVGPathSegLinetoHorizontalRel::SetValueString(const nsAReadableString& aValue)
+nsSVGPathSegLinetoHorizontalRel::SetValueString(const nsAString& aValue)
 {
   NS_NOTYETIMPLEMENTED("write me!");
   return NS_ERROR_UNEXPECTED;
 }
 
 NS_IMETHODIMP
-nsSVGPathSegLinetoHorizontalRel::GetValueString(nsAWritableString& aValue)
+nsSVGPathSegLinetoHorizontalRel::GetValueString(nsAString& aValue)
 {
   aValue.Truncate();
 
@@ -1784,8 +1784,8 @@ public:
   NS_DECL_NSIDOMSVGPATHSEG
   
   // nsISVGValue interface:
-  NS_IMETHOD SetValueString(const nsAReadableString& aValue);
-  NS_IMETHOD GetValueString(nsAWritableString& aValue);
+  NS_IMETHOD SetValueString(const nsAString& aValue);
+  NS_IMETHOD GetValueString(nsAString& aValue);
   
   
 protected:
@@ -1819,14 +1819,14 @@ NS_IMPL_NSISUPPORTS_SVGPATHSEG(SVGPathSegLinetoVerticalAbs)
 //----------------------------------------------------------------------
 // nsISVGValue methods:
 NS_IMETHODIMP
-nsSVGPathSegLinetoVerticalAbs::SetValueString(const nsAReadableString& aValue)
+nsSVGPathSegLinetoVerticalAbs::SetValueString(const nsAString& aValue)
 {
   NS_NOTYETIMPLEMENTED("write me!");
   return NS_ERROR_UNEXPECTED;
 }
 
 NS_IMETHODIMP
-nsSVGPathSegLinetoVerticalAbs::GetValueString(nsAWritableString& aValue)
+nsSVGPathSegLinetoVerticalAbs::GetValueString(nsAString& aValue)
 {
   aValue.Truncate();
 
@@ -1877,8 +1877,8 @@ public:
   NS_DECL_NSIDOMSVGPATHSEG
   
   // nsISVGValue interface:
-  NS_IMETHOD SetValueString(const nsAReadableString& aValue);
-  NS_IMETHOD GetValueString(nsAWritableString& aValue);
+  NS_IMETHOD SetValueString(const nsAString& aValue);
+  NS_IMETHOD GetValueString(nsAString& aValue);
   
   
 protected:
@@ -1912,14 +1912,14 @@ NS_IMPL_NSISUPPORTS_SVGPATHSEG(SVGPathSegLinetoVerticalRel)
 //----------------------------------------------------------------------
 // nsISVGValue methods:
 NS_IMETHODIMP
-nsSVGPathSegLinetoVerticalRel::SetValueString(const nsAReadableString& aValue)
+nsSVGPathSegLinetoVerticalRel::SetValueString(const nsAString& aValue)
 {
   NS_NOTYETIMPLEMENTED("write me!");
   return NS_ERROR_UNEXPECTED;
 }
 
 NS_IMETHODIMP
-nsSVGPathSegLinetoVerticalRel::GetValueString(nsAWritableString& aValue)
+nsSVGPathSegLinetoVerticalRel::GetValueString(nsAString& aValue)
 {
   aValue.Truncate();
 
@@ -1971,8 +1971,8 @@ public:
   NS_DECL_NSIDOMSVGPATHSEG
   
   // nsISVGValue interface:
-  NS_IMETHOD SetValueString(const nsAReadableString& aValue);
-  NS_IMETHOD GetValueString(nsAWritableString& aValue);
+  NS_IMETHOD SetValueString(const nsAString& aValue);
+  NS_IMETHOD GetValueString(nsAString& aValue);
   
   
 protected:
@@ -2009,14 +2009,14 @@ NS_IMPL_NSISUPPORTS_SVGPATHSEG(SVGPathSegCurvetoCubicSmoothAbs)
 //----------------------------------------------------------------------
 // nsISVGValue methods:
 NS_IMETHODIMP
-nsSVGPathSegCurvetoCubicSmoothAbs::SetValueString(const nsAReadableString& aValue)
+nsSVGPathSegCurvetoCubicSmoothAbs::SetValueString(const nsAString& aValue)
 {
   NS_NOTYETIMPLEMENTED("write me!");
   return NS_ERROR_UNEXPECTED;
 }
 
 NS_IMETHODIMP
-nsSVGPathSegCurvetoCubicSmoothAbs::GetValueString(nsAWritableString& aValue)
+nsSVGPathSegCurvetoCubicSmoothAbs::GetValueString(nsAString& aValue)
 {
   aValue.Truncate();
 
@@ -2111,8 +2111,8 @@ public:
   NS_DECL_NSIDOMSVGPATHSEG
   
   // nsISVGValue interface:
-  NS_IMETHOD SetValueString(const nsAReadableString& aValue);
-  NS_IMETHOD GetValueString(nsAWritableString& aValue);
+  NS_IMETHOD SetValueString(const nsAString& aValue);
+  NS_IMETHOD GetValueString(nsAString& aValue);
   
   
 protected:
@@ -2149,14 +2149,14 @@ NS_IMPL_NSISUPPORTS_SVGPATHSEG(SVGPathSegCurvetoCubicSmoothRel)
 //----------------------------------------------------------------------
 // nsISVGValue methods:
 NS_IMETHODIMP
-nsSVGPathSegCurvetoCubicSmoothRel::SetValueString(const nsAReadableString& aValue)
+nsSVGPathSegCurvetoCubicSmoothRel::SetValueString(const nsAString& aValue)
 {
   NS_NOTYETIMPLEMENTED("write me!");
   return NS_ERROR_UNEXPECTED;
 }
 
 NS_IMETHODIMP
-nsSVGPathSegCurvetoCubicSmoothRel::GetValueString(nsAWritableString& aValue)
+nsSVGPathSegCurvetoCubicSmoothRel::GetValueString(nsAString& aValue)
 {
   aValue.Truncate();
 
@@ -2250,8 +2250,8 @@ public:
   NS_DECL_NSIDOMSVGPATHSEG
   
   // nsISVGValue interface:
-  NS_IMETHOD SetValueString(const nsAReadableString& aValue);
-  NS_IMETHOD GetValueString(nsAWritableString& aValue);
+  NS_IMETHOD SetValueString(const nsAString& aValue);
+  NS_IMETHOD GetValueString(nsAString& aValue);
   
   
 protected:
@@ -2286,14 +2286,14 @@ NS_IMPL_NSISUPPORTS_SVGPATHSEG(SVGPathSegCurvetoQuadraticSmoothAbs)
 //----------------------------------------------------------------------
 // nsISVGValue methods:
 NS_IMETHODIMP
-nsSVGPathSegCurvetoQuadraticSmoothAbs::SetValueString(const nsAReadableString& aValue)
+nsSVGPathSegCurvetoQuadraticSmoothAbs::SetValueString(const nsAString& aValue)
 {
   NS_NOTYETIMPLEMENTED("write me!");
   return NS_ERROR_UNEXPECTED;
 }
 
 NS_IMETHODIMP
-nsSVGPathSegCurvetoQuadraticSmoothAbs::GetValueString(nsAWritableString& aValue)
+nsSVGPathSegCurvetoQuadraticSmoothAbs::GetValueString(nsAString& aValue)
 {
   aValue.Truncate();
 
@@ -2358,8 +2358,8 @@ public:
   NS_DECL_NSIDOMSVGPATHSEG
   
   // nsISVGValue interface:
-  NS_IMETHOD SetValueString(const nsAReadableString& aValue);
-  NS_IMETHOD GetValueString(nsAWritableString& aValue);
+  NS_IMETHOD SetValueString(const nsAString& aValue);
+  NS_IMETHOD GetValueString(nsAString& aValue);
   
   
 protected:
@@ -2394,14 +2394,14 @@ NS_IMPL_NSISUPPORTS_SVGPATHSEG(SVGPathSegCurvetoQuadraticSmoothRel)
 //----------------------------------------------------------------------
 // nsISVGValue methods:
 NS_IMETHODIMP
-nsSVGPathSegCurvetoQuadraticSmoothRel::SetValueString(const nsAReadableString& aValue)
+nsSVGPathSegCurvetoQuadraticSmoothRel::SetValueString(const nsAString& aValue)
 {
   NS_NOTYETIMPLEMENTED("write me!");
   return NS_ERROR_UNEXPECTED;
 }
 
 NS_IMETHODIMP
-nsSVGPathSegCurvetoQuadraticSmoothRel::GetValueString(nsAWritableString& aValue)
+nsSVGPathSegCurvetoQuadraticSmoothRel::GetValueString(nsAString& aValue)
 {
   aValue.Truncate();
 
diff --git a/mozilla/content/svg/content/src/nsSVGPathSegList.cpp b/mozilla/content/svg/content/src/nsSVGPathSegList.cpp
index 814b4db4f57..f0c64857428 100644
--- a/mozilla/content/svg/content/src/nsSVGPathSegList.cpp
+++ b/mozilla/content/svg/content/src/nsSVGPathSegList.cpp
@@ -68,8 +68,8 @@ public:
   NS_DECL_NSIDOMSVGPATHSEGLIST
 
   // remainder of nsISVGValue interface:
-  NS_IMETHOD SetValueString(const nsAReadableString& aValue);
-  NS_IMETHOD GetValueString(nsAWritableString& aValue);
+  NS_IMETHOD SetValueString(const nsAString& aValue);
+  NS_IMETHOD GetValueString(nsAString& aValue);
 
   // nsISVGValueObserver
   NS_IMETHOD WillModifySVGObservable(nsISVGValue* observable);
@@ -123,7 +123,7 @@ NS_INTERFACE_MAP_END
 // nsISVGValue methods:
 
 NS_IMETHODIMP
-nsSVGPathSegList::SetValueString(const nsAReadableString& aValue)
+nsSVGPathSegList::SetValueString(const nsAString& aValue)
 {
   WillModify();
   
@@ -150,7 +150,7 @@ nsSVGPathSegList::SetValueString(const nsAReadableString& aValue)
 }
 
 NS_IMETHODIMP
-nsSVGPathSegList::GetValueString(nsAWritableString& aValue)
+nsSVGPathSegList::GetValueString(nsAString& aValue)
 {
   aValue.Truncate();
 
diff --git a/mozilla/content/svg/content/src/nsSVGPoint.cpp b/mozilla/content/svg/content/src/nsSVGPoint.cpp
index c9f2e0f369d..7f8b3f3c863 100644
--- a/mozilla/content/svg/content/src/nsSVGPoint.cpp
+++ b/mozilla/content/svg/content/src/nsSVGPoint.cpp
@@ -120,14 +120,14 @@ NS_IMETHODIMP nsSVGPoint::MatrixTransform(nsIDOMSVGMatrix *matrix, nsIDOMSVGPoin
 //----------------------------------------------------------------------
 // nsISVGValue methods:
 NS_IMETHODIMP
-nsSVGPoint::SetValueString(const nsAReadableString& aValue)
+nsSVGPoint::SetValueString(const nsAString& aValue)
 {
   NS_NOTYETIMPLEMENTED("write me!");
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
 NS_IMETHODIMP
-nsSVGPoint::GetValueString(nsAWritableString& aValue)
+nsSVGPoint::GetValueString(nsAString& aValue)
 {
   NS_NOTYETIMPLEMENTED("write me!");
   return NS_ERROR_NOT_IMPLEMENTED;
diff --git a/mozilla/content/svg/content/src/nsSVGPoint.h b/mozilla/content/svg/content/src/nsSVGPoint.h
index e9d36bfed89..6a14445bd10 100644
--- a/mozilla/content/svg/content/src/nsSVGPoint.h
+++ b/mozilla/content/svg/content/src/nsSVGPoint.h
@@ -59,8 +59,8 @@ public:
   NS_DECL_NSIDOMSVGPOINT
 
   // nsISVGValue interface:
-  NS_IMETHOD SetValueString(const nsAReadableString& aValue);
-  NS_IMETHOD GetValueString(nsAWritableString& aValue);
+  NS_IMETHOD SetValueString(const nsAString& aValue);
+  NS_IMETHOD GetValueString(nsAString& aValue);
   
   
 protected:
diff --git a/mozilla/content/svg/content/src/nsSVGPointList.cpp b/mozilla/content/svg/content/src/nsSVGPointList.cpp
index 18ff82051f2..e6049e24888 100644
--- a/mozilla/content/svg/content/src/nsSVGPointList.cpp
+++ b/mozilla/content/svg/content/src/nsSVGPointList.cpp
@@ -44,7 +44,7 @@
 #include "nsTextFormatter.h"
 
 nsresult
-nsSVGPointList::Create(const nsAReadableString& aValue,
+nsSVGPointList::Create(const nsAString& aValue,
                        nsISVGValue** aResult)
 {
   *aResult = (nsISVGValue*) new nsSVGPointList();
@@ -156,7 +156,7 @@ NS_INTERFACE_MAP_END
 // nsISVGValue methods:
 
 NS_IMETHODIMP
-nsSVGPointList::SetValueString(const nsAReadableString& aValue)
+nsSVGPointList::SetValueString(const nsAString& aValue)
 {
   WillModify();
   
@@ -209,7 +209,7 @@ nsSVGPointList::SetValueString(const nsAReadableString& aValue)
 }
 
 NS_IMETHODIMP
-nsSVGPointList::GetValueString(nsAWritableString& aValue)
+nsSVGPointList::GetValueString(nsAString& aValue)
 {
   aValue.Truncate();
 
diff --git a/mozilla/content/svg/content/src/nsSVGPointList.h b/mozilla/content/svg/content/src/nsSVGPointList.h
index 29eb4943e52..60f58fb3f7d 100644
--- a/mozilla/content/svg/content/src/nsSVGPointList.h
+++ b/mozilla/content/svg/content/src/nsSVGPointList.h
@@ -52,7 +52,7 @@ class nsSVGPointList : public nsSVGValue,
                        public nsSupportsWeakReference
 {
 public:
-  static nsresult Create(const nsAReadableString& aValue, nsISVGValue** aResult);
+  static nsresult Create(const nsAString& aValue, nsISVGValue** aResult);
   static nsresult Create(nsIDOMSVGPointList** aResult);
   
 protected:
@@ -67,8 +67,8 @@ public:
   NS_DECL_NSIDOMSVGPOINTLIST
   
   // remainder of nsISVGValue interface:
-  NS_IMETHOD SetValueString(const nsAReadableString& aValue);
-  NS_IMETHOD GetValueString(nsAWritableString& aValue);
+  NS_IMETHOD SetValueString(const nsAString& aValue);
+  NS_IMETHOD GetValueString(nsAString& aValue);
 
   // nsISVGValueObserver
   NS_IMETHOD WillModifySVGObservable(nsISVGValue* observable);
diff --git a/mozilla/content/svg/content/src/nsSVGRect.cpp b/mozilla/content/svg/content/src/nsSVGRect.cpp
index fa8c7f0ae3f..148acd7c226 100644
--- a/mozilla/content/svg/content/src/nsSVGRect.cpp
+++ b/mozilla/content/svg/content/src/nsSVGRect.cpp
@@ -61,8 +61,8 @@ public:
   NS_DECL_NSIDOMSVGRECT
 
   // nsISVGValue interface:
-  NS_IMETHOD SetValueString(const nsAReadableString& aValue);
-  NS_IMETHOD GetValueString(nsAWritableString& aValue);
+  NS_IMETHOD SetValueString(const nsAString& aValue);
+  NS_IMETHOD GetValueString(nsAString& aValue);
   
   
 protected:
@@ -107,13 +107,13 @@ NS_INTERFACE_MAP_END
 // nsISVGValue methods:
 
 NS_IMETHODIMP
-nsSVGRect::SetValueString(const nsAReadableString& aValue)
+nsSVGRect::SetValueString(const nsAString& aValue)
 {
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
 NS_IMETHODIMP
-nsSVGRect::GetValueString(nsAWritableString& aValue)
+nsSVGRect::GetValueString(nsAString& aValue)
 {
   return NS_ERROR_NOT_IMPLEMENTED;
 }
@@ -203,8 +203,8 @@ public:
   NS_DECL_NSIDOMSVGRECT
 
   // nsISVGValue interface:
-  NS_IMETHOD SetValueString(const nsAReadableString& aValue);
-  NS_IMETHOD GetValueString(nsAWritableString& aValue);
+  NS_IMETHOD SetValueString(const nsAString& aValue);
+  NS_IMETHOD GetValueString(nsAString& aValue);
   
   
 protected:
@@ -275,7 +275,7 @@ NS_INTERFACE_MAP_END
 // nsISVGValue methods:
 
 NS_IMETHODIMP
-nsSVGRectPrototypeWrapper::SetValueString(const nsAReadableString& aValue)
+nsSVGRectPrototypeWrapper::SetValueString(const nsAString& aValue)
 {
   EnsureBody();
   nsCOMPtr<nsISVGValue> val = do_QueryInterface(mBody);
@@ -285,7 +285,7 @@ nsSVGRectPrototypeWrapper::SetValueString(const nsAReadableString& aValue)
 }
 
 NS_IMETHODIMP
-nsSVGRectPrototypeWrapper::GetValueString(nsAWritableString& aValue)
+nsSVGRectPrototypeWrapper::GetValueString(nsAString& aValue)
 {
   nsCOMPtr<nsISVGValue> val = do_QueryInterface( Delegate() );
   NS_ASSERTION(val, "missing interface on body");
diff --git a/mozilla/content/svg/content/src/nsSVGSVGElement.cpp b/mozilla/content/svg/content/src/nsSVGSVGElement.cpp
index 35a476a27ad..85126cd3d90 100644
--- a/mozilla/content/svg/content/src/nsSVGSVGElement.cpp
+++ b/mozilla/content/svg/content/src/nsSVGSVGElement.cpp
@@ -328,13 +328,13 @@ nsSVGSVGElement::GetHeight(nsIDOMSVGAnimatedLength * *aHeight)
 
 /* attribute DOMString contentScriptType; */
 NS_IMETHODIMP
-nsSVGSVGElement::GetContentScriptType(nsAWritableString & aContentScriptType)
+nsSVGSVGElement::GetContentScriptType(nsAString & aContentScriptType)
 {
   NS_NOTYETIMPLEMENTED("write me!");
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 NS_IMETHODIMP
-nsSVGSVGElement::SetContentScriptType(const nsAReadableString & aContentScriptType)
+nsSVGSVGElement::SetContentScriptType(const nsAString & aContentScriptType)
 {
   NS_NOTYETIMPLEMENTED("write me!");
   return NS_ERROR_NOT_IMPLEMENTED;
@@ -342,13 +342,13 @@ nsSVGSVGElement::SetContentScriptType(const nsAReadableString & aContentScriptTy
 
 /* attribute DOMString contentStyleType; */
 NS_IMETHODIMP
-nsSVGSVGElement::GetContentStyleType(nsAWritableString & aContentStyleType)
+nsSVGSVGElement::GetContentStyleType(nsAString & aContentStyleType)
 {
   NS_NOTYETIMPLEMENTED("write me!");
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 NS_IMETHODIMP
-nsSVGSVGElement::SetContentStyleType(const nsAReadableString & aContentStyleType)
+nsSVGSVGElement::SetContentStyleType(const nsAString & aContentStyleType)
 {
   NS_NOTYETIMPLEMENTED("write me!");
   return NS_ERROR_NOT_IMPLEMENTED;
@@ -720,14 +720,14 @@ nsSVGSVGElement::CreateSVGTransformFromMatrix(nsIDOMSVGMatrix *matrix, nsIDOMSVG
 
 /* DOMString createSVGString (); */
 NS_IMETHODIMP
-nsSVGSVGElement::CreateSVGString(nsAWritableString & _retval)
+nsSVGSVGElement::CreateSVGString(nsAString & _retval)
 {
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
 /* nsIDOMElement getElementById (in DOMString elementId); */
 NS_IMETHODIMP
-nsSVGSVGElement::GetElementById(const nsAReadableString & elementId, nsIDOMElement **_retval)
+nsSVGSVGElement::GetElementById(const nsAString & elementId, nsIDOMElement **_retval)
 {
   return NS_ERROR_NOT_IMPLEMENTED;
 }
diff --git a/mozilla/content/svg/content/src/nsSVGStyleValue.cpp b/mozilla/content/svg/content/src/nsSVGStyleValue.cpp
index fa8bb410fa4..de657fdcb01 100644
--- a/mozilla/content/svg/content/src/nsSVGStyleValue.cpp
+++ b/mozilla/content/svg/content/src/nsSVGStyleValue.cpp
@@ -61,8 +61,8 @@ public:
   NS_DECL_ISUPPORTS
 
   // nsISVGValue interface: 
-  NS_IMETHOD SetValueString(const nsAReadableString& aValue);
-  NS_IMETHOD GetValueString(nsAWritableString& aValue);
+  NS_IMETHOD SetValueString(const nsAString& aValue);
+  NS_IMETHOD GetValueString(nsAString& aValue);
 
   // nsISVGStyleValue interface:
   NS_IMETHOD GetStyleRule(nsIDocument* baseDoc, nsIStyleRule** rule);
@@ -108,7 +108,7 @@ NS_IMPL_ISUPPORTS2(nsSVGStyleValue,
 // nsISVGValue methods:
 
 NS_IMETHODIMP
-nsSVGStyleValue::SetValueString(const nsAReadableString& aValue)
+nsSVGStyleValue::SetValueString(const nsAString& aValue)
 {
   WillModify();
   mValue = aValue;
@@ -118,7 +118,7 @@ nsSVGStyleValue::SetValueString(const nsAReadableString& aValue)
 }
 
 NS_IMETHODIMP
-nsSVGStyleValue::GetValueString(nsAWritableString& aValue)
+nsSVGStyleValue::GetValueString(nsAString& aValue)
 {
   aValue = mValue;
   return NS_OK;
diff --git a/mozilla/content/svg/content/src/nsSVGTransform.cpp b/mozilla/content/svg/content/src/nsSVGTransform.cpp
index 47a614512b3..661dee6bb3a 100644
--- a/mozilla/content/svg/content/src/nsSVGTransform.cpp
+++ b/mozilla/content/svg/content/src/nsSVGTransform.cpp
@@ -66,8 +66,8 @@ public:
   NS_DECL_NSIDOMSVGTRANSFORM
 
   // nsISVGValue interface:
-  NS_IMETHOD SetValueString(const nsAReadableString& aValue);
-  NS_IMETHOD GetValueString(nsAWritableString& aValue);
+  NS_IMETHOD SetValueString(const nsAString& aValue);
+  NS_IMETHOD GetValueString(nsAString& aValue);
   
   
 protected:
@@ -129,14 +129,14 @@ NS_INTERFACE_MAP_END
 //----------------------------------------------------------------------
 // nsISVGValue methods:
 NS_IMETHODIMP
-nsSVGTransform::SetValueString(const nsAReadableString& aValue)
+nsSVGTransform::SetValueString(const nsAString& aValue)
 {
   NS_NOTYETIMPLEMENTED("write me!");
   return NS_ERROR_UNEXPECTED;
 }
 
 NS_IMETHODIMP
-nsSVGTransform::GetValueString(nsAWritableString& aValue)
+nsSVGTransform::GetValueString(nsAString& aValue)
 {
   aValue.Truncate();
   PRUnichar buf[256];
diff --git a/mozilla/content/svg/content/src/nsSVGTransformList.cpp b/mozilla/content/svg/content/src/nsSVGTransformList.cpp
index 48538228fdf..48c5d2c4c7b 100644
--- a/mozilla/content/svg/content/src/nsSVGTransformList.cpp
+++ b/mozilla/content/svg/content/src/nsSVGTransformList.cpp
@@ -45,7 +45,7 @@
 #include "nsReadableUtils.h"
 
 nsresult
-nsSVGTransformList::Create(const nsAReadableString& aValue,
+nsSVGTransformList::Create(const nsAString& aValue,
                        nsISVGValue** aResult)
 {
   *aResult = (nsISVGValue*) new nsSVGTransformList();
@@ -162,7 +162,7 @@ NS_INTERFACE_MAP_END
 // nsISVGValue methods:
 
 NS_IMETHODIMP
-nsSVGTransformList::SetValueString(const nsAReadableString& aValue)
+nsSVGTransformList::SetValueString(const nsAString& aValue)
 {
   // XXX: we don't implement the _exact_ BNF given in the
   // specs. 
@@ -273,7 +273,7 @@ nsSVGTransformList::SetValueString(const nsAReadableString& aValue)
 }
 
 NS_IMETHODIMP
-nsSVGTransformList::GetValueString(nsAWritableString& aValue)
+nsSVGTransformList::GetValueString(nsAString& aValue)
 {
   aValue.Truncate();
 
diff --git a/mozilla/content/svg/content/src/nsSVGTransformList.h b/mozilla/content/svg/content/src/nsSVGTransformList.h
index de1a13a89af..d0dc1423a71 100644
--- a/mozilla/content/svg/content/src/nsSVGTransformList.h
+++ b/mozilla/content/svg/content/src/nsSVGTransformList.h
@@ -51,7 +51,7 @@ class nsSVGTransformList : public nsSVGValue,
                            public nsSupportsWeakReference
 {
 public:
-  static nsresult Create(const nsAReadableString& aValue, nsISVGValue** aResult);
+  static nsresult Create(const nsAString& aValue, nsISVGValue** aResult);
   static nsresult Create(nsIDOMSVGTransformList** aResult);
   
 protected:
@@ -66,8 +66,8 @@ public:
   NS_DECL_NSIDOMSVGTRANSFORMLIST
   
   // remainder of nsISVGValue interface:
-  NS_IMETHOD SetValueString(const nsAReadableString& aValue);
-  NS_IMETHOD GetValueString(nsAWritableString& aValue);
+  NS_IMETHOD SetValueString(const nsAString& aValue);
+  NS_IMETHOD GetValueString(nsAString& aValue);
 
   // nsISVGValueObserver
   NS_IMETHOD WillModifySVGObservable(nsISVGValue* observable);
diff --git a/mozilla/content/svg/document/src/nsSVGDocument.cpp b/mozilla/content/svg/document/src/nsSVGDocument.cpp
index 4fb256d6457..bc54615a4d0 100644
--- a/mozilla/content/svg/document/src/nsSVGDocument.cpp
+++ b/mozilla/content/svg/document/src/nsSVGDocument.cpp
@@ -90,18 +90,18 @@ nsSVGDocument::StartDocumentLoad(const char* aCommand,
 // nsIDOMSVGDocument
 
 NS_IMETHODIMP
-nsSVGDocument::GetTitle(nsAWritableString& aTitle) {
+nsSVGDocument::GetTitle(nsAString& aTitle) {
   return nsXMLDocument::GetTitle(aTitle);
 }
 
 NS_IMETHODIMP
-nsSVGDocument::GetReferrer(nsAWritableString& aReferrer) {
+nsSVGDocument::GetReferrer(nsAString& aReferrer) {
   aReferrer.Assign(mReferrer);
   return NS_OK;
 }
 
 NS_IMETHODIMP
-nsSVGDocument::GetDomain(nsAWritableString& aDomain) {
+nsSVGDocument::GetDomain(nsAString& aDomain) {
   if (!mDocumentURL) {
     aDomain.Truncate();
   } else {
@@ -116,7 +116,7 @@ nsSVGDocument::GetDomain(nsAWritableString& aDomain) {
 }
 
 NS_IMETHODIMP
-nsSVGDocument::GetURL(nsAWritableString& aURL) {
+nsSVGDocument::GetURL(nsAString& aURL) {
   if (!mDocumentURL) {
     aURL.Truncate();
   } else {