From 31d3f74d14bb5baed098d2579dd52137c2e1e867 Mon Sep 17 00:00:00 2001 From: "bzbarsky%mit.edu" Date: Tue, 6 Aug 2002 05:18:21 +0000 Subject: [PATCH] Make .style and computed style format rgb() values the same way. Bug 160247, r=peterv, sr=jst git-svn-id: svn://10.0.0.236/trunk@126442 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/content/html/style/src/nsCSSDeclaration.cpp | 10 ++++------ mozilla/content/html/style/src/nsCSSStruct.cpp | 10 ++++------ mozilla/layout/style/nsCSSDeclaration.cpp | 10 ++++------ mozilla/layout/style/nsCSSStruct.cpp | 10 ++++------ 4 files changed, 16 insertions(+), 24 deletions(-) diff --git a/mozilla/content/html/style/src/nsCSSDeclaration.cpp b/mozilla/content/html/style/src/nsCSSDeclaration.cpp index 0fa108e9365..1b38ca4e26e 100644 --- a/mozilla/content/html/style/src/nsCSSDeclaration.cpp +++ b/mozilla/content/html/style/src/nsCSSDeclaration.cpp @@ -4924,16 +4924,14 @@ PRBool nsCSSDeclaration::AppendValueToString(nsCSSProperty aProperty, const nsCS aResult.Append(NS_LITERAL_STRING("rgb(")); - tmpStr.AppendInt(NS_GET_R(color), 10); - aResult.Append(tmpStr); + NS_NAMED_LITERAL_STRING(comma, ", "); - aResult.Append(PRUnichar(',')); + tmpStr.AppendInt(NS_GET_R(color), 10); + aResult.Append(tmpStr + comma); tmpStr.Truncate(); tmpStr.AppendInt(NS_GET_G(color), 10); - aResult.Append(tmpStr); - - aResult.Append(PRUnichar(',')); + aResult.Append(tmpStr + comma); tmpStr.Truncate(); tmpStr.AppendInt(NS_GET_B(color), 10); diff --git a/mozilla/content/html/style/src/nsCSSStruct.cpp b/mozilla/content/html/style/src/nsCSSStruct.cpp index 0fa108e9365..1b38ca4e26e 100644 --- a/mozilla/content/html/style/src/nsCSSStruct.cpp +++ b/mozilla/content/html/style/src/nsCSSStruct.cpp @@ -4924,16 +4924,14 @@ PRBool nsCSSDeclaration::AppendValueToString(nsCSSProperty aProperty, const nsCS aResult.Append(NS_LITERAL_STRING("rgb(")); - tmpStr.AppendInt(NS_GET_R(color), 10); - aResult.Append(tmpStr); + NS_NAMED_LITERAL_STRING(comma, ", "); - aResult.Append(PRUnichar(',')); + tmpStr.AppendInt(NS_GET_R(color), 10); + aResult.Append(tmpStr + comma); tmpStr.Truncate(); tmpStr.AppendInt(NS_GET_G(color), 10); - aResult.Append(tmpStr); - - aResult.Append(PRUnichar(',')); + aResult.Append(tmpStr + comma); tmpStr.Truncate(); tmpStr.AppendInt(NS_GET_B(color), 10); diff --git a/mozilla/layout/style/nsCSSDeclaration.cpp b/mozilla/layout/style/nsCSSDeclaration.cpp index 0fa108e9365..1b38ca4e26e 100644 --- a/mozilla/layout/style/nsCSSDeclaration.cpp +++ b/mozilla/layout/style/nsCSSDeclaration.cpp @@ -4924,16 +4924,14 @@ PRBool nsCSSDeclaration::AppendValueToString(nsCSSProperty aProperty, const nsCS aResult.Append(NS_LITERAL_STRING("rgb(")); - tmpStr.AppendInt(NS_GET_R(color), 10); - aResult.Append(tmpStr); + NS_NAMED_LITERAL_STRING(comma, ", "); - aResult.Append(PRUnichar(',')); + tmpStr.AppendInt(NS_GET_R(color), 10); + aResult.Append(tmpStr + comma); tmpStr.Truncate(); tmpStr.AppendInt(NS_GET_G(color), 10); - aResult.Append(tmpStr); - - aResult.Append(PRUnichar(',')); + aResult.Append(tmpStr + comma); tmpStr.Truncate(); tmpStr.AppendInt(NS_GET_B(color), 10); diff --git a/mozilla/layout/style/nsCSSStruct.cpp b/mozilla/layout/style/nsCSSStruct.cpp index 0fa108e9365..1b38ca4e26e 100644 --- a/mozilla/layout/style/nsCSSStruct.cpp +++ b/mozilla/layout/style/nsCSSStruct.cpp @@ -4924,16 +4924,14 @@ PRBool nsCSSDeclaration::AppendValueToString(nsCSSProperty aProperty, const nsCS aResult.Append(NS_LITERAL_STRING("rgb(")); - tmpStr.AppendInt(NS_GET_R(color), 10); - aResult.Append(tmpStr); + NS_NAMED_LITERAL_STRING(comma, ", "); - aResult.Append(PRUnichar(',')); + tmpStr.AppendInt(NS_GET_R(color), 10); + aResult.Append(tmpStr + comma); tmpStr.Truncate(); tmpStr.AppendInt(NS_GET_G(color), 10); - aResult.Append(tmpStr); - - aResult.Append(PRUnichar(',')); + aResult.Append(tmpStr + comma); tmpStr.Truncate(); tmpStr.AppendInt(NS_GET_B(color), 10);