From 011c395fd416cd3bd761037e79fd4a237a28562d Mon Sep 17 00:00:00 2001
From: "peterl%netscape.com"
 <peterl%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sun, 18 Jul 1999 00:30:30 +0000
Subject: [PATCH] sync to color api change

git-svn-id: svn://10.0.0.236/trunk@39954 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/content/base/src/nsHTMLValue.h       | 4 +---
 mozilla/content/html/style/src/nsHTMLValue.h | 4 +---
 mozilla/content/shared/public/nsHTMLValue.h  | 4 +---
 mozilla/layout/html/style/src/nsHTMLValue.h  | 4 +---
 4 files changed, 4 insertions(+), 12 deletions(-)

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;
     }
   }