StylePropertySerializer should expand all property if needed.

Source/core/css/StylePropertySerializer.cpp

 /*
  * (C) 1999-2003 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012 Apple Inc. All rights reserved.
  * Copyright (C) 2011 Research In Motion Limited. All rights reserved.
  * Copyright (C) 2013 Intel Corporation. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
 */
 
 #include "config.h"
 #include "core/css/StylePropertySerializer.h"
 
 #include "core/CSSValueKeywords.h"
 #include "core/StylePropertyShorthand.h"
 #include "core/css/CSSPropertyMetadata.h"
+#include "core/css/CSSValuePool.h"
 #include "wtf/BitArray.h"
 #include "wtf/text/StringBuilder.h"
 
 namespace blink {
 
 static bool isInitialOrInherit(const String& value)
 {
     DEFINE_STATIC_LOCAL(String, initial, ("initial"));
     DEFINE_STATIC_LOCAL(String, inherit, ("inherit"));
     return value.length() == 7 && (value == initial || value == inherit);
 }
 
+StylePropertySetForSerializer::StylePropertySetForSerializer(const StylePropertySet& properties)
+    : m_propertySet(properties)
+    , m_allIndex(m_propertySet.findPropertyIndex(CSSPropertyAll))
+    , m_needToExpandAll(false)
+{
+    if (!hasAllProperty())
+        return;
+
+    StylePropertySet::PropertyReference allProperty = m_propertySet.propertyAt(m_allIndex);
+    int numAffectedLonghands = 0;
+    for (unsigned i = 0; i < m_propertySet.propertyCount(); ++i) {
+        StylePropertySet::PropertyReference property = m_propertySet.propertyAt(i);
+        if (CSSProperty::isAffectedByAllProperty(property.id())) {
+            if (allProperty.isImportant() && !property.isImportant())
+                continue;
+            if ((unsigned)m_allIndex >= i)

[rune, 2014/09/02 20:13:07]

Use static_cast instead of C-style cast.

[tasak, 2014/09/04 06:08:38]

Done.

+                continue;
+            if (property.value()->equals(*allProperty.value())
+                && property.isImportant() == allProperty.isImportant())
+                continue;
+            ++numAffectedLonghands;

[rune, 2014/09/02 20:13:07]

Can't you just set m_needToExpandAll here and drop numAffectedLonghands
altogether?

[tasak, 2014/09/04 06:08:38]

Done.

+        }
+        m_longhandPropertyUsed.set(property.id() - firstCSSProperty);
+    }
+    m_needToExpandAll = numAffectedLonghands > 0;
+}
+
+unsigned StylePropertySetForSerializer::propertyCount() const
+{
+    if (!hasExpandedAllProperty())
+        return m_propertySet.propertyCount();
+    return lastCSSProperty - firstCSSProperty + 1;
+}
+
+PropertyValueForSerializer StylePropertySetForSerializer::propertyAt(unsigned index) const
+{
+    if (!hasExpandedAllProperty())
+        return PropertyValueForSerializer(m_propertySet.propertyAt(index));
+
+    CSSPropertyID propertyID = static_cast<CSSPropertyID>(index + firstCSSProperty);
+    ASSERT(firstCSSProperty <= propertyID && propertyID <= lastCSSProperty);
+    if (m_longhandPropertyUsed.get(index)) {
+        int index = m_propertySet.findPropertyIndex(propertyID);
+        ASSERT(index != -1);
+        return PropertyValueForSerializer(m_propertySet.propertyAt(index));
+    }
+
+    StylePropertySet::PropertyReference property = m_propertySet.propertyAt(m_allIndex);
+    const CSSValue* value = property.value();
+
+    // FIXME: Firefox shows properties with "unset" when some cssRule has
+    // expanded "all" with "unset". So we should use "unset" here.
+    // After implementing "unset" value correctly, (i.e. StyleBuilder should
+    // support "display: unset", "color: unset", ... and so on),
+    // we should fix the following code.
+    if (!value->isInitialValue() && !value->isInheritedValue()) {
+        if (CSSPropertyMetadata::isInheritedProperty(propertyID))
+            value = cssValuePool().createInheritedValue().get();
+        else
+            value = cssValuePool().createExplicitInitialValue().get();
+    }
+    return PropertyValueForSerializer(propertyID, value, property.isImportant());
+}
+
+bool StylePropertySetForSerializer::shouldProcessPropertyAt(unsigned index) const
+{
+    // StylePropertySet has all valid longhands. We should process.
+    if (!hasAllProperty())
+        return true;
+
+    // If all is not expanded, we need to process "all" and properties which
+    // are not overwritten by "all".
+    if (!m_needToExpandAll) {
+        StylePropertySet::PropertyReference property = m_propertySet.propertyAt(index);
+        if (property.id() == CSSPropertyAll || !CSSProperty::isAffectedByAllProperty(property.id()))
+            return true;
+        return m_longhandPropertyUsed.get(property.id() - firstCSSProperty);
+    }
+
+    CSSPropertyID propertyID = static_cast<CSSPropertyID>(index + firstCSSProperty);
+    ASSERT(firstCSSProperty <= propertyID && propertyID <= lastCSSProperty);
+
+    // Since "all" is expanded, we don't need to process "all".
+    // We should not process expanded shorthands (e.g. font, background,
+    // and so on) either.
+    if (isExpandedShorthandForAll(propertyID) || propertyID == CSSPropertyAll)
+        return false;
+    // We should not serialize internal properties.
+    if (isInternalProperty(propertyID))
+        return false;
+
+    // The all property is a shorthand that resets all CSS properties except
+    // direction and unicode-bidi. It only accepts the CSS-wide keywords.
+    // c.f. http://dev.w3.org/csswg/css-cascade/#all-shorthand
+    if (!CSSProperty::isAffectedByAllProperty(propertyID))
+        return m_longhandPropertyUsed.get(index);
+
+    return true;
+}
+
+int StylePropertySetForSerializer::findPropertyIndex(CSSPropertyID propertyID) const
+{
+    if (!hasExpandedAllProperty())
+        return m_propertySet.findPropertyIndex(propertyID);
+    return propertyID - firstCSSProperty;
+}
+
+const CSSValue* StylePropertySetForSerializer::getPropertyCSSValue(CSSPropertyID propertyID) const
+{
+    int index = findPropertyIndex(propertyID);
+    if (index == -1)
+        return 0;
+    PropertyValueForSerializer value = propertyAt(index);
+    return value.value();
+}
+
+String StylePropertySetForSerializer::getPropertyValue(CSSPropertyID propertyID) const
+{
+    if (!hasExpandedAllProperty())
+        return m_propertySet.getPropertyValue(propertyID);
+
+    const CSSValue* value = getPropertyCSSValue(propertyID);
+    if (!value)
+        return String();
+    return value->cssText();
+}
+
+bool StylePropertySetForSerializer::isPropertyImplicit(CSSPropertyID propertyID) const
+{
+    int index = findPropertyIndex(propertyID);
+    if (index == -1)
+        return false;
+    PropertyValueForSerializer value = propertyAt(index);
+    return value.isImplicit();
+}
+
+bool StylePropertySetForSerializer::propertyIsImportant(CSSPropertyID propertyID) const
+{
+    int index = findPropertyIndex(propertyID);
+    if (index == -1)
+        return false;
+    PropertyValueForSerializer value = propertyAt(index);
+    return value.isImportant();
+}
+
 StylePropertySerializer::StylePropertySerializer(const StylePropertySet& properties)
     : m_propertySet(properties)
 {
 }
 
 String StylePropertySerializer::getPropertyText(CSSPropertyID propertyID, const String& value, bool isImportant, bool isNotFirstDecl) const
 {
     StringBuilder result;
     if (isNotFirstDecl)
         result.append(' ');
     result.append(getPropertyName(propertyID));
     result.appendLiteral(": ");
     result.append(value);
     if (isImportant)
         result.appendLiteral(" !important");
     result.append(';');
     return result.toString();
 }
 
 String StylePropertySerializer::asText() const
 {
     StringBuilder result;
 
     BitArray<numCSSProperties> shorthandPropertyUsed;
     BitArray<numCSSProperties> shorthandPropertyAppeared;
 
     unsigned size = m_propertySet.propertyCount();
     unsigned numDecls = 0;
     for (unsigned n = 0; n < size; ++n) {
-        StylePropertySet::PropertyReference property = m_propertySet.propertyAt(n);
+        if (!m_propertySet.shouldProcessPropertyAt(n))
+            continue;
+
+        PropertyValueForSerializer property = m_propertySet.propertyAt(n);
         CSSPropertyID propertyID = property.id();
         // Only enabled or internal properties should be part of the style.
         ASSERT(CSSPropertyMetadata::isEnabledProperty(propertyID) || isInternalProperty(propertyID));
         CSSPropertyID shorthandPropertyID = CSSPropertyInvalid;
         CSSPropertyID borderFallbackShorthandProperty = CSSPropertyInvalid;
         String value;
+        ASSERT(!isExpandedShorthandForAll(propertyID));
 
         switch (propertyID) {
         case CSSPropertyBackgroundAttachment:
         case CSSPropertyBackgroundClip:
         case CSSPropertyBackgroundColor:
         case CSSPropertyBackgroundImage:
         case CSSPropertyBackgroundOrigin:
         case CSSPropertyBackgroundPositionX:
         case CSSPropertyBackgroundPositionY:
         case CSSPropertyBackgroundSize:
@@ skipping 114 matching lines @@
         case CSSPropertyWebkitTransformOriginY:
         case CSSPropertyWebkitTransformOriginZ:
             shorthandPropertyID = CSSPropertyWebkitTransformOrigin;
             break;
         case CSSPropertyWebkitTransitionProperty:
         case CSSPropertyWebkitTransitionDuration:
         case CSSPropertyWebkitTransitionTimingFunction:
         case CSSPropertyWebkitTransitionDelay:
             shorthandPropertyID = CSSPropertyWebkitTransition;
             break;
+        case CSSPropertyAll:
+            result.append(getPropertyText(propertyID, property.value()->cssText(), property.isImportant(), numDecls++));
+            continue;
         default:
             break;
         }
 
         unsigned shortPropertyIndex = shorthandPropertyID - firstCSSProperty;
         if (shorthandPropertyID) {
             if (shorthandPropertyUsed.get(shortPropertyIndex))
                 continue;
             if (!shorthandPropertyAppeared.get(shortPropertyIndex) && value.isNull())
                 value = m_propertySet.getPropertyValue(shorthandPropertyID);
             shorthandPropertyAppeared.set(shortPropertyIndex);
         }
 
         if (!value.isNull()) {
             if (shorthandPropertyID) {
                 propertyID = shorthandPropertyID;
                 shorthandPropertyUsed.set(shortPropertyIndex);
             }
-        } else
+        } else {
+            // We should not show "initial" when the "initial" is implicit.
+            // If explicit "initial", we need to show.
+            if (property.value()->isImplicitInitialValue())
+                continue;
             value = property.value()->cssText();
-
-        if (value == "initial" && !CSSPropertyMetadata::isInheritedProperty(propertyID))
-            continue;
+        }
 
         result.append(getPropertyText(propertyID, value, property.isImportant(), numDecls++));
     }
 
     if (shorthandPropertyAppeared.get(CSSPropertyBackground - firstCSSProperty))
         appendBackgroundPropertyAsText(result, numDecls);
 
     ASSERT(!numDecls ^ !result.isEmpty());
     return result.toString();
 }
@@ skipping 69 matching lines @@
     case CSSPropertyWebkitTextStroke:
         return getShorthandValue(webkitTextStrokeShorthand());
     case CSSPropertyTransformOrigin:
     case CSSPropertyWebkitTransformOrigin:
         return getShorthandValue(webkitTransformOriginShorthand());
     case CSSPropertyWebkitTransition:
         return getLayeredShorthandValue(webkitTransitionShorthand());
     case CSSPropertyWebkitAnimation:
         return getLayeredShorthandValue(webkitAnimationShorthand());
     case CSSPropertyMarker: {
-        RefPtrWillBeRawPtr<CSSValue> value = m_propertySet.getPropertyCSSValue(CSSPropertyMarkerStart);
-        if (value)
+        if (const CSSValue* value = m_propertySet.getPropertyCSSValue(CSSPropertyMarkerStart))
             return value->cssText();
         return String();
     }
     case CSSPropertyBorderRadius:
         return get4Values(borderRadiusShorthand());
     default:
         return String();
     }
 }
 
 String StylePropertySerializer::borderSpacingValue(const StylePropertyShorthand& shorthand) const
 {
-    RefPtrWillBeRawPtr<CSSValue> horizontalValue = m_propertySet.getPropertyCSSValue(shorthand.properties()[0]);
-    RefPtrWillBeRawPtr<CSSValue> verticalValue = m_propertySet.getPropertyCSSValue(shorthand.properties()[1]);
+    const CSSValue* horizontalValue = m_propertySet.getPropertyCSSValue(shorthand.properties()[0]);
+    const CSSValue* verticalValue = m_propertySet.getPropertyCSSValue(shorthand.properties()[1]);
 
     // While standard border-spacing property does not allow specifying border-spacing-vertical without
     // specifying border-spacing-horizontal <http://www.w3.org/TR/CSS21/tables.html#separated-borders>,
     // -webkit-border-spacing-vertical can be set without -webkit-border-spacing-horizontal.
     if (!horizontalValue || !verticalValue)
         return String();
 
     String horizontalValueCSSText = horizontalValue->cssText();
     String verticalValueCSSText = verticalValue->cssText();
     if (horizontalValueCSSText == verticalValueCSSText)
@@ skipping 37 matching lines @@
         commonValue = String();
 }
 
 String StylePropertySerializer::fontValue() const
 {
     int fontSizePropertyIndex = m_propertySet.findPropertyIndex(CSSPropertyFontSize);
     int fontFamilyPropertyIndex = m_propertySet.findPropertyIndex(CSSPropertyFontFamily);
     if (fontSizePropertyIndex == -1 || fontFamilyPropertyIndex == -1)
         return emptyString();
 
-    StylePropertySet::PropertyReference fontSizeProperty = m_propertySet.propertyAt(fontSizePropertyIndex);
-    StylePropertySet::PropertyReference fontFamilyProperty = m_propertySet.propertyAt(fontFamilyPropertyIndex);
+    PropertyValueForSerializer fontSizeProperty = m_propertySet.propertyAt(fontSizePropertyIndex);
+    PropertyValueForSerializer fontFamilyProperty = m_propertySet.propertyAt(fontFamilyPropertyIndex);
     if (fontSizeProperty.isImplicit() || fontFamilyProperty.isImplicit())
         return emptyString();
 
     String commonValue = fontSizeProperty.value()->cssText();
     StringBuilder result;
     appendFontLonghandValueIfExplicit(CSSPropertyFontStyle, result, commonValue);
     appendFontLonghandValueIfExplicit(CSSPropertyFontVariant, result, commonValue);
     appendFontLonghandValueIfExplicit(CSSPropertyFontWeight, result, commonValue);
     appendFontLonghandValueIfExplicit(CSSPropertyFontStretch, result, commonValue);
     if (!result.isEmpty())
@@ skipping 12 matching lines @@
 {
     // Assume the properties are in the usual order top, right, bottom, left.
     int topValueIndex = m_propertySet.findPropertyIndex(shorthand.properties()[0]);
     int rightValueIndex = m_propertySet.findPropertyIndex(shorthand.properties()[1]);
     int bottomValueIndex = m_propertySet.findPropertyIndex(shorthand.properties()[2]);
     int leftValueIndex = m_propertySet.findPropertyIndex(shorthand.properties()[3]);
 
     if (topValueIndex == -1 || rightValueIndex == -1 || bottomValueIndex == -1 || leftValueIndex == -1)
         return String();
 
-    StylePropertySet::PropertyReference top = m_propertySet.propertyAt(topValueIndex);
-    StylePropertySet::PropertyReference right = m_propertySet.propertyAt(rightValueIndex);
-    StylePropertySet::PropertyReference bottom = m_propertySet.propertyAt(bottomValueIndex);
-    StylePropertySet::PropertyReference left = m_propertySet.propertyAt(leftValueIndex);
+    PropertyValueForSerializer top = m_propertySet.propertyAt(topValueIndex);
+    PropertyValueForSerializer right = m_propertySet.propertyAt(rightValueIndex);
+    PropertyValueForSerializer bottom = m_propertySet.propertyAt(bottomValueIndex);
+    PropertyValueForSerializer left = m_propertySet.propertyAt(leftValueIndex);
 
         // All 4 properties must be specified.
     if (!top.value() || !right.value() || !bottom.value() || !left.value())
         return String();
 
     if (top.isInherited() && right.isInherited() && bottom.isInherited() && left.isInherited())
         return getValueName(CSSValueInherit);
 
     if (top.value()->isInitialValue() || right.value()->isInitialValue() || bottom.value()->isInitialValue() || left.value()->isInitialValue()) {
         if (top.value()->isInitialValue() && right.value()->isInitialValue() && bottom.value()->isInitialValue() && left.value()->isInitialValue() && !top.isImplicit()) {
@@ skipping 25 matching lines @@
     }
     return result.toString();
 }
 
 String StylePropertySerializer::getLayeredShorthandValue(const StylePropertyShorthand& shorthand) const
 {
     StringBuilder result;
 
     const unsigned size = shorthand.length();
     // Begin by collecting the properties into an array.
-    WillBeHeapVector<RefPtrWillBeMember<CSSValue> > values(size);
+    WillBeHeapVector<const CSSValue*> values(size);
     size_t numLayers = 0;
 
     for (unsigned i = 0; i < size; ++i) {
         values[i] = m_propertySet.getPropertyCSSValue(shorthand.properties()[i]);
         if (values[i]) {
             if (values[i]->isBaseValueList()) {
-                CSSValueList* valueList = toCSSValueList(values[i].get());
+                const CSSValueList* valueList = toCSSValueList(values[i]);
                 numLayers = std::max(valueList->length(), numLayers);
             } else {
                 numLayers = std::max<size_t>(1U, numLayers);
             }
         }
     }
 
     String commonValue;
     bool commonValueInitialized = false;
 
     // Now stitch the properties together. Implicit initial values are flagged as such and
     // can safely be omitted.
     for (size_t i = 0; i < numLayers; i++) {
         StringBuilder layerResult;
         bool useRepeatXShorthand = false;
         bool useRepeatYShorthand = false;
         bool useSingleWordShorthand = false;
         bool foundPositionYCSSProperty = false;
         for (unsigned j = 0; j < size; j++) {
-            RefPtrWillBeRawPtr<CSSValue> value = nullptr;
+            const CSSValue* value = 0;
             if (values[j]) {
                 if (values[j]->isBaseValueList()) {
-                    value = toCSSValueList(values[j].get())->itemWithBoundsCheck(i);
+                    value = toCSSValueList(values[j])->itemWithBoundsCheck(i);
                 } else {
                     value = values[j];
 
                     // Color only belongs in the last layer.
                     if (shorthand.properties()[j] == CSSPropertyBackgroundColor) {
                         if (i != numLayers - 1)
-                            value = nullptr;
+                            value = 0;
                     } else if (i) {
                         // Other singletons only belong in the first layer.
-                        value = nullptr;
+                        value = 0;
                     }
                 }
             }
 
             // We need to report background-repeat as it was written in the CSS. If the property is implicit,
             // then it was written with only one value. Here we figure out which value that was so we can
             // report back correctly.
             if ((shorthand.properties()[j] == CSSPropertyBackgroundRepeatX && m_propertySet.isPropertyImplicit(shorthand.properties()[j]))
                 || (shorthand.properties()[j] == CSSPropertyWebkitMaskRepeatX && m_propertySet.isPropertyImplicit(shorthand.properties()[j]))) {
 
                 // BUG 49055: make sure the value was not reset in the layer check just above.
                 if ((j < size - 1 && shorthand.properties()[j + 1] == CSSPropertyBackgroundRepeatY && value)
                     || (j < size - 1 && shorthand.properties()[j + 1] == CSSPropertyWebkitMaskRepeatY && value)) {
-                    RefPtrWillBeRawPtr<CSSValue> yValue = nullptr;
-                    RefPtrWillBeRawPtr<CSSValue> nextValue = values[j + 1];
+                    const CSSValue* yValue = 0;
+                    const CSSValue* nextValue = values[j + 1];
                     if (nextValue->isValueList())
-                        yValue = toCSSValueList(nextValue.get())->item(i);
+                        yValue = toCSSValueList(nextValue)->item(i);
                     else
                         yValue = nextValue;
 
                     // background-repeat-x(y) or mask-repeat-x(y) may be like this : "initial, repeat". We can omit the implicit initial values
                     // before starting to compare their values.
                     if (value->isImplicitInitialValue() || yValue->isImplicitInitialValue())
                         continue;
 
                     // FIXME: At some point we need to fix this code to avoid returning an invalid shorthand,
                     // since some longhand combinations are not serializable into a single shorthand.
                     if (!value->isPrimitiveValue() || !yValue->isPrimitiveValue())
                         continue;
 
-                    CSSValueID xId = toCSSPrimitiveValue(value.get())->getValueID();
-                    CSSValueID yId = toCSSPrimitiveValue(yValue.get())->getValueID();
+                    CSSValueID xId = toCSSPrimitiveValue(value)->getValueID();
+                    CSSValueID yId = toCSSPrimitiveValue(yValue)->getValueID();
                     if (xId != yId) {
                         if (xId == CSSValueRepeat && yId == CSSValueNoRepeat) {
                             useRepeatXShorthand = true;
                             ++j;
                         } else if (xId == CSSValueNoRepeat && yId == CSSValueRepeat) {
                             useRepeatYShorthand = true;
                             continue;
                         }
                     } else {
                         useSingleWordShorthand = true;
@@ skipping 58 matching lines @@
         return String();
     return result.toString();
 }
 
 String StylePropertySerializer::getShorthandValue(const StylePropertyShorthand& shorthand) const
 {
     String commonValue;
     StringBuilder result;
     for (unsigned i = 0; i < shorthand.length(); ++i) {
         if (!m_propertySet.isPropertyImplicit(shorthand.properties()[i])) {
-            RefPtrWillBeRawPtr<CSSValue> value = m_propertySet.getPropertyCSSValue(shorthand.properties()[i]);
+            const CSSValue* value = m_propertySet.getPropertyCSSValue(shorthand.properties()[i]);
             if (!value)
                 return String();
             String valueText = value->cssText();
             if (!i)
                 commonValue = valueText;
             else if (!commonValue.isNull() && commonValue != valueText)
                 commonValue = String();
             if (value->isInitialValue())
                 continue;
             if (!result.isEmpty())
                 result.append(' ');
             result.append(valueText);
         } else
             commonValue = String();
     }
     if (isInitialOrInherit(commonValue))
         return commonValue;
     if (result.isEmpty())
         return String();
     return result.toString();
 }
 
 // only returns a non-null value if all properties have the same, non-null value
 String StylePropertySerializer::getCommonValue(const StylePropertyShorthand& shorthand) const
 {
     String res;
     bool lastPropertyWasImportant = false;
     for (unsigned i = 0; i < shorthand.length(); ++i) {
-        RefPtrWillBeRawPtr<CSSValue> value = m_propertySet.getPropertyCSSValue(shorthand.properties()[i]);
+        const CSSValue* value = m_propertySet.getPropertyCSSValue(shorthand.properties()[i]);
         // FIXME: CSSInitialValue::cssText should generate the right value.
         if (!value)
             return String();
         String text = value->cssText();
         if (text.isNull())
             return String();
         if (res.isNull())
             res = text;
         else if (res != text)
             return String();
@@ skipping 50 matching lines @@
         builder.appendLiteral("repeat-x");
     } else {
         builder.append(repeatX.cssText());
         builder.appendLiteral(" ");
         builder.append(repeatY.cssText());
     }
 }
 
 String StylePropertySerializer::backgroundRepeatPropertyValue() const
 {
-    RefPtrWillBeRawPtr<CSSValue> repeatX = m_propertySet.getPropertyCSSValue(CSSPropertyBackgroundRepeatX);
-    RefPtrWillBeRawPtr<CSSValue> repeatY = m_propertySet.getPropertyCSSValue(CSSPropertyBackgroundRepeatY);
+    const CSSValue* repeatX = m_propertySet.getPropertyCSSValue(CSSPropertyBackgroundRepeatX);
+    const CSSValue* repeatY = m_propertySet.getPropertyCSSValue(CSSPropertyBackgroundRepeatY);
     if (!repeatX || !repeatY)
         return String();
     if (m_propertySet.propertyIsImportant(CSSPropertyBackgroundRepeatX) != m_propertySet.propertyIsImportant(CSSPropertyBackgroundRepeatY))
         return String();
     if (repeatX->cssValueType() == repeatY->cssValueType()
         && (repeatX->cssValueType() == CSSValue::CSS_INITIAL || repeatX->cssValueType() == CSSValue::CSS_INHERIT)) {
         return repeatX->cssText();
     }
 
-    RefPtrWillBeRawPtr<CSSValueList> repeatXList;
-    if (repeatX->cssValueType() == CSSValue::CSS_PRIMITIVE_VALUE) {
-        repeatXList = CSSValueList::createCommaSeparated();
-        repeatXList->append(repeatX);
-    } else if (repeatX->cssValueType() == CSSValue::CSS_VALUE_LIST) {
-        repeatXList = toCSSValueList(repeatX.get());
-    } else {
+    const CSSValueList* repeatXList = 0;
+    int repeatXLength = 1;
+    if (repeatX->cssValueType() == CSSValue::CSS_VALUE_LIST) {
+        repeatXList = toCSSValueList(repeatX);
+        repeatXLength = repeatXList->length();
+    } else if (repeatX->cssValueType() != CSSValue::CSS_PRIMITIVE_VALUE) {
         return String();
     }
 
-    RefPtrWillBeRawPtr<CSSValueList> repeatYList;
-    if (repeatY->cssValueType() == CSSValue::CSS_PRIMITIVE_VALUE) {
-        repeatYList = CSSValueList::createCommaSeparated();
-        repeatYList->append(repeatY);
-    } else if (repeatY->cssValueType() == CSSValue::CSS_VALUE_LIST) {
-        repeatYList = toCSSValueList(repeatY.get());
-    } else {
+    const CSSValueList* repeatYList = 0;
+    int repeatYLength = 1;
+    if (repeatY->cssValueType() == CSSValue::CSS_VALUE_LIST) {
+        repeatYList = toCSSValueList(repeatY);
+        repeatYLength = repeatYList->length();
+    } else if (repeatY->cssValueType() != CSSValue::CSS_PRIMITIVE_VALUE) {
         return String();
     }
 
-    size_t shorthandLength = lowestCommonMultiple(repeatXList->length(), repeatYList->length());
+    size_t shorthandLength = lowestCommonMultiple(repeatXLength, repeatYLength);
     StringBuilder builder;
     for (size_t i = 0; i < shorthandLength; ++i) {
         if (i)
             builder.appendLiteral(", ");
-        appendBackgroundRepeatValue(builder,
-            *repeatXList->item(i % repeatXList->length()),
-            *repeatYList->item(i % repeatYList->length()));
+
+        const CSSValue* xValue = repeatXList ? repeatXList->item(i % repeatXList->length()) : repeatX;
+        const CSSValue* yValue = repeatYList ? repeatYList->item(i % repeatYList->length()) : repeatY;
+        appendBackgroundRepeatValue(builder, *xValue, *yValue);
     }
     return builder.toString();
 }
 
 void StylePropertySerializer::appendBackgroundPropertyAsText(StringBuilder& result, unsigned& numDecls) const
 {
     if (isPropertyShorthandAvailable(backgroundShorthand())) {
         String backgroundValue = getPropertyValue(CSSPropertyBackground);
         bool isImportant = m_propertySet.propertyIsImportant(CSSPropertyBackgroundImage);
         result.append(getPropertyText(CSSPropertyBackground, backgroundValue, isImportant, numDecls++));
         return;
     }
     if (shorthandHasOnlyInitialOrInheritedValue(backgroundShorthand())) {
-        RefPtrWillBeRawPtr<CSSValue> value = m_propertySet.getPropertyCSSValue(CSSPropertyBackgroundImage);
+        const CSSValue* value = m_propertySet.getPropertyCSSValue(CSSPropertyBackgroundImage);
         bool isImportant = m_propertySet.propertyIsImportant(CSSPropertyBackgroundImage);
         result.append(getPropertyText(CSSPropertyBackground, value->cssText(), isImportant, numDecls++));
         return;
     }
 
     // backgroundShorthandProperty without layered shorhand properties
     const CSSPropertyID backgroundPropertyIds[] = {
         CSSPropertyBackgroundImage,
         CSSPropertyBackgroundAttachment,
         CSSPropertyBackgroundColor,
         CSSPropertyBackgroundSize,
         CSSPropertyBackgroundOrigin,
         CSSPropertyBackgroundClip
     };
 
     for (unsigned i = 0; i < WTF_ARRAY_LENGTH(backgroundPropertyIds); ++i) {
         CSSPropertyID propertyID = backgroundPropertyIds[i];
-        RefPtrWillBeRawPtr<CSSValue> value = m_propertySet.getPropertyCSSValue(propertyID);
+        const CSSValue* value = m_propertySet.getPropertyCSSValue(propertyID);
         if (!value)
             continue;
         result.append(getPropertyText(propertyID, value->cssText(), m_propertySet.propertyIsImportant(propertyID), numDecls++));
     }
 
     // FIXME: This is a not-so-nice way to turn x/y positions into single background-position in output.
     // It is required because background-position-x/y are non-standard properties and WebKit generated output
     // would not work in Firefox (<rdar://problem/5143183>)
     // It would be a better solution if background-position was CSS_PAIR.
     if (shorthandHasOnlyInitialOrInheritedValue(backgroundPositionShorthand())) {
-        RefPtrWillBeRawPtr<CSSValue> value = m_propertySet.getPropertyCSSValue(CSSPropertyBackgroundPositionX);
+        const CSSValue* value = m_propertySet.getPropertyCSSValue(CSSPropertyBackgroundPositionX);
         bool isImportant = m_propertySet.propertyIsImportant(CSSPropertyBackgroundPositionX);
         result.append(getPropertyText(CSSPropertyBackgroundPosition, value->cssText(), isImportant, numDecls++));
     } else if (isPropertyShorthandAvailable(backgroundPositionShorthand())) {
         String positionValue = m_propertySet.getPropertyValue(CSSPropertyBackgroundPosition);
         bool isImportant = m_propertySet.propertyIsImportant(CSSPropertyBackgroundPositionX);
         if (!positionValue.isNull())
             result.append(getPropertyText(CSSPropertyBackgroundPosition, positionValue, isImportant, numDecls++));
     } else {
         // should check background-position-x or background-position-y.
-        if (RefPtrWillBeRawPtr<CSSValue> value = m_propertySet.getPropertyCSSValue(CSSPropertyBackgroundPositionX)) {
+        if (const CSSValue* value = m_propertySet.getPropertyCSSValue(CSSPropertyBackgroundPositionX)) {
             if (!value->isImplicitInitialValue()) {
                 bool isImportant = m_propertySet.propertyIsImportant(CSSPropertyBackgroundPositionX);
                 result.append(getPropertyText(CSSPropertyBackgroundPositionX, value->cssText(), isImportant, numDecls++));
             }
         }
-        if (RefPtrWillBeRawPtr<CSSValue> value = m_propertySet.getPropertyCSSValue(CSSPropertyBackgroundPositionY)) {
+        if (const CSSValue* value = m_propertySet.getPropertyCSSValue(CSSPropertyBackgroundPositionY)) {
             if (!value->isImplicitInitialValue()) {
                 bool isImportant = m_propertySet.propertyIsImportant(CSSPropertyBackgroundPositionY);
                 result.append(getPropertyText(CSSPropertyBackgroundPositionY, value->cssText(), isImportant, numDecls++));
             }
         }
     }
 
     String repeatValue = m_propertySet.getPropertyValue(CSSPropertyBackgroundRepeat);
     if (!repeatValue.isNull())
         result.append(getPropertyText(CSSPropertyBackgroundRepeat, repeatValue, m_propertySet.propertyIsImportant(CSSPropertyBackgroundRepeatX), numDecls++));
 }
 
 bool StylePropertySerializer::isPropertyShorthandAvailable(const StylePropertyShorthand& shorthand) const
 {
     ASSERT(shorthand.length() > 0);
 
     bool isImportant = m_propertySet.propertyIsImportant(shorthand.properties()[0]);
     for (unsigned i = 0; i < shorthand.length(); ++i) {
-        RefPtrWillBeRawPtr<CSSValue> value = m_propertySet.getPropertyCSSValue(shorthand.properties()[i]);
+        const CSSValue* value = m_propertySet.getPropertyCSSValue(shorthand.properties()[i]);
         if (!value || (value->isInitialValue() && !value->isImplicitInitialValue()) || value->isInheritedValue())
             return false;
         if (isImportant != m_propertySet.propertyIsImportant(shorthand.properties()[i]))
             return false;
     }
     return true;
 }
 
 bool StylePropertySerializer::shorthandHasOnlyInitialOrInheritedValue(const StylePropertyShorthand& shorthand) const
 {
     ASSERT(shorthand.length() > 0);
     bool isImportant = m_propertySet.propertyIsImportant(shorthand.properties()[0]);
     bool isInitialValue = true;
     bool isInheritedValue = true;
     for (unsigned i = 0; i < shorthand.length(); ++i) {
-        RefPtrWillBeRawPtr<CSSValue> value = m_propertySet.getPropertyCSSValue(shorthand.properties()[i]);
+        const CSSValue* value = m_propertySet.getPropertyCSSValue(shorthand.properties()[i]);
         if (!value)
             return false;
         if (!value->isInitialValue())
             isInitialValue = false;
         if (!value->isInheritedValue())
             isInheritedValue = false;
         if (isImportant != m_propertySet.propertyIsImportant(shorthand.properties()[i]))
             return false;
     }
     return isInitialValue || isInheritedValue;
 }
 
 }