Changeset 132388 in webkit for trunk/Source/WebCore/css/CSSImageSetValue.cpp

Timestamp:

Oct 24, 2012, 1:18:36 PM (13 years ago)

Author:

[email protected]

Message:

image-set doesn't round-trip properly with cssText
​https://bugs.webkit.org/show_bug.cgi?id=99725

Patch by Rick Byers <​[email protected]> on 2012-10-24
Reviewed by Beth Dakin.

Source/WebCore:

Fix serialization of -webkit-image-set rules to use the same format as
is used for parsing.

Test: fast/css/image-set-setting.html

• css/CSSImageSetValue.cpp:

(WebCore::CSSImageSetValue::customCssText):

• css/CSSValueList.h:

(WebCore::CSSValueList::item): Add const overload

LayoutTests:

Update image-set-setting test to expect the css text to round-trip properly.

• fast/css/image-set-setting-expected.txt:
• fast/css/script-tests/image-set-setting.js:

(testComputedStyle):
(testImageSetRule):

File:

• trunk/Source/WebCore/css/CSSImageSetValue.cpp (modified) (1 diff)

trunk/Source/WebCore/css/CSSImageSetValue.cpp

@@ -141 +141 @@
 String CSSImageSetValue::customCssText() const
 {
-    return "-webkit-image-set(" + CSSValueList::customCssText() + ")";
+    StringBuilder result;
+    result.append("-webkit-image-set(");
+
+    size_t length = this->length();
+    size_t i = 0;
+    while (i < length) {
+        if (i > 0)
+            result.append(", ");
+
+        const CSSValue* imageValue = item(i);
+        result.append(imageValue->cssText());
+        result.append(' ');
+
+        ++i;
+        ASSERT(i < length);
+        const CSSValue* scaleFactorValue = item(i);
+        result.append(scaleFactorValue->cssText());
+        // FIXME: Eventually the scale factor should contain it's own unit http://wkb.ug/100120.
+        // For now 'x' is hard-coded in the parser, so we hard-code it here too.
+        result.append('x');
+
+        ++i;
+    }
+
+    result.append(")");
+    return result.toString();
 }