<!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>[164115] 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/164115">164115</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2014-02-14 12:08:33 -0800 (Fri, 14 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Implement text-decoration-skip: auto
https://bugs.webkit.org/show_bug.cgi?id=128786
Reviewed by Dean Jackson.
http://lists.w3.org/Archives/Public/www-style/2014Feb/0485.html
We are updating the initial value of text-decoration-skip to a new value, "auto".
On Mac + iOS, this will have the same behavior as "skip".
Source/WebCore:
Test: fast/css3-text/css3-text-decoration/text-decoration-skip/text-decoration-skip-default.html
* css/CSSComputedStyleDeclaration.cpp:
(WebCore::renderTextDecorationSkipFlagsToCSSValue):
* css/CSSParser.cpp:
(WebCore::CSSParser::parseTextDecorationSkip):
* css/DeprecatedStyleBuilder.cpp:
(WebCore::valueToDecorationSkip):
* rendering/InlineTextBox.cpp:
(WebCore::InlineTextBox::paintDecoration):
* rendering/style/RenderStyle.h:
* rendering/style/RenderStyleConstants.h:
LayoutTests:
* fast/css3-text/css3-text-decoration/text-decoration-skip/text-decoration-skip-default-expected.txt: Added.
* fast/css3-text/css3-text-decoration/text-decoration-skip/text-decoration-skip-default.html: Added.
* 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="#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>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastcss3textcss3textdecorationtextdecorationskiptextdecorationskipdefaultexpectedtxt">trunk/LayoutTests/fast/css3-text/css3-text-decoration/text-decoration-skip/text-decoration-skip-default-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcss3textcss3textdecorationtextdecorationskiptextdecorationskipdefaulthtml">trunk/LayoutTests/fast/css3-text/css3-text-decoration/text-decoration-skip/text-decoration-skip-default.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (164114 => 164115)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-02-14 19:49:43 UTC (rev 164114)
+++ trunk/LayoutTests/ChangeLog 2014-02-14 20:08:33 UTC (rev 164115)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-02-14 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Implement text-decoration-skip: auto
+ https://bugs.webkit.org/show_bug.cgi?id=128786
+
+ Reviewed by Dean Jackson.
+
+ http://lists.w3.org/Archives/Public/www-style/2014Feb/0485.html
+ We are updating the initial value of text-decoration-skip to a new value, "auto".
+ On Mac + iOS, this will have the same behavior as "skip".
+
+ * fast/css3-text/css3-text-decoration/text-decoration-skip/text-decoration-skip-default-expected.txt: Added.
+ * fast/css3-text/css3-text-decoration/text-decoration-skip/text-decoration-skip-default.html: Added.
+ * 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-14 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed test correction to get bots green.
</span></span></pre></div>
<a id="trunkLayoutTestsfastcss3textcss3textdecorationtextdecorationskiptextdecorationskipdefaultexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css3-text/css3-text-decoration/text-decoration-skip/text-decoration-skip-default-expected.txt (0 => 164115)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css3-text/css3-text-decoration/text-decoration-skip/text-decoration-skip-default-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/css3-text/css3-text-decoration/text-decoration-skip/text-decoration-skip-default-expected.txt 2014-02-14 20:08:33 UTC (rev 164115)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+auto
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcss3textcss3textdecorationtextdecorationskiptextdecorationskipdefaulthtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css3-text/css3-text-decoration/text-decoration-skip/text-decoration-skip-default.html (0 => 164115)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css3-text/css3-text-decoration/text-decoration-skip/text-decoration-skip-default.html (rev 0)
+++ trunk/LayoutTests/fast/css3-text/css3-text-decoration/text-decoration-skip/text-decoration-skip-default.html 2014-02-14 20:08:33 UTC (rev 164115)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+</head>
+<body>
+<div id="a"></div>
+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+var d = document.getElementById("a");
+var s = window.getComputedStyle(d);
+var p = s.getPropertyValue("-webkit-text-decoration-skip");
+d.innerHTML = p;
+</script>
+</body>
+</html>
</ins></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 (164114 => 164115)</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-14 19:49:43 UTC (rev 164114)
+++ trunk/LayoutTests/fast/css3-text/css3-text-decoration/text-decoration-skip/text-decoration-skip-roundtrip-expected.txt 2014-02-14 20:08:33 UTC (rev 164115)
</span><span class="lines">@@ -1,11 +1,11 @@
</span><span class="cx"> PASS cssRule.type is cssRule.STYLE_RULE
</span><span class="cx"> PASS declaration.length is 0
</span><span class="cx"> PASS declaration.getPropertyValue('-webkit-text-decoration-skip') is null
</span><del>-PASS computedStyle.getPropertyCSSValue('-webkit-text-decoration-skip').cssText is "objects"
</del><ins>+PASS computedStyle.getPropertyCSSValue('-webkit-text-decoration-skip').cssText is "auto"
</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 "initial"
</span><del>-PASS computedStyle.getPropertyCSSValue('-webkit-text-decoration-skip').cssText is "objects"
</del><ins>+PASS computedStyle.getPropertyCSSValue('-webkit-text-decoration-skip').cssText is "auto"
</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><span class="lines">@@ -16,7 +16,7 @@
</span><span class="cx"> PASS computedStyle.getPropertyCSSValue('-webkit-text-decoration-skip').cssText is "ink"
</span><span class="cx"> PASS cssRule.type is cssRule.STYLE_RULE
</span><span class="cx"> PASS declaration.length is 0
</span><del>-PASS computedStyle.getPropertyCSSValue('-webkit-text-decoration-skip').cssText is "objects"
</del><ins>+PASS computedStyle.getPropertyCSSValue('-webkit-text-decoration-skip').cssText is "auto"
</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><span class="lines">@@ -63,5 +63,5 @@
</span><span class="cx"> PASS computedStyle.getPropertyCSSValue('-webkit-text-decoration-skip').cssText is "none"
</span><span class="cx"> PASS cssRule.type is cssRule.STYLE_RULE
</span><span class="cx"> PASS declaration.length is 0
</span><del>-PASS computedStyle.getPropertyCSSValue('-webkit-text-decoration-skip').cssText is "objects"
</del><ins>+PASS computedStyle.getPropertyCSSValue('-webkit-text-decoration-skip').cssText is "auto"
</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 (164114 => 164115)</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-14 19:49:43 UTC (rev 164114)
+++ trunk/LayoutTests/fast/css3-text/css3-text-decoration/text-decoration-skip/text-decoration-skip-roundtrip.html 2014-02-14 20:08:33 UTC (rev 164115)
</span><span class="lines">@@ -35,18 +35,18 @@
</span><span class="cx"> shouldBe("declaration.length", "0");
</span><span class="cx"> shouldBe("declaration.getPropertyValue('-webkit-text-decoration-skip')", "null");
</span><span class="cx"> computedStyle = window.getComputedStyle(target, null);
</span><del>- shouldBe("computedStyle.getPropertyCSSValue('-webkit-text-decoration-skip').cssText", "\"objects\"");
</del><ins>+ shouldBe("computedStyle.getPropertyCSSValue('-webkit-text-decoration-skip').cssText", "\"auto\"");
</ins><span class="cx"> stylesheet.deleteRule(0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function testInitialIsObjects(stylesheet, target) {
</del><ins>+ function testInitialIsAuto(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')", "\"initial\"");
</span><span class="cx"> computedStyle = window.getComputedStyle(target, null);
</span><del>- shouldBe("computedStyle.getPropertyCSSValue('-webkit-text-decoration-skip').cssText", "\"objects\"");
</del><ins>+ shouldBe("computedStyle.getPropertyCSSValue('-webkit-text-decoration-skip').cssText", "\"auto\"");
</ins><span class="cx"> stylesheet.deleteRule(0);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx"> declaration = cssRule.style;
</span><span class="cx"> shouldBe("declaration.length", "0");
</span><span class="cx"> computedStyle = window.getComputedStyle(target, null);
</span><del>- shouldBe("computedStyle.getPropertyCSSValue('-webkit-text-decoration-skip').cssText", "\"objects\"");
</del><ins>+ shouldBe("computedStyle.getPropertyCSSValue('-webkit-text-decoration-skip').cssText", "\"auto\"");
</ins><span class="cx"> stylesheet.deleteRule(0);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx"> testEmptyIsObjects(stylesheet, target);
</span><span class="cx">
</span><span class="cx"> stylesheet.insertRule(".p { -webkit-text-decoration-skip: initial; }", 0);
</span><del>- testInitialIsObjects(stylesheet, target);
</del><ins>+ testInitialIsAuto(stylesheet, target);
</ins><span class="cx">
</span><span class="cx"> stylesheet.insertRule(".p { -webkit-text-decoration-skip: ink; }", 0);
</span><span class="cx"> testInkIsValid(stylesheet, target);
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (164114 => 164115)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-14 19:49:43 UTC (rev 164114)
+++ trunk/Source/WebCore/ChangeLog 2014-02-14 20:08:33 UTC (rev 164115)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2014-02-14 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Implement text-decoration-skip: auto
+ https://bugs.webkit.org/show_bug.cgi?id=128786
+
+ Reviewed by Dean Jackson.
+
+ http://lists.w3.org/Archives/Public/www-style/2014Feb/0485.html
+ We are updating the initial value of text-decoration-skip to a new value, "auto".
+ On Mac + iOS, this will have the same behavior as "skip".
+
+ Test: fast/css3-text/css3-text-decoration/text-decoration-skip/text-decoration-skip-default.html
+
+ * css/CSSComputedStyleDeclaration.cpp:
+ (WebCore::renderTextDecorationSkipFlagsToCSSValue):
+ * css/CSSParser.cpp:
+ (WebCore::CSSParser::parseTextDecorationSkip):
+ * 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 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Give ScrollingTree(State)Nodes a reference to another layer, which is used for moving overflow:scroll contents around
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSComputedStyleDeclarationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp (164114 => 164115)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2014-02-14 19:49:43 UTC (rev 164114)
+++ trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2014-02-14 20:08:33 UTC (rev 164115)
</span><span class="lines">@@ -1318,6 +1318,8 @@
</span><span class="cx"> static PassRef<CSSValue> renderTextDecorationSkipFlagsToCSSValue(TextDecorationSkip textDecorationSkip)
</span><span class="cx"> {
</span><span class="cx"> switch (textDecorationSkip) {
</span><ins>+ case TextDecorationSkipAuto:
+ return cssValuePool().createIdentifierValue(CSSValueAuto);
</ins><span class="cx"> case TextDecorationSkipNone:
</span><span class="cx"> return cssValuePool().createIdentifierValue(CSSValueNone);
</span><span class="cx"> case TextDecorationSkipInk:
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSParser.cpp (164114 => 164115)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSParser.cpp 2014-02-14 19:49:43 UTC (rev 164114)
+++ trunk/Source/WebCore/css/CSSParser.cpp 2014-02-14 20:08:33 UTC (rev 164115)
</span><span class="lines">@@ -9456,6 +9456,7 @@
</span><span class="cx"> do {
</span><span class="cx"> switch (value->id) {
</span><span class="cx"> case CSSValueNone:
</span><ins>+ case CSSValueAuto:
</ins><span class="cx"> case CSSValueInk:
</span><span class="cx"> case CSSValueObjects:
</span><span class="cx"> addProperty(CSSPropertyWebkitTextDecorationSkip, cssValuePool().createIdentifierValue(value->id), important);
</span></span></pre></div>
<a id="trunkSourceWebCorecssDeprecatedStyleBuildercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp (164114 => 164115)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp 2014-02-14 19:49:43 UTC (rev 164114)
+++ trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp 2014-02-14 20:08:33 UTC (rev 164115)
</span><span class="lines">@@ -1287,6 +1287,8 @@
</span><span class="cx"> ASSERT(primitiveValue.isValueID());
</span><span class="cx">
</span><span class="cx"> switch (primitiveValue.getValueID()) {
</span><ins>+ case CSSValueAuto:
+ return TextDecorationSkipAuto;
</ins><span class="cx"> case CSSValueNone:
</span><span class="cx"> return TextDecorationSkipNone;
</span><span class="cx"> case CSSValueInk:
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingInlineTextBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/InlineTextBox.cpp (164114 => 164115)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/InlineTextBox.cpp 2014-02-14 19:49:43 UTC (rev 164114)
+++ trunk/Source/WebCore/rendering/InlineTextBox.cpp 2014-02-14 20:08:33 UTC (rev 164115)
</span><span class="lines">@@ -1162,7 +1162,7 @@
</span><span class="cx"> }
</span><span class="cx"> default:
</span><span class="cx"> #if ENABLE(CSS3_TEXT_DECORATION_SKIP_INK)
</span><del>- if (lineStyle.textDecorationSkip() == TextDecorationSkipInk && isHorizontal()) {
</del><ins>+ if ((lineStyle.textDecorationSkip() == TextDecorationSkipInk || lineStyle.textDecorationSkip() == TextDecorationSkipAuto) && isHorizontal()) {
</ins><span class="cx"> if (!context.paintingDisabled()) {
</span><span class="cx"> drawSkipInkUnderline(textPainter, context, localOrigin, underlineOffset, width, isPrinting);
</span><span class="cx">
</span><span class="lines">@@ -1192,7 +1192,7 @@
</span><span class="cx"> }
</span><span class="cx"> default:
</span><span class="cx"> #if ENABLE(CSS3_TEXT_DECORATION_SKIP_INK)
</span><del>- if (lineStyle.textDecorationSkip() == TextDecorationSkipInk) {
</del><ins>+ if ((lineStyle.textDecorationSkip() == TextDecorationSkipInk || lineStyle.textDecorationSkip() == TextDecorationSkipAuto) && isHorizontal()) {
</ins><span class="cx"> if (!context.paintingDisabled()) {
</span><span class="cx"> drawSkipInkUnderline(textPainter, context, localOrigin, 0, width, isPrinting);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleRenderStyleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/RenderStyle.h (164114 => 164115)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/RenderStyle.h 2014-02-14 19:49:43 UTC (rev 164114)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.h 2014-02-14 20:08:33 UTC (rev 164115)
</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 TextDecorationSkipObjects; }
</del><ins>+ static TextDecorationSkip initialTextDecorationSkip() { return TextDecorationSkipAuto; }
</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 (164114 => 164115)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/RenderStyleConstants.h 2014-02-14 19:49:43 UTC (rev 164114)
+++ trunk/Source/WebCore/rendering/style/RenderStyleConstants.h 2014-02-14 20:08:33 UTC (rev 164115)
</span><span class="lines">@@ -390,7 +390,8 @@
</span><span class="cx"> enum TextDecorationSkipItems {
</span><span class="cx"> TextDecorationSkipNone = 0,
</span><span class="cx"> TextDecorationSkipInk = 1 << 0,
</span><del>- TextDecorationSkipObjects = 1 << 1
</del><ins>+ TextDecorationSkipObjects = 1 << 1,
+ TextDecorationSkipAuto = 1 << 2
</ins><span class="cx"> };
</span><span class="cx"> typedef unsigned TextDecorationSkip;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>