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) {