Diff
Modified: trunk/LayoutTests/ChangeLog (135373 => 135374)
--- trunk/LayoutTests/ChangeLog 2012-11-21 11:00:34 UTC (rev 135373)
+++ trunk/LayoutTests/ChangeLog 2012-11-21 11:00:55 UTC (rev 135374)
@@ -1,3 +1,15 @@
+2012-11-21 Alexander Pavlov <apav...@chromium.org>
+
+ Turn -webkit-text-emphasis into a shorthand property
+ https://bugs.webkit.org/show_bug.cgi?id=102879
+
+ Reviewed by Antti Koivisto.
+
+ Update expected results.
+
+ * fast/css/parsing-text-emphasis-expected.txt:
+ * fast/css/parsing-text-emphasis.html:
+
2012-11-21 Csaba Osztrogonác <o...@webkit.org>
[Qt] Unreviewed gardening, unskip now passing tests.
Modified: trunk/LayoutTests/fast/css/parsing-text-emphasis-expected.txt (135373 => 135374)
--- trunk/LayoutTests/fast/css/parsing-text-emphasis-expected.txt 2012-11-21 11:00:34 UTC (rev 135373)
+++ trunk/LayoutTests/fast/css/parsing-text-emphasis-expected.txt 2012-11-21 11:00:55 UTC (rev 135374)
@@ -38,13 +38,13 @@
PASS: '-webkit-text-emphasis: initial' parsed as ['', '', '', 'initial']
PASS: '-webkit-text-emphasis: inherit' parsed as ['', '', '', 'inherit']
-PASS: '-webkit-text-emphasis: red' parsed as ['red', '', 'initial', '']
-PASS: '-webkit-text-emphasis: "cheese"' parsed as ['initial', '', 'cheese', '']
-PASS: '-webkit-text-emphasis: red "cheese"' parsed as ['red', '', 'cheese', '']
-PASS: '-webkit-text-emphasis: "cheese" red' parsed as ['red', '', 'cheese', '']
-PASS: '-webkit-text-emphasis: filled sesame red' parsed as ['red', '', 'filled sesame', '']
-PASS: '-webkit-text-emphasis: red filled sesame' parsed as ['red', '', 'filled sesame', '']
+PASS: '-webkit-text-emphasis: red' parsed as ['red', '', 'initial', 'red']
+PASS: '-webkit-text-emphasis: "cheese"' parsed as ['initial', '', 'cheese', 'cheese']
+PASS: '-webkit-text-emphasis: red "cheese"' parsed as ['red', '', 'cheese', 'cheese red']
+PASS: '-webkit-text-emphasis: "cheese" red' parsed as ['red', '', 'cheese', 'cheese red']
+PASS: '-webkit-text-emphasis: filled sesame red' parsed as ['red', '', 'filled sesame', 'filled sesame red']
+PASS: '-webkit-text-emphasis: red filled sesame' parsed as ['red', '', 'filled sesame', 'filled sesame red']
PASS: '-webkit-text-emphasis: filled red sesame' parsed as ['', '', '', '']
-PASS: '-webkit-text-emphasis: red sesame filled' parsed as ['red', '', 'filled sesame', '']
-PASS: '-webkit-text-emphasis: sesame filled red' parsed as ['red', '', 'filled sesame', '']
+PASS: '-webkit-text-emphasis: red sesame filled' parsed as ['red', '', 'filled sesame', 'filled sesame red']
+PASS: '-webkit-text-emphasis: sesame filled red' parsed as ['red', '', 'filled sesame', 'filled sesame red']
Modified: trunk/LayoutTests/fast/css/parsing-text-emphasis.html (135373 => 135374)
--- trunk/LayoutTests/fast/css/parsing-text-emphasis.html 2012-11-21 11:00:34 UTC (rev 135373)
+++ trunk/LayoutTests/fast/css/parsing-text-emphasis.html 2012-11-21 11:00:55 UTC (rev 135374)
@@ -69,13 +69,13 @@
log("");
test('-webkit-text-emphasis: initial', '', '', '', 'initial');
test('-webkit-text-emphasis: inherit', '', '', '', 'inherit');
- test('-webkit-text-emphasis: red', 'red', '', 'initial');
- test('-webkit-text-emphasis: "cheese"', 'initial', '', 'cheese');
- test('-webkit-text-emphasis: red "cheese"', 'red', '', 'cheese');
- test('-webkit-text-emphasis: "cheese" red', 'red', '', 'cheese');
- test('-webkit-text-emphasis: filled sesame red', 'red', '', 'filled sesame');
- test('-webkit-text-emphasis: red filled sesame', 'red', '', 'filled sesame');
+ test('-webkit-text-emphasis: red', 'red', '', 'initial', 'red');
+ test('-webkit-text-emphasis: "cheese"', 'initial', '', 'cheese', 'cheese');
+ test('-webkit-text-emphasis: red "cheese"', 'red', '', 'cheese', 'cheese red');
+ test('-webkit-text-emphasis: "cheese" red', 'red', '', 'cheese', 'cheese red');
+ test('-webkit-text-emphasis: filled sesame red', 'red', '', 'filled sesame', 'filled sesame red');
+ test('-webkit-text-emphasis: red filled sesame', 'red', '', 'filled sesame', 'filled sesame red');
test('-webkit-text-emphasis: filled red sesame', '', '', '');
- test('-webkit-text-emphasis: red sesame filled', 'red', '', 'filled sesame');
- test('-webkit-text-emphasis: sesame filled red', 'red', '', 'filled sesame');
+ test('-webkit-text-emphasis: red sesame filled', 'red', '', 'filled sesame', 'filled sesame red');
+ test('-webkit-text-emphasis: sesame filled red', 'red', '', 'filled sesame', 'filled sesame red');
</script>
Modified: trunk/Source/WebCore/ChangeLog (135373 => 135374)
--- trunk/Source/WebCore/ChangeLog 2012-11-21 11:00:34 UTC (rev 135373)
+++ trunk/Source/WebCore/ChangeLog 2012-11-21 11:00:55 UTC (rev 135374)
@@ -1,3 +1,15 @@
+2012-11-21 Alexander Pavlov <apav...@chromium.org>
+
+ Turn -webkit-text-emphasis into a shorthand property
+ https://bugs.webkit.org/show_bug.cgi?id=102879
+
+ Reviewed by Antti Koivisto.
+
+ -webkit-text-emphasis value is no longer empty.
+
+ * css/StylePropertySet.cpp:
+ (WebCore::StylePropertySet::getPropertyValue): Reconstruct the -webkit-text-emphasis value based on the longhands.
+
2012-11-21 Kentaro Hara <hara...@chromium.org>
Unreviewed. Build fix.
Modified: trunk/Source/WebCore/css/StylePropertySet.cpp (135373 => 135374)
--- trunk/Source/WebCore/css/StylePropertySet.cpp 2012-11-21 11:00:34 UTC (rev 135373)
+++ trunk/Source/WebCore/css/StylePropertySet.cpp 2012-11-21 11:00:55 UTC (rev 135374)
@@ -173,6 +173,8 @@
return getLayeredShorthandValue(webkitMaskRepeatShorthand());
case CSSPropertyWebkitMask:
return getLayeredShorthandValue(webkitMaskShorthand());
+ case CSSPropertyWebkitTextEmphasis:
+ return getShorthandValue(webkitTextEmphasisShorthand());
case CSSPropertyWebkitTransformOrigin:
return getShorthandValue(webkitTransformOriginShorthand());
case CSSPropertyWebkitTransition:
