Diff
Modified: trunk/LayoutTests/ChangeLog (114698 => 114699)
--- trunk/LayoutTests/ChangeLog 2012-04-20 00:05:37 UTC (rev 114698)
+++ trunk/LayoutTests/ChangeLog 2012-04-20 00:08:22 UTC (rev 114699)
@@ -1,3 +1,21 @@
+2012-04-19 David Barr <[email protected]>
+
+ REGRESSION(r112177): Numbered list item rendered bulleted
+ https://bugs.webkit.org/show_bug.cgi?id=84216
+
+ Reviewed by Ryosuke Niwa.
+
+ Shorthands that imply omitted values cannot be derived from
+ an incomplete set of longhand rules.
+
+ No new tests; updated existing tests that should have caught this.
+
+ * css3/flexbox/css-properties.html:
+ * fast/css/cssText-shorthand.html:
+ * fast/css/uri-token-parsing-expected.txt:
+ * fast/css/uri-token-parsing.html:
+ * fast/dom/css-dom-read-2-expected.txt:
+
2012-04-19 Christophe Dumez <[email protected]>
[EFL] DRT console messages should contain only the file name part of local URIs
Modified: trunk/LayoutTests/css3/flexbox/css-properties.html (114698 => 114699)
--- trunk/LayoutTests/css3/flexbox/css-properties.html 2012-04-20 00:05:37 UTC (rev 114698)
+++ trunk/LayoutTests/css3/flexbox/css-properties.html 2012-04-20 00:08:22 UTC (rev 114699)
@@ -249,6 +249,7 @@
shouldBeEqualToString('flexbox.style.webkitFlexFlow', '');
shouldBeEqualToString('window.getComputedStyle(flexbox, null).webkitFlexFlow', 'row none');
flexbox.style.webkitFlexDirection = 'column';
+flexbox.style.webkitFlexWrap = 'initial';
shouldBeEqualToString('flexbox.style.webkitFlexFlow', 'column');
shouldBeEqualToString('window.getComputedStyle(flexbox, null).webkitFlexFlow', 'column none');
flexbox.style.webkitFlexWrap = 'wrap';
Modified: trunk/LayoutTests/fast/css/cssText-shorthand.html (114698 => 114699)
--- trunk/LayoutTests/fast/css/cssText-shorthand.html 2012-04-20 00:05:37 UTC (rev 114698)
+++ trunk/LayoutTests/fast/css/cssText-shorthand.html 2012-04-20 00:08:22 UTC (rev 114699)
@@ -29,7 +29,7 @@
['font-family: sans-serif; line-height: 2em; font-size: 3em; font-style: italic; font-weight: bold;',
'font-family: sans-serif; line-height: 2em; font-size: 3em; font-style: italic; font-weight: bold;'],
- ['list-style-type: circle; list-style-position: inside;', 'list-style: circle inside;'],
+ ['list-style-type: circle; list-style-position: inside; list-style-image: initial;', 'list-style: circle inside;'],
['margin-top: 1px; margin-right: 2px; margin-bottom: 3px; margin-left: 4px;', 'margin: 1px 2px 3px 4px;'],
['outline-width: 2px; outline-style: dotted; outline-color: blue;', 'outline: blue dotted 2px;'],
['overflow-x: scroll; overflow-y: hidden;', 'overflow: scroll hidden;'],
Modified: trunk/LayoutTests/fast/css/uri-token-parsing-expected.txt (114698 => 114699)
--- trunk/LayoutTests/fast/css/uri-token-parsing-expected.txt 2012-04-20 00:05:37 UTC (rev 114698)
+++ trunk/LayoutTests/fast/css/uri-token-parsing-expected.txt 2012-04-20 00:08:22 UTC (rev 114699)
@@ -19,7 +19,7 @@
#o { content: url(f); }
#p { content: url('url(g)'); }
#q { cursor: url('url(q)'); }
-#r { list-style: url('url(r)'); }
+#r { list-style-image: url('url(r)'); }
#s { background-image: url('url(s)'); }
#t { -webkit-mask: url('url(t)'); }
#u { -webkit-border-image: url('url(u)') 1 2 3 4 fill stretch round; }
@@ -44,7 +44,7 @@
#o { content: url(f); }
#p { content: url('url(g)'); }
#q { cursor: url('url(q)'); }
-#r { list-style: url('url(r)'); }
+#r { list-style-image: url('url(r)'); }
#s { background-image: url('url(s)'); }
#t { -webkit-mask: url('url(t)'); }
#u { -webkit-border-image: url('url(u)') 1 2 3 4 fill stretch round; }
Modified: trunk/LayoutTests/fast/css/uri-token-parsing.html (114698 => 114699)
--- trunk/LayoutTests/fast/css/uri-token-parsing.html 2012-04-20 00:05:37 UTC (rev 114698)
+++ trunk/LayoutTests/fast/css/uri-token-parsing.html 2012-04-20 00:08:22 UTC (rev 114699)
@@ -93,7 +93,7 @@
#o { content: url(f); }
#p { content: url('url(g)'); }
#q { cursor: url('url(q)'); }
-#r { list-style: url('url(r)'); }
+#r { list-style-image: url('url(r)'); }
#s { background-image: url('url(s)'); }
#t { -webkit-mask: url('url(t)'); }
#u { -webkit-border-image: url('url(u)') 1 2 3 4 fill stretch round; }
Modified: trunk/LayoutTests/fast/dom/css-dom-read-2-expected.txt (114698 => 114699)
--- trunk/LayoutTests/fast/dom/css-dom-read-2-expected.txt 2012-04-20 00:05:37 UTC (rev 114698)
+++ trunk/LayoutTests/fast/dom/css-dom-read-2-expected.txt 2012-04-20 00:08:22 UTC (rev 114699)
@@ -43,7 +43,7 @@
}
.one { display: block; }
.two { display: inline; }
-.three { display: list-item; list-style: square; margin-left: 3em; }
+.three { display: list-item; list-style-type: square; margin-left: 3em; }
.four { display: none; color: red; }
i { display: block; }
Modified: trunk/Source/WebCore/ChangeLog (114698 => 114699)
--- trunk/Source/WebCore/ChangeLog 2012-04-20 00:05:37 UTC (rev 114698)
+++ trunk/Source/WebCore/ChangeLog 2012-04-20 00:08:22 UTC (rev 114699)
@@ -1,3 +1,21 @@
+2012-04-19 David Barr <[email protected]>
+
+ REGRESSION(r112177): Numbered list item rendered bulleted
+ https://bugs.webkit.org/show_bug.cgi?id=84216
+
+ Reviewed by Ryosuke Niwa.
+
+ Shorthands that imply omitted values cannot be derived from
+ an incomplete set of longhand rules.
+
+ No new tests; updated existing tests that should have caught this.
+
+ * css/CSSParser.cpp:
+ (WebCore::CSSParser::parseTransformOriginShorthand):
+ Set implicit initial for Z when omitted.
+ * css/StylePropertySet.cpp:
+ (WebCore::StylePropertySet::getShorthandValue):
+
2012-04-19 Peter Beverloo <[email protected]>
[Chromium] Don't compile FontCacheSkia for Android
Modified: trunk/Source/WebCore/css/CSSParser.cpp (114698 => 114699)
--- trunk/Source/WebCore/css/CSSParser.cpp 2012-04-20 00:05:37 UTC (rev 114698)
+++ trunk/Source/WebCore/css/CSSParser.cpp 2012-04-20 00:08:22 UTC (rev 114699)
@@ -3643,6 +3643,7 @@
}
return false;
}
+ value3 = cssValuePool().createImplicitInitialValue();
return true;
}
Modified: trunk/Source/WebCore/css/StylePropertySet.cpp (114698 => 114699)
--- trunk/Source/WebCore/css/StylePropertySet.cpp 2012-04-20 00:05:37 UTC (rev 114698)
+++ trunk/Source/WebCore/css/StylePropertySet.cpp 2012-04-20 00:08:22 UTC (rev 114699)
@@ -387,12 +387,13 @@
for (unsigned i = 0; i < shorthand.length(); ++i) {
if (!isPropertyImplicit(shorthand.properties()[i])) {
RefPtr<CSSValue> value = getPropertyCSSValue(shorthand.properties()[i]);
- // FIXME: provide default value if !value or value is initial value
- if (value && !value->isInitialValue()) {
- if (!res.isNull())
- res += " ";
- res += value->cssText();
- }
+ if (value && value->isInitialValue())
+ continue;
+ if (!value)
+ return String();
+ if (!res.isNull())
+ res += " ";
+ res += value->cssText();
}
}
return res;
