<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[164061] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/164061">164061</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-02-13 15:02:31 -0800 (Thu, 13 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[css3-text] Support -webkit-text-decoration-skip: objects
https://bugs.webkit.org/show_bug.cgi?id=128723
Patch by Yuki Sekiguchi <yuki.sekiguchi@access-company.com> on 2014-02-13
Reviewed by Dean Jackson.
Source/WebCore:
Implemented 'objects' value of text-decoration-skip.
http://www.w3.org/TR/2013/CR-css-text-decor-3-20130801/#text-decoration-skip
This is initial value and same behavior without
ENABLE_CSS3_TEXT_DECORATION_SKIP_INK flag. Threfore, this patch only
added parser code and constant for 'objects'.
Changed the initial value of text-decoration-skip.
The current implementation parses 'none', but the rendering code is
not match the spec, so this patch added FIXME to the rendering code.
* css/CSSComputedStyleDeclaration.cpp:
(WebCore::renderTextDecorationSkipFlagsToCSSValue):
* css/CSSParser.cpp:
(WebCore::CSSParser::parseTextDecorationSkip):
* css/CSSValueKeywords.in:
* css/DeprecatedStyleBuilder.cpp:
(WebCore::valueToDecorationSkip):
* rendering/InlineTextBox.cpp:
(WebCore::InlineTextBox::paintDecoration):
* rendering/style/RenderStyle.h:
* rendering/style/RenderStyleConstants.h:
LayoutTests:
Added 'objects' value to the current test case.
Added getComputedStyle() test to test renderTextDecorationSkipFlagsToCSSValue() code.
* fast/css3-text/css3-text-decoration/text-decoration-skip/text-decoration-skip-roundtrip-expected.txt:
* fast/css3-text/css3-text-decoration/text-decoration-skip/text-decoration-skip-roundtrip.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastcss3textcss3textdecorationtextdecorationskiptextdecorationskiproundtripexpectedtxt">trunk/LayoutTests/fast/css3-text/css3-text-decoration/text-decoration-skip/text-decoration-skip-roundtrip-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcss3textcss3textdecorationtextdecorationskiptextdecorationskiproundtriphtml">trunk/LayoutTests/fast/css3-text/css3-text-decoration/text-decoration-skip/text-decoration-skip-roundtrip.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssCSSComputedStyleDeclarationcpp">trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSParsercpp">trunk/Source/WebCore/css/CSSParser.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSValueKeywordsin">trunk/Source/WebCore/css/CSSValueKeywords.in</a></li>
<li><a href="#trunkSourceWebCorecssDeprecatedStyleBuildercpp">trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingInlineTextBoxcpp">trunk/Source/WebCore/rendering/InlineTextBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleRenderStyleh">trunk/Source/WebCore/rendering/style/RenderStyle.h</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleRenderStyleConstantsh">trunk/Source/WebCore/rendering/style/RenderStyleConstants.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (164060 => 164061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-02-13 22:59:40 UTC (rev 164060)
+++ trunk/LayoutTests/ChangeLog 2014-02-13 23:02:31 UTC (rev 164061)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-02-13 Yuki Sekiguchi <yuki.sekiguchi@access-company.com>
+
+ [css3-text] Support -webkit-text-decoration-skip: objects
+ https://bugs.webkit.org/show_bug.cgi?id=128723
+
+ Reviewed by Dean Jackson.
+
+ Added 'objects' value to the current test case.
+ Added getComputedStyle() test to test renderTextDecorationSkipFlagsToCSSValue() code.
+
+ * fast/css3-text/css3-text-decoration/text-decoration-skip/text-decoration-skip-roundtrip-expected.txt:
+ * fast/css3-text/css3-text-decoration/text-decoration-skip/text-decoration-skip-roundtrip.html:
+
</ins><span class="cx"> 2014-02-13 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> During a copy, position:fixed gets converted to position:absolute even if only part of the document is selected
</span></span></pre></div>
<a id="trunkLayoutTestsfastcss3textcss3textdecorationtextdecorationskiptextdecorationskiproundtripexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css3-text/css3-text-decoration/text-decoration-skip/text-decoration-skip-roundtrip-expected.txt (164060 => 164061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css3-text/css3-text-decoration/text-decoration-skip/text-decoration-skip-roundtrip-expected.txt 2014-02-13 22:59:40 UTC (rev 164060)
+++ trunk/LayoutTests/fast/css3-text/css3-text-decoration/text-decoration-skip/text-decoration-skip-roundtrip-expected.txt 2014-02-13 23:02:31 UTC (rev 164061)
</span><span class="lines">@@ -1,26 +1,67 @@
</span><span class="cx"> PASS cssRule.type is cssRule.STYLE_RULE
</span><ins>+PASS declaration.length is 0
+PASS declaration.getPropertyValue('-webkit-text-decoration-skip') is null
+PASS computedStyle.getPropertyCSSValue('-webkit-text-decoration-skip').cssText is "objects"
+PASS cssRule.type is cssRule.STYLE_RULE
</ins><span class="cx"> PASS declaration.length is 1
</span><ins>+PASS declaration.getPropertyValue('-webkit-text-decoration-skip') is "initial"
+PASS computedStyle.getPropertyCSSValue('-webkit-text-decoration-skip').cssText is "objects"
+PASS cssRule.type is cssRule.STYLE_RULE
+PASS declaration.length is 1
</ins><span class="cx"> PASS declaration.getPropertyValue('-webkit-text-decoration-skip') is "ink"
</span><ins>+PASS computedStyle.getPropertyCSSValue('-webkit-text-decoration-skip').cssText is "ink"
</ins><span class="cx"> PASS cssRule.type is cssRule.STYLE_RULE
</span><span class="cx"> PASS declaration.length is 1
</span><span class="cx"> PASS declaration.getPropertyValue('-webkit-text-decoration-skip') is "ink"
</span><ins>+PASS computedStyle.getPropertyCSSValue('-webkit-text-decoration-skip').cssText is "ink"
</ins><span class="cx"> PASS cssRule.type is cssRule.STYLE_RULE
</span><span class="cx"> PASS declaration.length is 0
</span><ins>+PASS computedStyle.getPropertyCSSValue('-webkit-text-decoration-skip').cssText is "objects"
</ins><span class="cx"> PASS cssRule.type is cssRule.STYLE_RULE
</span><span class="cx"> PASS declaration.length is 1
</span><span class="cx"> PASS declaration.getPropertyValue('-webkit-text-decoration-skip') is "ink"
</span><ins>+PASS computedStyle.getPropertyCSSValue('-webkit-text-decoration-skip').cssText is "ink"
</ins><span class="cx"> PASS cssRule.type is cssRule.STYLE_RULE
</span><span class="cx"> PASS declaration.length is 1
</span><span class="cx"> PASS declaration.getPropertyValue('-webkit-text-decoration-skip') is "ink"
</span><ins>+PASS computedStyle.getPropertyCSSValue('-webkit-text-decoration-skip').cssText is "ink"
</ins><span class="cx"> PASS cssRule.type is cssRule.STYLE_RULE
</span><span class="cx"> PASS declaration.length is 1
</span><span class="cx"> PASS declaration.getPropertyValue('-webkit-text-decoration-skip') is "ink"
</span><ins>+PASS computedStyle.getPropertyCSSValue('-webkit-text-decoration-skip').cssText is "ink"
</ins><span class="cx"> PASS cssRule.type is cssRule.STYLE_RULE
</span><span class="cx"> PASS declaration.length is 1
</span><span class="cx"> PASS declaration.getPropertyValue('-webkit-text-decoration-skip') is "ink"
</span><ins>+PASS computedStyle.getPropertyCSSValue('-webkit-text-decoration-skip').cssText is "ink"
</ins><span class="cx"> PASS cssRule.type is cssRule.STYLE_RULE
</span><span class="cx"> PASS declaration.length is 1
</span><ins>+PASS declaration.getPropertyValue('-webkit-text-decoration-skip') is "objects"
+PASS computedStyle.getPropertyCSSValue('-webkit-text-decoration-skip').cssText is "objects"
+PASS cssRule.type is cssRule.STYLE_RULE
+PASS declaration.length is 1
+PASS declaration.getPropertyValue('-webkit-text-decoration-skip') is "objects"
+PASS computedStyle.getPropertyCSSValue('-webkit-text-decoration-skip').cssText is "objects"
+PASS cssRule.type is cssRule.STYLE_RULE
+PASS declaration.length is 1
+PASS declaration.getPropertyValue('-webkit-text-decoration-skip') is "objects"
+PASS computedStyle.getPropertyCSSValue('-webkit-text-decoration-skip').cssText is "objects"
+PASS cssRule.type is cssRule.STYLE_RULE
+PASS declaration.length is 1
+PASS declaration.getPropertyValue('-webkit-text-decoration-skip') is "objects"
+PASS computedStyle.getPropertyCSSValue('-webkit-text-decoration-skip').cssText is "objects"
+PASS cssRule.type is cssRule.STYLE_RULE
+PASS declaration.length is 1
+PASS declaration.getPropertyValue('-webkit-text-decoration-skip') is "objects"
+PASS computedStyle.getPropertyCSSValue('-webkit-text-decoration-skip').cssText is "objects"
+PASS cssRule.type is cssRule.STYLE_RULE
+PASS declaration.length is 1
+PASS declaration.getPropertyValue('-webkit-text-decoration-skip') is "objects"
+PASS computedStyle.getPropertyCSSValue('-webkit-text-decoration-skip').cssText is "objects"
+PASS cssRule.type is cssRule.STYLE_RULE
+PASS declaration.length is 1
</ins><span class="cx"> PASS declaration.getPropertyValue('-webkit-text-decoration-skip') is "none"
</span><ins>+PASS computedStyle.getPropertyCSSValue('-webkit-text-decoration-skip').cssText is "none"
</ins><span class="cx"> PASS cssRule.type is cssRule.STYLE_RULE
</span><span class="cx"> PASS declaration.length is 0
</span><ins>+PASS computedStyle.getPropertyCSSValue('-webkit-text-decoration-skip').cssText is "objects"
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsfastcss3textcss3textdecorationtextdecorationskiptextdecorationskiproundtriphtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css3-text/css3-text-decoration/text-decoration-skip/text-decoration-skip-roundtrip.html (164060 => 164061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css3-text/css3-text-decoration/text-decoration-skip/text-decoration-skip-roundtrip.html 2014-02-13 22:59:40 UTC (rev 164060)
+++ trunk/LayoutTests/fast/css3-text/css3-text-decoration/text-decoration-skip/text-decoration-skip-roundtrip.html 2014-02-13 23:02:31 UTC (rev 164061)
</span><span class="lines">@@ -4,63 +4,128 @@
</span><span class="cx"> <script src="../../../../resources/js-test-pre.js"></script>
</span><span class="cx"> </head>
</span><span class="cx"> <body>
</span><ins>+ <div class="p"></div>
</ins><span class="cx"> <script type="text/javascript">
</span><del>- function testInkIsValid(stylesheet) {
</del><ins>+ function testInkIsValid(stylesheet, target) {
</ins><span class="cx"> cssRule = stylesheet.cssRules.item(0);
</span><span class="cx"> shouldBe("cssRule.type", "cssRule.STYLE_RULE");
</span><span class="cx"> declaration = cssRule.style;
</span><span class="cx"> shouldBe("declaration.length", "1");
</span><span class="cx"> shouldBe("declaration.getPropertyValue('-webkit-text-decoration-skip')", "\"ink\"");
</span><ins>+ computedStyle = window.getComputedStyle(target, null);
+ shouldBe("computedStyle.getPropertyCSSValue('-webkit-text-decoration-skip').cssText", "\"ink\"");
</ins><span class="cx"> stylesheet.deleteRule(0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function testInvalidRule(stylesheet) {
</del><ins>+ function testObjectsIsValid(stylesheet, target) {
</ins><span class="cx"> cssRule = stylesheet.cssRules.item(0);
</span><span class="cx"> shouldBe("cssRule.type", "cssRule.STYLE_RULE");
</span><span class="cx"> declaration = cssRule.style;
</span><ins>+ shouldBe("declaration.length", "1");
+ shouldBe("declaration.getPropertyValue('-webkit-text-decoration-skip')", "\"objects\"");
+ computedStyle = window.getComputedStyle(target, null);
+ shouldBe("computedStyle.getPropertyCSSValue('-webkit-text-decoration-skip').cssText", "\"objects\"");
+ stylesheet.deleteRule(0);
+ }
+
+ function testEmptyIsObjects(stylesheet, target) {
+ cssRule = stylesheet.cssRules.item(0);
+ shouldBe("cssRule.type", "cssRule.STYLE_RULE");
+ declaration = cssRule.style;
</ins><span class="cx"> shouldBe("declaration.length", "0");
</span><ins>+ shouldBe("declaration.getPropertyValue('-webkit-text-decoration-skip')", "null");
+ computedStyle = window.getComputedStyle(target, null);
+ shouldBe("computedStyle.getPropertyCSSValue('-webkit-text-decoration-skip').cssText", "\"objects\"");
</ins><span class="cx"> stylesheet.deleteRule(0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function testNoneIsValid(stylesheet) {
</del><ins>+ function testInitialIsObjects(stylesheet, target) {
</ins><span class="cx"> cssRule = stylesheet.cssRules.item(0);
</span><span class="cx"> shouldBe("cssRule.type", "cssRule.STYLE_RULE");
</span><span class="cx"> declaration = cssRule.style;
</span><span class="cx"> shouldBe("declaration.length", "1");
</span><ins>+ shouldBe("declaration.getPropertyValue('-webkit-text-decoration-skip')", "\"initial\"");
+ computedStyle = window.getComputedStyle(target, null);
+ shouldBe("computedStyle.getPropertyCSSValue('-webkit-text-decoration-skip').cssText", "\"objects\"");
+ stylesheet.deleteRule(0);
+ }
+
+ function testInvalidRule(stylesheet, target) {
+ cssRule = stylesheet.cssRules.item(0);
+ shouldBe("cssRule.type", "cssRule.STYLE_RULE");
+ declaration = cssRule.style;
+ shouldBe("declaration.length", "0");
+ computedStyle = window.getComputedStyle(target, null);
+ shouldBe("computedStyle.getPropertyCSSValue('-webkit-text-decoration-skip').cssText", "\"objects\"");
+ stylesheet.deleteRule(0);
+ }
+
+ function testNoneIsValid(stylesheet, target) {
+ cssRule = stylesheet.cssRules.item(0);
+ shouldBe("cssRule.type", "cssRule.STYLE_RULE");
+ declaration = cssRule.style;
+ shouldBe("declaration.length", "1");
</ins><span class="cx"> shouldBe("declaration.getPropertyValue('-webkit-text-decoration-skip')", "\"none\"");
</span><ins>+ computedStyle = window.getComputedStyle(target, null);
+ shouldBe("computedStyle.getPropertyCSSValue('-webkit-text-decoration-skip').cssText", "\"none\"");
</ins><span class="cx"> stylesheet.deleteRule(0);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> var styleElement = document.createElement("style");
</span><span class="cx"> document.head.appendChild(styleElement);
</span><span class="cx"> stylesheet = styleElement.sheet;
</span><ins>+ var target = document.getElementsByClassName("p")[0];
</ins><span class="cx">
</span><ins>+ stylesheet.insertRule(".p { }", 0);
+ testEmptyIsObjects(stylesheet, target);
+
+ stylesheet.insertRule(".p { -webkit-text-decoration-skip: initial; }", 0);
+ testInitialIsObjects(stylesheet, target);
+
</ins><span class="cx"> stylesheet.insertRule(".p { -webkit-text-decoration-skip: ink; }", 0);
</span><del>- testInkIsValid(stylesheet);
</del><ins>+ testInkIsValid(stylesheet, target);
</ins><span class="cx">
</span><span class="cx"> stylesheet.insertRule(".p { -webkit-text-decoration-skip: ink ink ink ink ink; }", 0);
</span><del>- testInkIsValid(stylesheet);
</del><ins>+ testInkIsValid(stylesheet, target);
</ins><span class="cx">
</span><span class="cx"> stylesheet.insertRule(".p { -webkit-text-decoration-skip: garbage; }", 0);
</span><del>- testInvalidRule(stylesheet);
</del><ins>+ testInvalidRule(stylesheet, target);
</ins><span class="cx">
</span><span class="cx"> stylesheet.insertRule(".p { -webkit-text-decoration-skip: garbage ink; }", 0);
</span><del>- testInkIsValid(stylesheet);
</del><ins>+ testInkIsValid(stylesheet, target);
</ins><span class="cx">
</span><span class="cx"> stylesheet.insertRule(".p { -webkit-text-decoration-skip: ink garbage; }", 0);
</span><del>- testInkIsValid(stylesheet);
</del><ins>+ testInkIsValid(stylesheet, target);
</ins><span class="cx">
</span><span class="cx"> stylesheet.insertRule(".p { -webkit-text-decoration-skip: garbage ink garbage; }", 0);
</span><del>- testInkIsValid(stylesheet);
</del><ins>+ testInkIsValid(stylesheet, target);
</ins><span class="cx">
</span><span class="cx"> stylesheet.insertRule(".p { -webkit-text-decoration-skip: ink garbage ink; }", 0);
</span><del>- testInkIsValid(stylesheet);
</del><ins>+ testInkIsValid(stylesheet, target);
</ins><span class="cx">
</span><ins>+ stylesheet.insertRule(".p { -webkit-text-decoration-skip: objects; }", 0);
+ testObjectsIsValid(stylesheet, target);
+
+ stylesheet.insertRule(".p { -webkit-text-decoration-skip: objects objects objects objects objects; }", 0);
+ testObjectsIsValid(stylesheet, target);
+
+ stylesheet.insertRule(".p { -webkit-text-decoration-skip: garbage objects; }", 0);
+ testObjectsIsValid(stylesheet, target);
+
+ stylesheet.insertRule(".p { -webkit-text-decoration-skip: objects garbage; }", 0);
+ testObjectsIsValid(stylesheet, target);
+
+ stylesheet.insertRule(".p { -webkit-text-decoration-skip: garbage objects garbage; }", 0);
+ testObjectsIsValid(stylesheet, target);
+
+ stylesheet.insertRule(".p { -webkit-text-decoration-skip: objects garbage objects; }", 0);
+ testObjectsIsValid(stylesheet, target);
+
</ins><span class="cx"> stylesheet.insertRule(".p { -webkit-text-decoration-skip: none; }", 0);
</span><del>- testNoneIsValid(stylesheet);
</del><ins>+ testNoneIsValid(stylesheet, target);
</ins><span class="cx">
</span><span class="cx"> stylesheet.insertRule(".p { -webkit-text-decoration-skip: ; }", 0);
</span><del>- testInvalidRule(stylesheet);
</del><ins>+ testInvalidRule(stylesheet, target);
</ins><span class="cx"> </script>
</span><span class="cx"> <script src="../../resources/js-test-post.js"></script>
</span><span class="cx"> </body>
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (164060 => 164061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-13 22:59:40 UTC (rev 164060)
+++ trunk/Source/WebCore/ChangeLog 2014-02-13 23:02:31 UTC (rev 164061)
</span><span class="lines">@@ -1,3 +1,34 @@
</span><ins>+2014-02-13 Yuki Sekiguchi <yuki.sekiguchi@access-company.com>
+
+ [css3-text] Support -webkit-text-decoration-skip: objects
+ https://bugs.webkit.org/show_bug.cgi?id=128723
+
+ Reviewed by Dean Jackson.
+
+ Implemented 'objects' value of text-decoration-skip.
+ http://www.w3.org/TR/2013/CR-css-text-decor-3-20130801/#text-decoration-skip
+
+ This is initial value and same behavior without
+ ENABLE_CSS3_TEXT_DECORATION_SKIP_INK flag. Threfore, this patch only
+ added parser code and constant for 'objects'.
+
+ Changed the initial value of text-decoration-skip.
+
+ The current implementation parses 'none', but the rendering code is
+ not match the spec, so this patch added FIXME to the rendering code.
+
+ * css/CSSComputedStyleDeclaration.cpp:
+ (WebCore::renderTextDecorationSkipFlagsToCSSValue):
+ * css/CSSParser.cpp:
+ (WebCore::CSSParser::parseTextDecorationSkip):
+ * css/CSSValueKeywords.in:
+ * css/DeprecatedStyleBuilder.cpp:
+ (WebCore::valueToDecorationSkip):
+ * rendering/InlineTextBox.cpp:
+ (WebCore::InlineTextBox::paintDecoration):
+ * rendering/style/RenderStyle.h:
+ * rendering/style/RenderStyleConstants.h:
+
</ins><span class="cx"> 2014-02-13 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix ARM NEON build following <http://trac.webkit.org/changeset/164058>
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSComputedStyleDeclarationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp (164060 => 164061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2014-02-13 22:59:40 UTC (rev 164060)
+++ trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2014-02-13 23:02:31 UTC (rev 164061)
</span><span class="lines">@@ -1319,9 +1319,11 @@
</span><span class="cx"> {
</span><span class="cx"> switch (textDecorationSkip) {
</span><span class="cx"> case TextDecorationSkipNone:
</span><del>- return cssValuePool().createExplicitInitialValue();
</del><ins>+ return cssValuePool().createIdentifierValue(CSSValueNone);
</ins><span class="cx"> case TextDecorationSkipInk:
</span><span class="cx"> return cssValuePool().createIdentifierValue(CSSValueInk);
</span><ins>+ case TextDecorationSkipObjects:
+ return cssValuePool().createIdentifierValue(CSSValueObjects);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ASSERT_NOT_REACHED();
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSParser.cpp (164060 => 164061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSParser.cpp 2014-02-13 22:59:40 UTC (rev 164060)
+++ trunk/Source/WebCore/css/CSSParser.cpp 2014-02-13 23:02:31 UTC (rev 164061)
</span><span class="lines">@@ -9460,6 +9460,7 @@
</span><span class="cx"> switch (value->id) {
</span><span class="cx"> case CSSValueNone:
</span><span class="cx"> case CSSValueInk:
</span><ins>+ case CSSValueObjects:
</ins><span class="cx"> addProperty(CSSPropertyWebkitTextDecorationSkip, cssValuePool().createIdentifierValue(value->id), important);
</span><span class="cx"> return true;
</span><span class="cx"> default:
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSValueKeywordsin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSValueKeywords.in (164060 => 164061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSValueKeywords.in 2014-02-13 22:59:40 UTC (rev 164060)
+++ trunk/Source/WebCore/css/CSSValueKeywords.in 2014-02-13 23:02:31 UTC (rev 164061)
</span><span class="lines">@@ -485,6 +485,7 @@
</span><span class="cx"> underline
</span><span class="cx"> wavy
</span><span class="cx"> ink
</span><ins>+objects
</ins><span class="cx"> -webkit-nowrap
</span><span class="cx">
</span><span class="cx"> // CSS3 Values
</span></span></pre></div>
<a id="trunkSourceWebCorecssDeprecatedStyleBuildercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp (164060 => 164061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp 2014-02-13 22:59:40 UTC (rev 164060)
+++ trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp 2014-02-13 23:02:31 UTC (rev 164061)
</span><span class="lines">@@ -1291,6 +1291,8 @@
</span><span class="cx"> return TextDecorationSkipNone;
</span><span class="cx"> case CSSValueInk:
</span><span class="cx"> return TextDecorationSkipInk;
</span><ins>+ case CSSValueObjects:
+ return TextDecorationSkipObjects;
</ins><span class="cx"> default:
</span><span class="cx"> break;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingInlineTextBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/InlineTextBox.cpp (164060 => 164061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/InlineTextBox.cpp 2014-02-13 22:59:40 UTC (rev 164060)
+++ trunk/Source/WebCore/rendering/InlineTextBox.cpp 2014-02-13 23:02:31 UTC (rev 164061)
</span><span class="lines">@@ -1170,6 +1170,7 @@
</span><span class="cx"> drawSkipInkUnderline(textPainter, context, localOrigin, underlineOffset + doubleOffset, width, isPrinting);
</span><span class="cx"> }
</span><span class="cx"> } else {
</span><ins>+ // FIXME: Need to support text-decoration-skip: none.
</ins><span class="cx"> #endif // CSS3_TEXT_DECORATION_SKIP_INK
</span><span class="cx"> context.drawLineForText(FloatPoint(localOrigin.x(), localOrigin.y() + underlineOffset), width, isPrinting);
</span><span class="cx">
</span><span class="lines">@@ -1199,6 +1200,7 @@
</span><span class="cx"> drawSkipInkUnderline(textPainter, context, localOrigin, -doubleOffset, width, isPrinting);
</span><span class="cx"> }
</span><span class="cx"> } else {
</span><ins>+ // FIXME: Need to support text-decoration-skip: none.
</ins><span class="cx"> #endif // CSS3_TEXT_DECORATION_SKIP_INK
</span><span class="cx"> context.drawLineForText(localOrigin, width, isPrinting);
</span><span class="cx"> if (decorationStyle == TextDecorationStyleDouble)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleRenderStyleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/RenderStyle.h (164060 => 164061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/RenderStyle.h 2014-02-13 22:59:40 UTC (rev 164060)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.h 2014-02-13 23:02:31 UTC (rev 164061)
</span><span class="lines">@@ -1671,7 +1671,7 @@
</span><span class="cx"> static TextJustify initialTextJustify() { return TextJustifyAuto; }
</span><span class="cx"> #endif // CSS3_TEXT
</span><span class="cx"> static TextDecorationStyle initialTextDecorationStyle() { return TextDecorationStyleSolid; }
</span><del>- static TextDecorationSkip initialTextDecorationSkip() { return TextDecorationSkipInk; }
</del><ins>+ static TextDecorationSkip initialTextDecorationSkip() { return TextDecorationSkipObjects; }
</ins><span class="cx"> static TextUnderlinePosition initialTextUnderlinePosition() { return TextUnderlinePositionAuto; }
</span><span class="cx"> static float initialZoom() { return 1.0f; }
</span><span class="cx"> static int initialOutlineOffset() { return 0; }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleRenderStyleConstantsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/RenderStyleConstants.h (164060 => 164061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/RenderStyleConstants.h 2014-02-13 22:59:40 UTC (rev 164060)
+++ trunk/Source/WebCore/rendering/style/RenderStyleConstants.h 2014-02-13 23:02:31 UTC (rev 164061)
</span><span class="lines">@@ -389,7 +389,8 @@
</span><span class="cx">
</span><span class="cx"> enum TextDecorationSkipItems {
</span><span class="cx"> TextDecorationSkipNone = 0,
</span><del>- TextDecorationSkipInk = 1 << 0
</del><ins>+ TextDecorationSkipInk = 1 << 0,
+ TextDecorationSkipObjects = 1 << 1
</ins><span class="cx"> };
</span><span class="cx"> typedef unsigned TextDecorationSkip;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>