diff --git a/mozilla/content/base/src/nsHTMLValue.h b/mozilla/content/base/src/nsHTMLValue.h
index e54235ff3a8..30eb3024b2f 100644
--- a/mozilla/content/base/src/nsHTMLValue.h
+++ b/mozilla/content/base/src/nsHTMLValue.h
@@ -146,10 +146,8 @@ inline nscolor nsHTMLValue::GetColorValue(void) const
     return mValue.mColor;
   }
   if ((mUnit == eHTMLUnit_ColorName) && (mValue.mString)) {
-    char cbuf[40];
-    mValue.mString->ToCString(cbuf, sizeof(cbuf));
     nscolor color;
-    if (NS_ColorNameToRGB(cbuf, &color)) {
+    if (NS_ColorNameToRGB(*(mValue.mString), &color)) {
       return color;
     }
   }
diff --git a/mozilla/content/html/style/src/nsHTMLValue.h b/mozilla/content/html/style/src/nsHTMLValue.h
index e54235ff3a8..30eb3024b2f 100644
--- a/mozilla/content/html/style/src/nsHTMLValue.h
+++ b/mozilla/content/html/style/src/nsHTMLValue.h
@@ -146,10 +146,8 @@ inline nscolor nsHTMLValue::GetColorValue(void) const
     return mValue.mColor;
   }
   if ((mUnit == eHTMLUnit_ColorName) && (mValue.mString)) {
-    char cbuf[40];
-    mValue.mString->ToCString(cbuf, sizeof(cbuf));
     nscolor color;
-    if (NS_ColorNameToRGB(cbuf, &color)) {
+    if (NS_ColorNameToRGB(*(mValue.mString), &color)) {
       return color;
     }
   }
diff --git a/mozilla/content/shared/public/nsHTMLValue.h b/mozilla/content/shared/public/nsHTMLValue.h
index e54235ff3a8..30eb3024b2f 100644
--- a/mozilla/content/shared/public/nsHTMLValue.h
+++ b/mozilla/content/shared/public/nsHTMLValue.h
@@ -146,10 +146,8 @@ inline nscolor nsHTMLValue::GetColorValue(void) const
     return mValue.mColor;
   }
   if ((mUnit == eHTMLUnit_ColorName) && (mValue.mString)) {
-    char cbuf[40];
-    mValue.mString->ToCString(cbuf, sizeof(cbuf));
     nscolor color;
-    if (NS_ColorNameToRGB(cbuf, &color)) {
+    if (NS_ColorNameToRGB(*(mValue.mString), &color)) {
       return color;
     }
   }
diff --git a/mozilla/layout/html/style/src/nsHTMLValue.h b/mozilla/layout/html/style/src/nsHTMLValue.h
index e54235ff3a8..30eb3024b2f 100644
--- a/mozilla/layout/html/style/src/nsHTMLValue.h
+++ b/mozilla/layout/html/style/src/nsHTMLValue.h
@@ -146,10 +146,8 @@ inline nscolor nsHTMLValue::GetColorValue(void) const
     return mValue.mColor;
   }
   if ((mUnit == eHTMLUnit_ColorName) && (mValue.mString)) {
-    char cbuf[40];
-    mValue.mString->ToCString(cbuf, sizeof(cbuf));
     nscolor color;
-    if (NS_ColorNameToRGB(cbuf, &color)) {
+    if (NS_ColorNameToRGB(*(mValue.mString), &color)) {
       return color;
     }
   }