Bug 969756. r=cam
authorMats Palmgren <matspal@gmail.com>
Sat, 15 Feb 2014 17:40:38 +0000
changeset 169038 b3a9c9540bfc624b12b309c26f6e0bb01c1d1382
parent 169037 4fadd825bf81154bfece1b72abaca475ef6e4021
child 169039 e8afde67c29031370a84c6ff50fe6746b39cc50d
push id26226
push userphilringnalda@gmail.com
push dateSun, 16 Feb 2014 02:27:28 +0000
treeherdermozilla-central@3a37d3be57fa [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerscam
bugs969756
milestone30.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 969756. r=cam
layout/style/nsCSSValue.cpp
--- a/layout/style/nsCSSValue.cpp
+++ b/layout/style/nsCSSValue.cpp
@@ -1256,17 +1256,18 @@ nsCSSValue::AppendToString(nsCSSProperty
       }
       aResult.AppendLiteral(", ");
     }
 
     aResult.AppendLiteral(")");
   } else if (eCSSUnit_TokenStream == unit) {
     nsCSSProperty shorthand = mValue.mTokenStream->mShorthandPropertyID;
     if (shorthand == eCSSProperty_UNKNOWN ||
-        nsCSSProps::PropHasFlags(shorthand, CSS_PROPERTY_IS_ALIAS)) {
+        nsCSSProps::PropHasFlags(shorthand, CSS_PROPERTY_IS_ALIAS) ||
+        aProperty == eCSSProperty__x_system_font) {
       // We treat serialization of aliases like '-moz-transform' as a special
       // case, since it really wants to be serialized as if it were a longhand
       // even though it is implemented as a shorthand.
       aResult.Append(mValue.mTokenStream->mTokenStream);
     }
   } else if (eCSSUnit_Pair == unit) {
     if (eCSSProperty_font_variant_alternates == aProperty) {
       int32_t intValue = GetPairValue().mXValue.GetIntValue();