From 3fc016f2aceed15fea06949cd45d2732116f3418 Mon Sep 17 00:00:00 2001
From: "peterl%netscape.com"
 <peterl%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Fri, 7 Aug 1998 02:17:56 +0000
Subject: [PATCH] fixed processing of font face (preserve original quotes)

git-svn-id: svn://10.0.0.236/trunk@7513 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/content/html/style/src/nsCSSParser.cpp | 6 ++----
 mozilla/layout/html/style/src/nsCSSParser.cpp  | 6 ++----
 mozilla/layout/style/nsCSSParser.cpp           | 6 ++----
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/mozilla/content/html/style/src/nsCSSParser.cpp b/mozilla/content/html/style/src/nsCSSParser.cpp
index 4894d23207a..c76af8a2a97 100644
--- a/mozilla/content/html/style/src/nsCSSParser.cpp
+++ b/mozilla/content/html/style/src/nsCSSParser.cpp
@@ -2215,7 +2215,6 @@ PRBool CSSParserImpl::ParseFontFamily(PRInt32* aErrorCode, nsICSSDeclaration* aD
       if (!firstOne) {
         family.Append(PRUnichar(','));
       }
-      family.Append(PRUnichar('"'));
       family.Append(tk->mIdent);
       for (;;) {
         if (!GetToken(aErrorCode, PR_FALSE)) {
@@ -2240,15 +2239,14 @@ PRBool CSSParserImpl::ParseFontFamily(PRInt32* aErrorCode, nsICSSDeclaration* aD
           break;
         }
       }
-      family.Append(PRUnichar('"'));
       firstOne = PR_FALSE;
     } else if (eCSSToken_String == tk->mType) {
       if (!firstOne) {
         family.Append(PRUnichar(','));
       }
-      family.Append(PRUnichar('"'));
+      family.Append(tk->mSymbol); // replace the quotes
       family.Append(tk->mIdent);
-      family.Append(PRUnichar('"'));
+      family.Append(tk->mSymbol);
       firstOne = PR_FALSE;
     } else if (eCSSToken_Symbol == tk->mType) {
       if (',' != tk->mSymbol) {
diff --git a/mozilla/layout/html/style/src/nsCSSParser.cpp b/mozilla/layout/html/style/src/nsCSSParser.cpp
index 4894d23207a..c76af8a2a97 100644
--- a/mozilla/layout/html/style/src/nsCSSParser.cpp
+++ b/mozilla/layout/html/style/src/nsCSSParser.cpp
@@ -2215,7 +2215,6 @@ PRBool CSSParserImpl::ParseFontFamily(PRInt32* aErrorCode, nsICSSDeclaration* aD
       if (!firstOne) {
         family.Append(PRUnichar(','));
       }
-      family.Append(PRUnichar('"'));
       family.Append(tk->mIdent);
       for (;;) {
         if (!GetToken(aErrorCode, PR_FALSE)) {
@@ -2240,15 +2239,14 @@ PRBool CSSParserImpl::ParseFontFamily(PRInt32* aErrorCode, nsICSSDeclaration* aD
           break;
         }
       }
-      family.Append(PRUnichar('"'));
       firstOne = PR_FALSE;
     } else if (eCSSToken_String == tk->mType) {
       if (!firstOne) {
         family.Append(PRUnichar(','));
       }
-      family.Append(PRUnichar('"'));
+      family.Append(tk->mSymbol); // replace the quotes
       family.Append(tk->mIdent);
-      family.Append(PRUnichar('"'));
+      family.Append(tk->mSymbol);
       firstOne = PR_FALSE;
     } else if (eCSSToken_Symbol == tk->mType) {
       if (',' != tk->mSymbol) {
diff --git a/mozilla/layout/style/nsCSSParser.cpp b/mozilla/layout/style/nsCSSParser.cpp
index 4894d23207a..c76af8a2a97 100644
--- a/mozilla/layout/style/nsCSSParser.cpp
+++ b/mozilla/layout/style/nsCSSParser.cpp
@@ -2215,7 +2215,6 @@ PRBool CSSParserImpl::ParseFontFamily(PRInt32* aErrorCode, nsICSSDeclaration* aD
       if (!firstOne) {
         family.Append(PRUnichar(','));
       }
-      family.Append(PRUnichar('"'));
       family.Append(tk->mIdent);
       for (;;) {
         if (!GetToken(aErrorCode, PR_FALSE)) {
@@ -2240,15 +2239,14 @@ PRBool CSSParserImpl::ParseFontFamily(PRInt32* aErrorCode, nsICSSDeclaration* aD
           break;
         }
       }
-      family.Append(PRUnichar('"'));
       firstOne = PR_FALSE;
     } else if (eCSSToken_String == tk->mType) {
       if (!firstOne) {
         family.Append(PRUnichar(','));
       }
-      family.Append(PRUnichar('"'));
+      family.Append(tk->mSymbol); // replace the quotes
       family.Append(tk->mIdent);
-      family.Append(PRUnichar('"'));
+      family.Append(tk->mSymbol);
       firstOne = PR_FALSE;
     } else if (eCSSToken_Symbol == tk->mType) {
       if (',' != tk->mSymbol) {