<!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>[212808] 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/212808">212808</a></dd>
<dt>Author</dt> <dd>pvollan@apple.com</dd>
<dt>Date</dt> <dd>2017-02-21 22:55:54 -0800 (Tue, 21 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add support for CSS properties paint-order, stroke-linecap, and stroke-linejoin in text rendering.
https://bugs.webkit.org/show_bug.cgi?id=168601
Source/WebCore:
rdar://problem/30583872
Reviewed by Simon Fraser.
Text rendering should respect the CSS properties paint-order, stroke-linecap, and stroke-linejoin,
see https://drafts.fxtf.org/paint/. The text rendering changes are mainly in the TextPainter class,
where text is painted in three phases (fill, stroke, markers), where the order follows the
paint-order property. The linecap and linejoin properties are set on the graphics context before
rendering the text.
Tests: fast/css/paint-order.html
fast/css/paint-order-shadow.html
* css/CSSComputedStyleDeclaration.cpp:
(WebCore::paintOrder):
* css/StyleBuilderConverter.h:
(WebCore::StyleBuilderConverter::convertPaintOrder):
* rendering/TextPaintStyle.cpp:
(WebCore::computeTextPaintStyle):
(WebCore::updateGraphicsContext):
* rendering/TextPaintStyle.h:
* rendering/TextPainter.cpp:
(WebCore::TextPainter::paintTextAndEmphasisMarksIfNeeded):
* rendering/style/RenderStyle.cpp:
(WebCore::RenderStyle::paintTypesForPaintOrder):
* rendering/style/RenderStyle.h:
(WebCore::RenderStyle::setPaintOrder):
(WebCore::RenderStyle::initialPaintOrder):
* rendering/style/RenderStyleConstants.h:
* rendering/style/SVGRenderStyleDefs.h:
* rendering/style/StyleRareInheritedData.cpp:
(WebCore::StyleRareInheritedData::StyleRareInheritedData):
* rendering/svg/RenderSVGShape.cpp:
(WebCore::RenderSVGShape::fillStrokeMarkers):
* rendering/svg/SVGInlineTextBox.cpp:
(WebCore::SVGInlineTextBox::paint):
LayoutTests:
Reviewed by Simon Fraser.
* fast/css/paint-order-expected.html: Added.
* fast/css/paint-order-shadow-expected.html: Added.
* fast/css/paint-order-shadow.html: Added.
* fast/css/paint-order.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</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="#trunkSourceWebCorecssStyleBuilderConverterh">trunk/Source/WebCore/css/StyleBuilderConverter.h</a></li>
<li><a href="#trunkSourceWebCorerenderingTextPaintStylecpp">trunk/Source/WebCore/rendering/TextPaintStyle.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingTextPaintStyleh">trunk/Source/WebCore/rendering/TextPaintStyle.h</a></li>
<li><a href="#trunkSourceWebCorerenderingTextPaintercpp">trunk/Source/WebCore/rendering/TextPainter.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleRenderStylecpp">trunk/Source/WebCore/rendering/style/RenderStyle.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>
<li><a href="#trunkSourceWebCorerenderingstyleSVGRenderStyleDefsh">trunk/Source/WebCore/rendering/style/SVGRenderStyleDefs.h</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleStyleRareInheritedDatacpp">trunk/Source/WebCore/rendering/style/StyleRareInheritedData.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGShapecpp">trunk/Source/WebCore/rendering/svg/RenderSVGShape.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgSVGInlineTextBoxcpp">trunk/Source/WebCore/rendering/svg/SVGInlineTextBox.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastcsspaintorderexpectedhtml">trunk/LayoutTests/fast/css/paint-order-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastcsspaintordershadowexpectedhtml">trunk/LayoutTests/fast/css/paint-order-shadow-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastcsspaintordershadowhtml">trunk/LayoutTests/fast/css/paint-order-shadow.html</a></li>
<li><a href="#trunkLayoutTestsfastcsspaintorderhtml">trunk/LayoutTests/fast/css/paint-order.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (212807 => 212808)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2017-02-22 06:51:07 UTC (rev 212807)
+++ trunk/LayoutTests/ChangeLog 2017-02-22 06:55:54 UTC (rev 212808)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2017-02-21 Per Arne Vollan <pvollan@apple.com>
+
+ Add support for CSS properties paint-order, stroke-linecap, and stroke-linejoin in text rendering.
+ https://bugs.webkit.org/show_bug.cgi?id=168601
+
+ Reviewed by Simon Fraser.
+
+ * fast/css/paint-order-expected.html: Added.
+ * fast/css/paint-order-shadow-expected.html: Added.
+ * fast/css/paint-order-shadow.html: Added.
+ * fast/css/paint-order.html: Added.
+
</ins><span class="cx"> 2017-02-21 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> [User Timing] Throw a SyntaxError for performance.measure if mark name is not found
</span></span></pre></div>
<a id="trunkLayoutTestsfastcsspaintorderexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css/paint-order-expected.html (0 => 212808)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/paint-order-expected.html (rev 0)
+++ trunk/LayoutTests/fast/css/paint-order-expected.html 2017-02-22 06:55:54 UTC (rev 212808)
</span><span class="lines">@@ -0,0 +1,39 @@
</span><ins>+<!DOCTYPE html>
+
+<html>
+<head>
+ <style>
+ div {
+ position: absolute;
+ font-size: 80px;
+ color: gray;
+ }
+
+ .test-stroke {
+ text-shadow: none;
+ -webkit-text-stroke: 25px red;
+
+ /* Clip used to isolate the stroke */
+ -webkit-clip-path: inset(20px 55px 30px 15px);
+ }
+
+ .fill-grey {
+ text-shadow: none;
+
+ /* Clip used to isolate the stroke */
+ -webkit-clip-path: inset(20px 55px 30px 15px);
+ }
+
+ </style>
+</head>
+<body>
+
+<div class="test-stroke" style="paint-order: fill; top: 0px">&#x25fc;</div>
+<div class="test-stroke" style="paint-order: fill markers; top: 100px">&#x25fc;</div>
+<div class="fill-grey" style="paint-order: stroke; top: 200px">&#x25fc;</div>
+<div class="fill-grey" style="paint-order: stroke markers; top: 300px">&#x25fc;</div>
+<div class="test-stroke" style="paint-order: markers; top: 400px">&#x25fc;</div>
+<div class="fill-grey" style="paint-order: markers stroke; top: 500px">&#x25fc;</div>
+
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcsspaintordershadowexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css/paint-order-shadow-expected.html (0 => 212808)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/paint-order-shadow-expected.html (rev 0)
+++ trunk/LayoutTests/fast/css/paint-order-shadow-expected.html 2017-02-22 06:55:54 UTC (rev 212808)
</span><span class="lines">@@ -0,0 +1,32 @@
</span><ins>+<!DOCTYPE html>
+
+<html>
+<head>
+ <style>
+ div {
+ position: absolute;
+ font-size: 80px;
+ color: gray;
+ width: 200px;
+ left: 0px;
+ }
+
+ .bg-color-gray {
+ background-color: gray;
+
+ /* Clip used to isolate a part of the shadow */
+ -webkit-clip-path: inset(30px 75px 30px 115px);
+ }
+ </style>
+</head>
+<body>
+
+<div class="bg-color-gray" style="paint-order: fill; top: 0px">&#x25fc;</div>
+<div class="bg-color-gray" style="paint-order: fill markers; top: 100px">&#x25fc;</div>
+<div class="bg-color-gray" style="paint-order: stroke; top: 200px">&#x25fc;</div>
+<div class="bg-color-gray" style="paint-order: stroke markers; top: 300px">&#x25fc;</div>
+<div class="bg-color-gray" style="paint-order: markers; top: 400px">&#x25fc;</div>
+<div class="bg-color-gray" style="paint-order: markers stroke; top: 500px">&#x25fc;</div>
+
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcsspaintordershadowhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css/paint-order-shadow.html (0 => 212808)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/paint-order-shadow.html (rev 0)
+++ trunk/LayoutTests/fast/css/paint-order-shadow.html 2017-02-22 06:55:54 UTC (rev 212808)
</span><span class="lines">@@ -0,0 +1,33 @@
</span><ins>+<!DOCTYPE html>
+
+<html>
+<head>
+ <style>
+ div {
+ position: absolute;
+ font-size: 80px;
+ color: gray;
+ width: 200px;
+ left: 0px;
+ }
+
+ .test-stroke {
+ text-shadow: 100px 0 0 rgba(0, 0, 0, 0.5);
+ -webkit-text-stroke: 25px red;
+
+ /* Clip used to isolate a part of the shadow */
+ -webkit-clip-path: inset(30px 75px 30px 115px);
+ }
+ </style>
+</head>
+<body>
+
+<div class="test-stroke" style="paint-order: fill; top: 0px">&#x25fc;</div>
+<div class="test-stroke" style="paint-order: fill markers; top: 100px">&#x25fc;</div>
+<div class="test-stroke" style="paint-order: stroke; top: 200px">&#x25fc;</div>
+<div class="test-stroke" style="paint-order: stroke markers; top: 300px">&#x25fc;</div>
+<div class="test-stroke" style="paint-order: markers; top: 400px">&#x25fc;</div>
+<div class="test-stroke" style="paint-order: markers stroke; top: 500px">&#x25fc;</div>
+
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcsspaintorderhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css/paint-order.html (0 => 212808)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/paint-order.html (rev 0)
+++ trunk/LayoutTests/fast/css/paint-order.html 2017-02-22 06:55:54 UTC (rev 212808)
</span><span class="lines">@@ -0,0 +1,31 @@
</span><ins>+<!DOCTYPE html>
+
+<html>
+<head>
+ <style>
+ div {
+ position: absolute;
+ font-size: 80px;
+ color: gray;
+ }
+
+ .test-stroke {
+ text-shadow: none;
+ -webkit-text-stroke: 25px red;
+
+ /* Clip used to isolate the stroke */
+ -webkit-clip-path: inset(20px 55px 30px 15px);
+ }
+ </style>
+</head>
+<body>
+
+<div class="test-stroke" style="paint-order: fill; top: 0px">&#x25fc;</div>
+<div class="test-stroke" style="paint-order: fill markers; top: 100px">&#x25fc;</div>
+<div class="test-stroke" style="paint-order: stroke; top: 200px">&#x25fc;</div>
+<div class="test-stroke" style="paint-order: stroke markers; top: 300px">&#x25fc;</div>
+<div class="test-stroke" style="paint-order: markers; top: 400px">&#x25fc;</div>
+<div class="test-stroke" style="paint-order: markers stroke; top: 500px">&#x25fc;</div>
+
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (212807 => 212808)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-02-22 06:51:07 UTC (rev 212807)
+++ trunk/Source/WebCore/ChangeLog 2017-02-22 06:55:54 UTC (rev 212808)
</span><span class="lines">@@ -1,3 +1,44 @@
</span><ins>+2017-02-21 Per Arne Vollan <pvollan@apple.com>
+
+ Add support for CSS properties paint-order, stroke-linecap, and stroke-linejoin in text rendering.
+ https://bugs.webkit.org/show_bug.cgi?id=168601
+ rdar://problem/30583872
+
+ Reviewed by Simon Fraser.
+
+ Text rendering should respect the CSS properties paint-order, stroke-linecap, and stroke-linejoin,
+ see https://drafts.fxtf.org/paint/. The text rendering changes are mainly in the TextPainter class,
+ where text is painted in three phases (fill, stroke, markers), where the order follows the
+ paint-order property. The linecap and linejoin properties are set on the graphics context before
+ rendering the text.
+
+ Tests: fast/css/paint-order.html
+ fast/css/paint-order-shadow.html
+
+ * css/CSSComputedStyleDeclaration.cpp:
+ (WebCore::paintOrder):
+ * css/StyleBuilderConverter.h:
+ (WebCore::StyleBuilderConverter::convertPaintOrder):
+ * rendering/TextPaintStyle.cpp:
+ (WebCore::computeTextPaintStyle):
+ (WebCore::updateGraphicsContext):
+ * rendering/TextPaintStyle.h:
+ * rendering/TextPainter.cpp:
+ (WebCore::TextPainter::paintTextAndEmphasisMarksIfNeeded):
+ * rendering/style/RenderStyle.cpp:
+ (WebCore::RenderStyle::paintTypesForPaintOrder):
+ * rendering/style/RenderStyle.h:
+ (WebCore::RenderStyle::setPaintOrder):
+ (WebCore::RenderStyle::initialPaintOrder):
+ * rendering/style/RenderStyleConstants.h:
+ * rendering/style/SVGRenderStyleDefs.h:
+ * rendering/style/StyleRareInheritedData.cpp:
+ (WebCore::StyleRareInheritedData::StyleRareInheritedData):
+ * rendering/svg/RenderSVGShape.cpp:
+ (WebCore::RenderSVGShape::fillStrokeMarkers):
+ * rendering/svg/SVGInlineTextBox.cpp:
+ (WebCore::SVGInlineTextBox::paint):
+
</ins><span class="cx"> 2017-02-21 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> [User Timing] Throw a SyntaxError for performance.measure if mark name is not found
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSComputedStyleDeclarationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp (212807 => 212808)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2017-02-22 06:51:07 UTC (rev 212807)
+++ trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2017-02-22 06:55:54 UTC (rev 212808)
</span><span class="lines">@@ -2465,32 +2465,32 @@
</span><span class="cx">
</span><span class="cx"> static Ref<CSSValue> paintOrder(PaintOrder paintOrder)
</span><span class="cx"> {
</span><del>- if (paintOrder == PaintOrderNormal)
</del><ins>+ if (paintOrder == PaintOrder::Normal)
</ins><span class="cx"> return CSSPrimitiveValue::createIdentifier(CSSValueNormal);
</span><span class="cx">
</span><span class="cx"> auto paintOrderList = CSSValueList::createSpaceSeparated();
</span><span class="cx"> switch (paintOrder) {
</span><del>- case PaintOrderNormal:
</del><ins>+ case PaintOrder::Normal:
</ins><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> break;
</span><del>- case PaintOrderFill:
</del><ins>+ case PaintOrder::Fill:
</ins><span class="cx"> paintOrderList->append(CSSPrimitiveValue::createIdentifier(CSSValueFill));
</span><span class="cx"> break;
</span><del>- case PaintOrderFillMarkers:
</del><ins>+ case PaintOrder::FillMarkers:
</ins><span class="cx"> paintOrderList->append(CSSPrimitiveValue::createIdentifier(CSSValueFill));
</span><span class="cx"> paintOrderList->append(CSSPrimitiveValue::createIdentifier(CSSValueMarkers));
</span><span class="cx"> break;
</span><del>- case PaintOrderStroke:
</del><ins>+ case PaintOrder::Stroke:
</ins><span class="cx"> paintOrderList->append(CSSPrimitiveValue::createIdentifier(CSSValueStroke));
</span><span class="cx"> break;
</span><del>- case PaintOrderStrokeMarkers:
</del><ins>+ case PaintOrder::StrokeMarkers:
</ins><span class="cx"> paintOrderList->append(CSSPrimitiveValue::createIdentifier(CSSValueStroke));
</span><span class="cx"> paintOrderList->append(CSSPrimitiveValue::createIdentifier(CSSValueMarkers));
</span><span class="cx"> break;
</span><del>- case PaintOrderMarkers:
</del><ins>+ case PaintOrder::Markers:
</ins><span class="cx"> paintOrderList->append(CSSPrimitiveValue::createIdentifier(CSSValueMarkers));
</span><span class="cx"> break;
</span><del>- case PaintOrderMarkersStroke:
</del><ins>+ case PaintOrder::MarkersStroke:
</ins><span class="cx"> paintOrderList->append(CSSPrimitiveValue::createIdentifier(CSSValueMarkers));
</span><span class="cx"> paintOrderList->append(CSSPrimitiveValue::createIdentifier(CSSValueStroke));
</span><span class="cx"> break;
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleBuilderConverterh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleBuilderConverter.h (212807 => 212808)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleBuilderConverter.h 2017-02-22 06:51:07 UTC (rev 212807)
+++ trunk/Source/WebCore/css/StyleBuilderConverter.h 2017-02-22 06:55:54 UTC (rev 212808)
</span><span class="lines">@@ -1222,20 +1222,20 @@
</span><span class="cx"> {
</span><span class="cx"> if (is<CSSPrimitiveValue>(value)) {
</span><span class="cx"> ASSERT(downcast<CSSPrimitiveValue>(value).valueID() == CSSValueNormal);
</span><del>- return PaintOrderNormal;
</del><ins>+ return PaintOrder::Normal;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> auto& orderTypeList = downcast<CSSValueList>(value);
</span><span class="cx"> switch (downcast<CSSPrimitiveValue>(*orderTypeList.itemWithoutBoundsCheck(0)).valueID()) {
</span><span class="cx"> case CSSValueFill:
</span><del>- return orderTypeList.length() > 1 ? PaintOrderFillMarkers : PaintOrderFill;
</del><ins>+ return orderTypeList.length() > 1 ? PaintOrder::FillMarkers : PaintOrder::Fill;
</ins><span class="cx"> case CSSValueStroke:
</span><del>- return orderTypeList.length() > 1 ? PaintOrderStrokeMarkers : PaintOrderStroke;
</del><ins>+ return orderTypeList.length() > 1 ? PaintOrder::StrokeMarkers : PaintOrder::Stroke;
</ins><span class="cx"> case CSSValueMarkers:
</span><del>- return orderTypeList.length() > 1 ? PaintOrderMarkersStroke : PaintOrderMarkers;
</del><ins>+ return orderTypeList.length() > 1 ? PaintOrder::MarkersStroke : PaintOrder::Markers;
</ins><span class="cx"> default:
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><del>- return PaintOrderNormal;
</del><ins>+ return PaintOrder::Normal;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingTextPaintStylecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/TextPaintStyle.cpp (212807 => 212808)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/TextPaintStyle.cpp 2017-02-22 06:51:07 UTC (rev 212807)
+++ trunk/Source/WebCore/rendering/TextPaintStyle.cpp 2017-02-22 06:55:54 UTC (rev 212808)
</span><span class="lines">@@ -68,7 +68,10 @@
</span><span class="cx"> paintStyle.useLetterpressEffect = lineStyle.textDecorationsInEffect() & TextDecorationLetterpress;
</span><span class="cx"> #endif
</span><span class="cx"> paintStyle.strokeWidth = lineStyle.textStrokeWidth();
</span><del>-
</del><ins>+ paintStyle.paintOrder = lineStyle.paintOrder();
+ paintStyle.lineJoin = lineStyle.joinStyle();
+ paintStyle.lineCap = lineStyle.capStyle();
+
</ins><span class="cx"> if (paintInfo.forceTextColor()) {
</span><span class="cx"> paintStyle.fillColor = paintInfo.forcedTextColor();
</span><span class="cx"> paintStyle.strokeColor = paintInfo.forcedTextColor();
</span><span class="lines">@@ -192,6 +195,8 @@
</span><span class="cx"> context.setStrokeColor(paintStyle.strokeColor);
</span><span class="cx"> if (paintStyle.strokeWidth != context.strokeThickness())
</span><span class="cx"> context.setStrokeThickness(paintStyle.strokeWidth);
</span><ins>+ context.setLineJoin(paintStyle.lineJoin);
+ context.setLineCap(paintStyle.lineCap);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingTextPaintStyleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/TextPaintStyle.h (212807 => 212808)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/TextPaintStyle.h 2017-02-22 06:51:07 UTC (rev 212807)
+++ trunk/Source/WebCore/rendering/TextPaintStyle.h 2017-02-22 06:55:54 UTC (rev 212808)
</span><span class="lines">@@ -26,6 +26,8 @@
</span><span class="cx"> #pragma once
</span><span class="cx">
</span><span class="cx"> #include "Color.h"
</span><ins>+#include "GraphicsTypes.h"
+#include "RenderStyleConstants.h"
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -47,6 +49,9 @@
</span><span class="cx"> #if ENABLE(LETTERPRESS)
</span><span class="cx"> bool useLetterpressEffect { false };
</span><span class="cx"> #endif
</span><ins>+ PaintOrder paintOrder { PaintOrder::Normal };
+ LineJoin lineJoin { MiterJoin };
+ LineCap lineCap { ButtCap };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> TextPaintStyle computeTextPaintStyle(const Frame&, const RenderStyle&, const PaintInfo&);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingTextPaintercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/TextPainter.cpp (212807 => 212808)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/TextPainter.cpp 2017-02-22 06:51:07 UTC (rev 212807)
+++ trunk/Source/WebCore/rendering/TextPainter.cpp 2017-02-22 06:55:54 UTC (rev 212808)
</span><span class="lines">@@ -123,9 +123,33 @@
</span><span class="cx"> void TextPainter::paintTextAndEmphasisMarksIfNeeded(const TextRun& textRun, const FloatRect& boxRect, const FloatPoint& textOrigin, unsigned startOffset, unsigned endOffset,
</span><span class="cx"> const TextPaintStyle& paintStyle, const ShadowData* shadow)
</span><span class="cx"> {
</span><del>- // FIXME: Truncate right-to-left text correctly.
- paintTextWithShadows(shadow, *m_font, textRun, boxRect, textOrigin, startOffset, endOffset, nullAtom, 0, paintStyle.strokeWidth > 0);
-
</del><ins>+ if (paintStyle.paintOrder == PaintOrder::Normal) {
+ // FIXME: Truncate right-to-left text correctly.
+ paintTextWithShadows(shadow, *m_font, textRun, boxRect, textOrigin, startOffset, endOffset, nullAtom, 0, paintStyle.strokeWidth > 0);
+ } else {
+ bool paintShadow = true;
+ auto textDrawingMode = m_context.textDrawingMode();
+ auto paintOrder = RenderStyle::paintTypesForPaintOrder(paintStyle.paintOrder);
+ for (auto order : paintOrder) {
+ switch (order) {
+ case PaintType::Fill:
+ m_context.setTextDrawingMode(textDrawingMode & ~TextModeStroke);
+ paintTextWithShadows(paintShadow ? shadow : nullptr, *m_font, textRun, boxRect, textOrigin, startOffset, endOffset, nullAtom, 0, false);
+ paintShadow = false;
+ m_context.setTextDrawingMode(textDrawingMode);
+ break;
+ case PaintType::Stroke:
+ m_context.setTextDrawingMode(textDrawingMode & ~TextModeFill);
+ paintTextWithShadows(paintShadow ? shadow : nullptr, *m_font, textRun, boxRect, textOrigin, startOffset, endOffset, nullAtom, 0, paintStyle.strokeWidth > 0);
+ paintShadow = false;
+ m_context.setTextDrawingMode(textDrawingMode);
+ break;
+ case PaintType::Markers:
+ continue;
+ }
+ }
+ }
+
</ins><span class="cx"> if (m_emphasisMark.isEmpty())
</span><span class="cx"> return;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleRenderStylecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/RenderStyle.cpp (212807 => 212808)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/RenderStyle.cpp 2017-02-22 06:51:07 UTC (rev 212807)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.cpp 2017-02-22 06:55:54 UTC (rev 212808)
</span><span class="lines">@@ -2217,41 +2217,41 @@
</span><span class="cx">
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-Vector<PaintType, 3> RenderStyle::paintTypesForPaintOrder() const
</del><ins>+Vector<PaintType, 3> RenderStyle::paintTypesForPaintOrder(PaintOrder order)
</ins><span class="cx"> {
</span><span class="cx"> Vector<PaintType, 3> paintOrder;
</span><del>- switch (this->paintOrder()) {
- case PaintOrderNormal:
</del><ins>+ switch (order) {
+ case PaintOrder::Normal:
</ins><span class="cx"> FALLTHROUGH;
</span><del>- case PaintOrderFill:
- paintOrder.append(PaintTypeFill);
- paintOrder.append(PaintTypeStroke);
- paintOrder.append(PaintTypeMarkers);
</del><ins>+ case PaintOrder::Fill:
+ paintOrder.append(PaintType::Fill);
+ paintOrder.append(PaintType::Stroke);
+ paintOrder.append(PaintType::Markers);
</ins><span class="cx"> break;
</span><del>- case PaintOrderFillMarkers:
- paintOrder.append(PaintTypeFill);
- paintOrder.append(PaintTypeMarkers);
- paintOrder.append(PaintTypeStroke);
</del><ins>+ case PaintOrder::FillMarkers:
+ paintOrder.append(PaintType::Fill);
+ paintOrder.append(PaintType::Markers);
+ paintOrder.append(PaintType::Stroke);
</ins><span class="cx"> break;
</span><del>- case PaintOrderStroke:
- paintOrder.append(PaintTypeStroke);
- paintOrder.append(PaintTypeFill);
- paintOrder.append(PaintTypeMarkers);
</del><ins>+ case PaintOrder::Stroke:
+ paintOrder.append(PaintType::Stroke);
+ paintOrder.append(PaintType::Fill);
+ paintOrder.append(PaintType::Markers);
</ins><span class="cx"> break;
</span><del>- case PaintOrderStrokeMarkers:
- paintOrder.append(PaintTypeStroke);
- paintOrder.append(PaintTypeMarkers);
- paintOrder.append(PaintTypeFill);
</del><ins>+ case PaintOrder::StrokeMarkers:
+ paintOrder.append(PaintType::Stroke);
+ paintOrder.append(PaintType::Markers);
+ paintOrder.append(PaintType::Fill);
</ins><span class="cx"> break;
</span><del>- case PaintOrderMarkers:
- paintOrder.append(PaintTypeMarkers);
- paintOrder.append(PaintTypeFill);
- paintOrder.append(PaintTypeStroke);
</del><ins>+ case PaintOrder::Markers:
+ paintOrder.append(PaintType::Markers);
+ paintOrder.append(PaintType::Fill);
+ paintOrder.append(PaintType::Stroke);
</ins><span class="cx"> break;
</span><del>- case PaintOrderMarkersStroke:
- paintOrder.append(PaintTypeMarkers);
- paintOrder.append(PaintTypeStroke);
- paintOrder.append(PaintTypeFill);
</del><ins>+ case PaintOrder::MarkersStroke:
+ paintOrder.append(PaintType::Markers);
+ paintOrder.append(PaintType::Stroke);
+ paintOrder.append(PaintType::Fill);
</ins><span class="cx"> break;
</span><span class="cx"> };
</span><span class="cx"> return paintOrder;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleRenderStyleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/RenderStyle.h (212807 => 212808)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/RenderStyle.h 2017-02-22 06:51:07 UTC (rev 212807)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.h 2017-02-22 06:55:54 UTC (rev 212808)
</span><span class="lines">@@ -1237,10 +1237,10 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> // Support for paint-order, stroke-linecap, and stroke-linejoin from https://drafts.fxtf.org/paint/.
</span><del>- void setPaintOrder(PaintOrder order) { SET_VAR(m_rareInheritedData, paintOrder, order); }
</del><ins>+ void setPaintOrder(PaintOrder order) { SET_VAR(m_rareInheritedData, paintOrder, static_cast<unsigned>(order)); }
</ins><span class="cx"> PaintOrder paintOrder() const { return static_cast<PaintOrder>(m_rareInheritedData->paintOrder); }
</span><del>- static PaintOrder initialPaintOrder() { return PaintOrderNormal; }
- Vector<PaintType, 3> paintTypesForPaintOrder() const;
</del><ins>+ static PaintOrder initialPaintOrder() { return PaintOrder::Normal; }
+ static Vector<PaintType, 3> paintTypesForPaintOrder(PaintOrder);
</ins><span class="cx">
</span><span class="cx"> void setCapStyle(LineCap val) { SET_VAR(m_rareInheritedData, capStyle, val); }
</span><span class="cx"> LineCap capStyle() const { return static_cast<LineCap>(m_rareInheritedData->capStyle); }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleRenderStyleConstantsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/RenderStyleConstants.h (212807 => 212808)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/RenderStyleConstants.h 2017-02-22 06:51:07 UTC (rev 212807)
+++ trunk/Source/WebCore/rendering/style/RenderStyleConstants.h 2017-02-22 06:55:54 UTC (rev 212808)
</span><span class="lines">@@ -726,4 +726,21 @@
</span><span class="cx"> TextStream& operator<<(TextStream&, EMaskSourceType);
</span><span class="cx"> TextStream& operator<<(TextStream&, Edge);
</span><span class="cx">
</span><ins>+// These are all minimized combinations of paint-order.
+enum class PaintOrder {
+ Normal,
+ Fill,
+ FillMarkers,
+ Stroke,
+ StrokeMarkers,
+ Markers,
+ MarkersStroke
+};
+
+enum class PaintType {
+ Fill,
+ Stroke,
+ Markers
+};
+
</ins><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleSVGRenderStyleDefsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/SVGRenderStyleDefs.h (212807 => 212808)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/SVGRenderStyleDefs.h 2017-02-22 06:51:07 UTC (rev 212807)
+++ trunk/Source/WebCore/rendering/style/SVGRenderStyleDefs.h 2017-02-22 06:55:54 UTC (rev 212808)
</span><span class="lines">@@ -96,23 +96,6 @@
</span><span class="cx"> MT_ALPHA
</span><span class="cx"> };
</span><span class="cx">
</span><del>- // These are all minimized combinations of paint-order.
- enum PaintOrder {
- PaintOrderNormal = 0,
- PaintOrderFill = 1,
- PaintOrderFillMarkers = 2,
- PaintOrderStroke = 3,
- PaintOrderStrokeMarkers = 4,
- PaintOrderMarkers = 5,
- PaintOrderMarkersStroke = 6
- };
-
- enum PaintType {
- PaintTypeFill,
- PaintTypeStroke,
- PaintTypeMarkers
- };
-
</del><span class="cx"> class CSSValue;
</span><span class="cx"> class CSSValueList;
</span><span class="cx"> class SVGPaint;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleStyleRareInheritedDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/StyleRareInheritedData.cpp (212807 => 212808)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/StyleRareInheritedData.cpp 2017-02-22 06:51:07 UTC (rev 212807)
+++ trunk/Source/WebCore/rendering/style/StyleRareInheritedData.cpp 2017-02-22 06:55:54 UTC (rev 212808)
</span><span class="lines">@@ -125,7 +125,7 @@
</span><span class="cx"> , trailingWord(static_cast<unsigned>(RenderStyle::initialTrailingWord()))
</span><span class="cx"> #endif
</span><span class="cx"> , hangingPunctuation(RenderStyle::initialHangingPunctuation())
</span><del>- , paintOrder(RenderStyle::initialPaintOrder())
</del><ins>+ , paintOrder(static_cast<unsigned>(RenderStyle::initialPaintOrder()))
</ins><span class="cx"> , capStyle(RenderStyle::initialCapStyle())
</span><span class="cx"> , joinStyle(RenderStyle::initialJoinStyle())
</span><span class="cx"> , strokeWidth(RenderStyle::initialOneLength())
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGShapecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGShape.cpp (212807 => 212808)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGShape.cpp 2017-02-22 06:51:07 UTC (rev 212807)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGShape.cpp 2017-02-22 06:55:54 UTC (rev 212808)
</span><span class="lines">@@ -277,16 +277,16 @@
</span><span class="cx">
</span><span class="cx"> void RenderSVGShape::fillStrokeMarkers(PaintInfo& childPaintInfo)
</span><span class="cx"> {
</span><del>- auto paintOrder = style().paintTypesForPaintOrder();
</del><ins>+ auto paintOrder = RenderStyle::paintTypesForPaintOrder(style().paintOrder());
</ins><span class="cx"> for (unsigned i = 0; i < paintOrder.size(); ++i) {
</span><span class="cx"> switch (paintOrder.at(i)) {
</span><del>- case PaintTypeFill:
</del><ins>+ case PaintType::Fill:
</ins><span class="cx"> fillShape(style(), childPaintInfo.context());
</span><span class="cx"> break;
</span><del>- case PaintTypeStroke:
</del><ins>+ case PaintType::Stroke:
</ins><span class="cx"> strokeShape(childPaintInfo.context());
</span><span class="cx"> break;
</span><del>- case PaintTypeMarkers:
</del><ins>+ case PaintType::Markers:
</ins><span class="cx"> if (!m_markerPositions.isEmpty())
</span><span class="cx"> drawMarkers(childPaintInfo);
</span><span class="cx"> break;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgSVGInlineTextBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/SVGInlineTextBox.cpp (212807 => 212808)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/SVGInlineTextBox.cpp 2017-02-22 06:51:07 UTC (rev 212807)
+++ trunk/Source/WebCore/rendering/svg/SVGInlineTextBox.cpp 2017-02-22 06:55:54 UTC (rev 212808)
</span><span class="lines">@@ -299,10 +299,10 @@
</span><span class="cx"> if (decorations & TextDecorationOverline)
</span><span class="cx"> paintDecoration(paintInfo.context(), TextDecorationOverline, fragment);
</span><span class="cx">
</span><del>- auto paintOrder = style.paintTypesForPaintOrder();
</del><ins>+ auto paintOrder = RenderStyle::paintTypesForPaintOrder(style.paintOrder());
</ins><span class="cx"> for (unsigned i = 0; i < paintOrder.size(); ++i) {
</span><span class="cx"> switch (paintOrder.at(i)) {
</span><del>- case PaintTypeFill:
</del><ins>+ case PaintType::Fill:
</ins><span class="cx"> if (!hasFill)
</span><span class="cx"> continue;
</span><span class="cx"> m_paintingResourceMode = ApplyToFillMode | ApplyToTextMode;
</span><span class="lines">@@ -309,7 +309,7 @@
</span><span class="cx"> ASSERT(selectionStyle);
</span><span class="cx"> paintText(paintInfo.context(), style, *selectionStyle, fragment, hasSelection, paintSelectedTextOnly);
</span><span class="cx"> break;
</span><del>- case PaintTypeStroke:
</del><ins>+ case PaintType::Stroke:
</ins><span class="cx"> if (!hasVisibleStroke)
</span><span class="cx"> continue;
</span><span class="cx"> m_paintingResourceMode = ApplyToStrokeMode | ApplyToTextMode;
</span><span class="lines">@@ -316,7 +316,7 @@
</span><span class="cx"> ASSERT(selectionStyle);
</span><span class="cx"> paintText(paintInfo.context(), style, *selectionStyle, fragment, hasSelection, paintSelectedTextOnly);
</span><span class="cx"> break;
</span><del>- case PaintTypeMarkers:
</del><ins>+ case PaintType::Markers:
</ins><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>