<!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>[212562] 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/212562">212562</a></dd>
<dt>Author</dt> <dd>pvollan@apple.com</dd>
<dt>Date</dt> <dd>2017-02-17 11:34:48 -0800 (Fri, 17 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Apply SVG styles paint-order, stroke-linejoin, and stroke-linecap on DOM text.
https://bugs.webkit.org/show_bug.cgi?id=168044
Source/WebCore:
rdar://problem/30165746
Reviewed by Simon Fraser.
This patch moves these styles out of svg, and sets the properties on video cues.
Tests: fast/css/parsing-paint-order.html
fast/css/parsing-stroke-linecap.html
fast/css/parsing-stroke-linejoin.html
fast/css/parsing-stroke-width.html
* css/CSSComputedStyleDeclaration.cpp:
(WebCore::paintOrder):
(WebCore::ComputedStyleExtractor::propertyValue):
* css/CSSProperties.json:
* css/SVGCSSComputedStyleDeclaration.cpp:
(WebCore::ComputedStyleExtractor::svgPropertyValue):
(WebCore::paintOrder): Deleted.
* css/StyleResolver.cpp:
(WebCore::StyleResolver::isValidCueStyleProperty):
* page/CaptionUserPreferencesMediaAF.cpp:
(WebCore::CaptionUserPreferencesMediaAF::cssPropertyWithTextEdgeColor):
* rendering/style/RenderStyle.cpp:
(WebCore::RenderStyle::diff):
(WebCore::RenderStyle::paintTypesForPaintOrder):
* rendering/style/RenderStyle.h:
(WebCore::RenderStyle::setPaintOrder):
(WebCore::RenderStyle::paintOrder):
(WebCore::RenderStyle::initialPaintOrder):
(WebCore::RenderStyle::setCapStyle):
(WebCore::RenderStyle::capStyle):
(WebCore::RenderStyle::initialCapStyle):
(WebCore::RenderStyle::setJoinStyle):
(WebCore::RenderStyle::joinStyle):
(WebCore::RenderStyle::initialJoinStyle):
(WebCore::RenderStyle::strokeWidth):
(WebCore::RenderStyle::setStrokeWidth):
(WebCore::RenderStyle::hasVisibleStroke):
(WebCore::RenderStyle::setStrokeOpacity):
* rendering/style/SVGRenderStyle.cpp:
(WebCore::SVGRenderStyle::diff):
(WebCore::SVGRenderStyle::paintTypesForPaintOrder): Deleted.
* rendering/style/SVGRenderStyle.h:
(WebCore::SVGRenderStyle::initialBufferedRendering):
(WebCore::SVGRenderStyle::initialFillRule):
(WebCore::SVGRenderStyle::initialMaskType):
(WebCore::SVGRenderStyle::setBufferedRendering):
(WebCore::SVGRenderStyle::setFillRule):
(WebCore::SVGRenderStyle::setMaskType):
(WebCore::SVGRenderStyle::bufferedRendering):
(WebCore::SVGRenderStyle::fillRule):
(WebCore::SVGRenderStyle::strokeMiterLimit):
(WebCore::SVGRenderStyle::maskType):
(WebCore::SVGRenderStyle::hasStroke):
(WebCore::SVGRenderStyle::setBitDefaults):
(WebCore::SVGRenderStyle::InheritedFlags::operator==):
(WebCore::SVGRenderStyle::initialCapStyle): Deleted.
(WebCore::SVGRenderStyle::initialJoinStyle): Deleted.
(WebCore::SVGRenderStyle::initialPaintOrder): Deleted.
(WebCore::SVGRenderStyle::setCapStyle): Deleted.
(WebCore::SVGRenderStyle::setJoinStyle): Deleted.
(WebCore::SVGRenderStyle::setPaintOrder): Deleted.
(WebCore::SVGRenderStyle::capStyle): Deleted.
(WebCore::SVGRenderStyle::joinStyle): Deleted.
(WebCore::SVGRenderStyle::strokeWidth): Deleted.
(WebCore::SVGRenderStyle::paintOrder): Deleted.
(WebCore::SVGRenderStyle::hasVisibleStroke): Deleted.
(WebCore::SVGRenderStyle::setStrokeWidth): Deleted.
* rendering/style/SVGRenderStyleDefs.cpp:
(WebCore::StyleStrokeData::StyleStrokeData):
(WebCore::StyleStrokeData::operator==):
* rendering/style/SVGRenderStyleDefs.h:
* rendering/style/StyleRareInheritedData.cpp:
(WebCore::StyleRareInheritedData::StyleRareInheritedData):
(WebCore::StyleRareInheritedData::operator==):
* rendering/style/StyleRareInheritedData.h:
* rendering/svg/RenderSVGEllipse.cpp:
(WebCore::RenderSVGEllipse::strokeShape):
* rendering/svg/RenderSVGPath.cpp:
(WebCore::RenderSVGPath::strokeShape):
(WebCore::RenderSVGPath::shapeDependentStrokeContains):
(WebCore::RenderSVGPath::shouldStrokeZeroLengthSubpath):
(WebCore::RenderSVGPath::zeroLengthLinecapPath):
* rendering/svg/RenderSVGRect.cpp:
(WebCore::RenderSVGRect::strokeShape):
* rendering/svg/RenderSVGShape.cpp:
(WebCore::RenderSVGShape::strokeShape):
(WebCore::RenderSVGShape::fillStrokeMarkers):
(WebCore::RenderSVGShape::strokeWidth):
(WebCore::RenderSVGShape::hasSmoothStroke):
* rendering/svg/RenderSVGText.cpp:
(WebCore::RenderSVGText::strokeBoundingBox):
* rendering/svg/SVGInlineTextBox.cpp:
(WebCore::SVGInlineTextBox::paint):
(WebCore::SVGInlineTextBox::paintDecoration):
* rendering/svg/SVGRenderSupport.cpp:
(WebCore::SVGRenderSupport::applyStrokeStyleToContext):
* rendering/svg/SVGRenderTreeAsText.cpp:
(WebCore::writeStyle):
LayoutTests:
Reviewed by Simon Fraser.
* fast/css/parsing-paint-order-expected.txt: Added.
* fast/css/parsing-paint-order.html: Added.
* fast/css/parsing-stroke-linecap-expected.txt: Added.
* fast/css/parsing-stroke-linecap.html: Added.
* fast/css/parsing-stroke-linejoin-expected.txt: Added.
* fast/css/parsing-stroke-linejoin.html: Added.
* fast/css/parsing-stroke-width-expected.txt: Added.
* fast/css/parsing-stroke-width.html: Added.
* media/track/track-css-stroke-cues-expected.txt:
* media/track/track-css-stroke-cues.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsmediatracktrackcssstrokecuesexpectedtxt">trunk/LayoutTests/media/track/track-css-stroke-cues-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediatracktrackcssstrokecueshtml">trunk/LayoutTests/media/track/track-css-stroke-cues.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="#trunkSourceWebCorecssCSSPropertiesjson">trunk/Source/WebCore/css/CSSProperties.json</a></li>
<li><a href="#trunkSourceWebCorecssSVGCSSComputedStyleDeclarationcpp">trunk/Source/WebCore/css/SVGCSSComputedStyleDeclaration.cpp</a></li>
<li><a href="#trunkSourceWebCorecssStyleResolvercpp">trunk/Source/WebCore/css/StyleResolver.cpp</a></li>
<li><a href="#trunkSourceWebCorepageCaptionUserPreferencesMediaAFcpp">trunk/Source/WebCore/page/CaptionUserPreferencesMediaAF.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="#trunkSourceWebCorerenderingstyleSVGRenderStylecpp">trunk/Source/WebCore/rendering/style/SVGRenderStyle.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleSVGRenderStyleh">trunk/Source/WebCore/rendering/style/SVGRenderStyle.h</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleSVGRenderStyleDefscpp">trunk/Source/WebCore/rendering/style/SVGRenderStyleDefs.cpp</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="#trunkSourceWebCorerenderingstyleStyleRareInheritedDatah">trunk/Source/WebCore/rendering/style/StyleRareInheritedData.h</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGEllipsecpp">trunk/Source/WebCore/rendering/svg/RenderSVGEllipse.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGPathcpp">trunk/Source/WebCore/rendering/svg/RenderSVGPath.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGRectcpp">trunk/Source/WebCore/rendering/svg/RenderSVGRect.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGShapecpp">trunk/Source/WebCore/rendering/svg/RenderSVGShape.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGTextcpp">trunk/Source/WebCore/rendering/svg/RenderSVGText.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgSVGInlineTextBoxcpp">trunk/Source/WebCore/rendering/svg/SVGInlineTextBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgSVGRenderSupportcpp">trunk/Source/WebCore/rendering/svg/SVGRenderSupport.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgSVGRenderTreeAsTextcpp">trunk/Source/WebCore/rendering/svg/SVGRenderTreeAsText.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastcssparsingpaintorderexpectedtxt">trunk/LayoutTests/fast/css/parsing-paint-order-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcssparsingpaintorderhtml">trunk/LayoutTests/fast/css/parsing-paint-order.html</a></li>
<li><a href="#trunkLayoutTestsfastcssparsingstrokelinecapexpectedtxt">trunk/LayoutTests/fast/css/parsing-stroke-linecap-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcssparsingstrokelinecaphtml">trunk/LayoutTests/fast/css/parsing-stroke-linecap.html</a></li>
<li><a href="#trunkLayoutTestsfastcssparsingstrokelinejoinexpectedtxt">trunk/LayoutTests/fast/css/parsing-stroke-linejoin-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcssparsingstrokelinejoinhtml">trunk/LayoutTests/fast/css/parsing-stroke-linejoin.html</a></li>
<li><a href="#trunkLayoutTestsfastcssparsingstrokewidthexpectedtxt">trunk/LayoutTests/fast/css/parsing-stroke-width-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcssparsingstrokewidthhtml">trunk/LayoutTests/fast/css/parsing-stroke-width.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (212561 => 212562)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2017-02-17 19:13:36 UTC (rev 212561)
+++ trunk/LayoutTests/ChangeLog 2017-02-17 19:34:48 UTC (rev 212562)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2017-02-17 Per Arne Vollan <pvollan@apple.com>
+
+ Apply SVG styles paint-order, stroke-linejoin, and stroke-linecap on DOM text.
+ https://bugs.webkit.org/show_bug.cgi?id=168044
+
+ Reviewed by Simon Fraser.
+
+ * fast/css/parsing-paint-order-expected.txt: Added.
+ * fast/css/parsing-paint-order.html: Added.
+ * fast/css/parsing-stroke-linecap-expected.txt: Added.
+ * fast/css/parsing-stroke-linecap.html: Added.
+ * fast/css/parsing-stroke-linejoin-expected.txt: Added.
+ * fast/css/parsing-stroke-linejoin.html: Added.
+ * fast/css/parsing-stroke-width-expected.txt: Added.
+ * fast/css/parsing-stroke-width.html: Added.
+ * media/track/track-css-stroke-cues-expected.txt:
+ * media/track/track-css-stroke-cues.html:
+
</ins><span class="cx"> 2017-02-17 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Fixed elements bounce when rubber-banding at the bottom of the page
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssparsingpaintorderexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css/parsing-paint-order-expected.txt (0 => 212562)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/parsing-paint-order-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/css/parsing-paint-order-expected.txt 2017-02-17 19:34:48 UTC (rev 212562)
</span><span class="lines">@@ -0,0 +1,32 @@
</span><ins>+This tests checks that all of the input values for paint-order parse correctly.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS testComputedStyleInherited("paint-order: fill;") is "fill"
+PASS testComputedStyleInherited("paint-order: stroke;") is "stroke"
+PASS testComputedStyleInherited("paint-order: markers;") is "markers"
+PASS testComputedStyle(";") is "normal"
+PASS test("paint-order: fill;") is "fill"
+PASS test("paint-order: fill stroke;") is "fill"
+PASS test("paint-order: fill markers;") is "fill markers"
+PASS test("paint-order: fill stroke markers;") is "fill"
+PASS test("paint-order: fill markers stroke;") is "fill markers"
+PASS test("paint-order: stroke;") is "stroke"
+PASS test("paint-order: stroke fill;") is "stroke"
+PASS test("paint-order: stroke markers;") is "stroke markers"
+PASS test("paint-order: stroke fill markers;") is "stroke"
+PASS test("paint-order: stroke markers fill;") is "stroke markers"
+PASS test("paint-order: markers;") is "markers"
+PASS test("paint-order: markers fill;") is "markers"
+PASS test("paint-order: markers stroke;") is "markers stroke"
+PASS test("paint-order: markers fill stroke;") is "markers"
+PASS test("paint-order: markers stroke fill;") is "markers stroke"
+PASS test("paint-order: fil;") is ""
+PASS test("paint-order: fill markrs;") is ""
+PASS test("paint-order: 10px;") is ""
+PASS test("paint-order: 10%;") is ""
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcssparsingpaintorderhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css/parsing-paint-order.html (0 => 212562)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/parsing-paint-order.html (rev 0)
+++ trunk/LayoutTests/fast/css/parsing-paint-order.html 2017-02-17 19:34:48 UTC (rev 212562)
</span><span class="lines">@@ -0,0 +1,78 @@
</span><ins>+<!DOCTYPE html>
+<html>
+ <head>
+ <script src="../../resources/js-test-pre.js"></script>
+ </head>
+ <body>
+ <script>
+ description("This tests checks that all of the input values for paint-order parse correctly.");
+
+ function test(value)
+ {
+ var div = document.createElement("div");
+ div.setAttribute("style", value);
+ document.body.appendChild(div);
+
+ var result = div.style.getPropertyValue("paint-order");
+
+ document.body.removeChild(div);
+ return result;
+ }
+
+ function testComputedStyle(value)
+ {
+ var div = document.createElement("div");
+ div.setAttribute("style", value);
+ document.body.appendChild(div);
+
+ var result = window.getComputedStyle(div).paintOrder;
+ document.body.removeChild(div);
+ return result;
+ }
+
+ function testComputedStyleInherited(value)
+ {
+ var div = document.createElement("div");
+ div.setAttribute("style", value);
+
+ var div2 = document.createElement("div");
+ div.appendChild(div2);
+
+ document.body.appendChild(div);
+
+ var result = window.getComputedStyle(div2).paintOrder;
+ document.body.removeChild(div);
+ return result;
+ }
+
+ shouldBe('testComputedStyleInherited("paint-order: fill;")', '"fill"');
+ shouldBe('testComputedStyleInherited("paint-order: stroke;")', '"stroke"');
+ shouldBe('testComputedStyleInherited("paint-order: markers;")', '"markers"');
+
+ shouldBe('testComputedStyle(";")', '"normal"');
+ shouldBe('test("paint-order: fill;")', '"fill"');
+ shouldBe('test("paint-order: fill stroke;")', '"fill"');
+ shouldBe('test("paint-order: fill markers;")', '"fill markers"');
+ shouldBe('test("paint-order: fill stroke markers;")', '"fill"');
+ shouldBe('test("paint-order: fill markers stroke;")', '"fill markers"');
+
+ shouldBe('test("paint-order: stroke;")', '"stroke"');
+ shouldBe('test("paint-order: stroke fill;")', '"stroke"');
+ shouldBe('test("paint-order: stroke markers;")', '"stroke markers"');
+ shouldBe('test("paint-order: stroke fill markers;")', '"stroke"');
+ shouldBe('test("paint-order: stroke markers fill;")', '"stroke markers"');
+
+ shouldBe('test("paint-order: markers;")', '"markers"');
+ shouldBe('test("paint-order: markers fill;")', '"markers"');
+ shouldBe('test("paint-order: markers stroke;")', '"markers stroke"');
+ shouldBe('test("paint-order: markers fill stroke;")', '"markers"');
+ shouldBe('test("paint-order: markers stroke fill;")', '"markers stroke"');
+
+ shouldBeEqualToString('test("paint-order: fil;")', '');
+ shouldBeEqualToString('test("paint-order: fill markrs;")', '');
+ shouldBeEqualToString('test("paint-order: 10px;")', '');
+ shouldBeEqualToString('test("paint-order: 10%;")', '');
+ </script>
+ <script src="../../resources/js-test-post.js"></script>
+ </body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcssparsingstrokelinecapexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css/parsing-stroke-linecap-expected.txt (0 => 212562)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/parsing-stroke-linecap-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/css/parsing-stroke-linecap-expected.txt 2017-02-17 19:34:48 UTC (rev 212562)
</span><span class="lines">@@ -0,0 +1,20 @@
</span><ins>+This tests checks that all of the input values for stroke-linecap parse correctly.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS testComputedStyleInherited("stroke-linecap: butt;") is "butt"
+PASS testComputedStyleInherited("stroke-linecap: round;") is "round"
+PASS testComputedStyleInherited("stroke-linecap: square;") is "square"
+PASS testComputedStyle(";") is "butt"
+PASS test("stroke-linecap: butt;") is "butt"
+PASS test("stroke-linecap: round;") is "round"
+PASS test("stroke-linecap: square;") is "square"
+PASS test("stroke-linecap: rnd;") is ""
+PASS test("stroke-linecap: but;") is ""
+PASS test("stroke-linecap: 10px;") is ""
+PASS test("stroke-linecap: 10%;") is ""
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcssparsingstrokelinecaphtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css/parsing-stroke-linecap.html (0 => 212562)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/parsing-stroke-linecap.html (rev 0)
+++ trunk/LayoutTests/fast/css/parsing-stroke-linecap.html 2017-02-17 19:34:48 UTC (rev 212562)
</span><span class="lines">@@ -0,0 +1,64 @@
</span><ins>+<!DOCTYPE html>
+<html>
+ <head>
+ <script src="../../resources/js-test-pre.js"></script>
+ </head>
+ <body>
+ <script>
+ description("This tests checks that all of the input values for stroke-linecap parse correctly.");
+
+ function test(value)
+ {
+ var div = document.createElement("div");
+ div.setAttribute("style", value);
+ document.body.appendChild(div);
+
+ var result = div.style.getPropertyValue("stroke-linecap");
+
+ document.body.removeChild(div);
+ return result;
+ }
+
+ function testComputedStyle(value)
+ {
+ var div = document.createElement("div");
+ div.setAttribute("style", value);
+ document.body.appendChild(div);
+
+ var result = window.getComputedStyle(div).strokeLinecap;
+ document.body.removeChild(div);
+ return result;
+ }
+
+ function testComputedStyleInherited(value)
+ {
+ var div = document.createElement("div");
+ div.setAttribute("style", value);
+
+ var div2 = document.createElement("div");
+ div.appendChild(div2);
+
+ document.body.appendChild(div);
+
+ var result = window.getComputedStyle(div2).strokeLinecap;
+ document.body.removeChild(div);
+ return result;
+ }
+
+ shouldBe('testComputedStyleInherited("stroke-linecap: butt;")', '"butt"');
+ shouldBe('testComputedStyleInherited("stroke-linecap: round;")', '"round"');
+ shouldBe('testComputedStyleInherited("stroke-linecap: square;")', '"square"');
+
+ shouldBe('testComputedStyle(";")', '"butt"');
+ shouldBe('test("stroke-linecap: butt;")', '"butt"');
+ shouldBe('test("stroke-linecap: round;")', '"round"');
+ shouldBe('test("stroke-linecap: square;")', '"square"');
+
+ shouldBeEqualToString('test("stroke-linecap: rnd;")', '');
+ shouldBeEqualToString('test("stroke-linecap: but;")', '');
+ shouldBeEqualToString('test("stroke-linecap: 10px;")', '');
+ shouldBeEqualToString('test("stroke-linecap: 10%;")', '');
+ </script>
+ <script src="../../resources/js-test-post.js"></script>
+ </body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcssparsingstrokelinejoinexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css/parsing-stroke-linejoin-expected.txt (0 => 212562)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/parsing-stroke-linejoin-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/css/parsing-stroke-linejoin-expected.txt 2017-02-17 19:34:48 UTC (rev 212562)
</span><span class="lines">@@ -0,0 +1,20 @@
</span><ins>+This tests checks that all of the input values for stroke-linejoin parse correctly.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS testComputedStyleInherited("stroke-linejoin: miter;") is "miter"
+PASS testComputedStyleInherited("stroke-linejoin: round;") is "round"
+PASS testComputedStyleInherited("stroke-linejoin: bevel;") is "bevel"
+PASS testComputedStyle(";") is "miter"
+PASS test("stroke-linejoin: miter;") is "miter"
+PASS test("stroke-linejoin: round;") is "round"
+PASS test("stroke-linejoin: bevel;") is "bevel"
+PASS test("stroke-linejoin: mitr;") is ""
+PASS test("stroke-linejoin: bevl;") is ""
+PASS test("stroke-linejoin: 10px;") is ""
+PASS test("stroke-linejoin: 10%;") is ""
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcssparsingstrokelinejoinhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css/parsing-stroke-linejoin.html (0 => 212562)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/parsing-stroke-linejoin.html (rev 0)
+++ trunk/LayoutTests/fast/css/parsing-stroke-linejoin.html 2017-02-17 19:34:48 UTC (rev 212562)
</span><span class="lines">@@ -0,0 +1,64 @@
</span><ins>+<!DOCTYPE html>
+<html>
+ <head>
+ <script src="../../resources/js-test-pre.js"></script>
+ </head>
+ <body>
+ <script>
+ description("This tests checks that all of the input values for stroke-linejoin parse correctly.");
+
+ function test(value)
+ {
+ var div = document.createElement("div");
+ div.setAttribute("style", value);
+ document.body.appendChild(div);
+
+ var result = div.style.getPropertyValue("stroke-linejoin");
+
+ document.body.removeChild(div);
+ return result;
+ }
+
+ function testComputedStyle(value)
+ {
+ var div = document.createElement("div");
+ div.setAttribute("style", value);
+ document.body.appendChild(div);
+
+ var result = window.getComputedStyle(div).strokeLinejoin;
+ document.body.removeChild(div);
+ return result;
+ }
+
+ function testComputedStyleInherited(value)
+ {
+ var div = document.createElement("div");
+ div.setAttribute("style", value);
+
+ var div2 = document.createElement("div");
+ div.appendChild(div2);
+
+ document.body.appendChild(div);
+
+ var result = window.getComputedStyle(div2).strokeLinejoin;
+ document.body.removeChild(div);
+ return result;
+ }
+
+ shouldBe('testComputedStyleInherited("stroke-linejoin: miter;")', '"miter"');
+ shouldBe('testComputedStyleInherited("stroke-linejoin: round;")', '"round"');
+ shouldBe('testComputedStyleInherited("stroke-linejoin: bevel;")', '"bevel"');
+
+ shouldBe('testComputedStyle(";")', '"miter"');
+ shouldBe('test("stroke-linejoin: miter;")', '"miter"');
+ shouldBe('test("stroke-linejoin: round;")', '"round"');
+ shouldBe('test("stroke-linejoin: bevel;")', '"bevel"');
+
+ shouldBeEqualToString('test("stroke-linejoin: mitr;")', '');
+ shouldBeEqualToString('test("stroke-linejoin: bevl;")', '');
+ shouldBeEqualToString('test("stroke-linejoin: 10px;")', '');
+ shouldBeEqualToString('test("stroke-linejoin: 10%;")', '');
+ </script>
+ <script src="../../resources/js-test-post.js"></script>
+ </body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcssparsingstrokewidthexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css/parsing-stroke-width-expected.txt (0 => 212562)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/parsing-stroke-width-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/css/parsing-stroke-width-expected.txt 2017-02-17 19:34:48 UTC (rev 212562)
</span><span class="lines">@@ -0,0 +1,19 @@
</span><ins>+This tests checks that all of the input values for stroke-width parse correctly.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS testComputedStyleInherited("stroke-width: 4px;") is "4px"
+FAIL testComputedStyleInherited("stroke-width: 0.01em;") should be 0.01em. Was 0.1599999964237213px.
+PASS testComputedStyleInherited("stroke-width: 10%;") is "10%"
+PASS testComputedStyle(";") is "1px"
+PASS test("stroke-width: 4px;") is "4px"
+PASS test("stroke-width: 0.01em;") is "0.01em"
+PASS test("stroke-width: 10%;") is "10%"
+PASS test("stroke-width: 4;") is "4px"
+PASS test("stroke-width: em;") is ""
+PASS test("stroke-width: %;") is ""
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcssparsingstrokewidthhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css/parsing-stroke-width.html (0 => 212562)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/parsing-stroke-width.html (rev 0)
+++ trunk/LayoutTests/fast/css/parsing-stroke-width.html 2017-02-17 19:34:48 UTC (rev 212562)
</span><span class="lines">@@ -0,0 +1,63 @@
</span><ins>+<!DOCTYPE html>
+<html>
+ <head>
+ <script src="../../resources/js-test-pre.js"></script>
+ </head>
+ <body>
+ <script>
+ description("This tests checks that all of the input values for stroke-width parse correctly.");
+
+ function test(value)
+ {
+ var div = document.createElement("div");
+ div.setAttribute("style", value);
+ document.body.appendChild(div);
+
+ var result = div.style.getPropertyValue("stroke-width");
+
+ document.body.removeChild(div);
+ return result;
+ }
+
+ function testComputedStyle(value)
+ {
+ var div = document.createElement("div");
+ div.setAttribute("style", value);
+ document.body.appendChild(div);
+
+ var result = window.getComputedStyle(div).strokeWidth;
+ document.body.removeChild(div);
+ return result;
+ }
+
+ function testComputedStyleInherited(value)
+ {
+ var div = document.createElement("div");
+ div.setAttribute("style", value);
+
+ var div2 = document.createElement("div");
+ div.appendChild(div2);
+
+ document.body.appendChild(div);
+
+ var result = window.getComputedStyle(div2).strokeWidth;
+ document.body.removeChild(div);
+ return result;
+ }
+
+ shouldBe('testComputedStyleInherited("stroke-width: 4px;")', '"4px"');
+ shouldBe('testComputedStyleInherited("stroke-width: 0.01em;")', '"0.01em"');
+ shouldBe('testComputedStyleInherited("stroke-width: 10%;")', '"10%"');
+
+ shouldBe('testComputedStyle(";")', '"1px"');
+ shouldBe('test("stroke-width: 4px;")', '"4px"');
+ shouldBe('test("stroke-width: 0.01em;")', '"0.01em"');
+ shouldBe('test("stroke-width: 10%;")', '"10%"');
+
+ shouldBeEqualToString('test("stroke-width: 4;")', '4px');
+ shouldBeEqualToString('test("stroke-width: em;")', '');
+ shouldBeEqualToString('test("stroke-width: %;")', '');
+ </script>
+ <script src="../../resources/js-test-post.js"></script>
+ </body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsmediatracktrackcssstrokecuesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/track/track-css-stroke-cues-expected.txt (212561 => 212562)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/track/track-css-stroke-cues-expected.txt 2017-02-17 19:13:36 UTC (rev 212561)
+++ trunk/LayoutTests/media/track/track-css-stroke-cues-expected.txt 2017-02-17 19:34:48 UTC (rev 212562)
</span><span class="lines">@@ -4,5 +4,8 @@
</span><span class="cx"> EVENT(seeked)
</span><span class="cx"> EXPECTED (getComputedStyle(textTrackDisplayElement(video, 'cue')).webkitTextStrokeWidth == '4px') OK
</span><span class="cx"> EXPECTED (getComputedStyle(textTrackDisplayElement(video, 'cue')).webkitTextStrokeColor == 'rgb(0, 0, 0)') OK
</span><ins>+EXPECTED (getComputedStyle(textTrackDisplayElement(video, 'cue')).paintOrder == 'stroke') OK
+EXPECTED (getComputedStyle(textTrackDisplayElement(video, 'cue')).strokeLinejoin == 'round') OK
+EXPECTED (getComputedStyle(textTrackDisplayElement(video, 'cue')).strokeLinecap == 'round') OK
</ins><span class="cx"> END OF TEST
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsmediatracktrackcssstrokecueshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/track/track-css-stroke-cues.html (212561 => 212562)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/track/track-css-stroke-cues.html 2017-02-17 19:13:36 UTC (rev 212561)
+++ trunk/LayoutTests/media/track/track-css-stroke-cues.html 2017-02-17 19:34:48 UTC (rev 212562)
</span><span class="lines">@@ -9,7 +9,7 @@
</span><span class="cx">
</span><span class="cx"> <style>
</span><span class="cx">
</span><del>- video::cue { -webkit-text-stroke: 4px black; }
</del><ins>+ video::cue { -webkit-text-stroke: 4px black; paint-order: stroke; stroke-linecap: round; stroke-linejoin: round;}
</ins><span class="cx">
</span><span class="cx"> </style>
</span><span class="cx">
</span><span class="lines">@@ -19,6 +19,9 @@
</span><span class="cx"> {
</span><span class="cx"> testExpected("getComputedStyle(textTrackDisplayElement(video, 'cue')).webkitTextStrokeWidth", "4px");
</span><span class="cx"> testExpected("getComputedStyle(textTrackDisplayElement(video, 'cue')).webkitTextStrokeColor", "rgb(0, 0, 0)");
</span><ins>+ testExpected("getComputedStyle(textTrackDisplayElement(video, 'cue')).paintOrder", "stroke");
+ testExpected("getComputedStyle(textTrackDisplayElement(video, 'cue')).strokeLinejoin", "round");
+ testExpected("getComputedStyle(textTrackDisplayElement(video, 'cue')).strokeLinecap", "round");
</ins><span class="cx"> endTest();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (212561 => 212562)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-02-17 19:13:36 UTC (rev 212561)
+++ trunk/Source/WebCore/ChangeLog 2017-02-17 19:34:48 UTC (rev 212562)
</span><span class="lines">@@ -1,3 +1,107 @@
</span><ins>+2017-02-17 Per Arne Vollan <pvollan@apple.com>
+
+ Apply SVG styles paint-order, stroke-linejoin, and stroke-linecap on DOM text.
+ https://bugs.webkit.org/show_bug.cgi?id=168044
+ rdar://problem/30165746
+
+ Reviewed by Simon Fraser.
+
+ This patch moves these styles out of svg, and sets the properties on video cues.
+
+ Tests: fast/css/parsing-paint-order.html
+ fast/css/parsing-stroke-linecap.html
+ fast/css/parsing-stroke-linejoin.html
+ fast/css/parsing-stroke-width.html
+
+ * css/CSSComputedStyleDeclaration.cpp:
+ (WebCore::paintOrder):
+ (WebCore::ComputedStyleExtractor::propertyValue):
+ * css/CSSProperties.json:
+ * css/SVGCSSComputedStyleDeclaration.cpp:
+ (WebCore::ComputedStyleExtractor::svgPropertyValue):
+ (WebCore::paintOrder): Deleted.
+ * css/StyleResolver.cpp:
+ (WebCore::StyleResolver::isValidCueStyleProperty):
+ * page/CaptionUserPreferencesMediaAF.cpp:
+ (WebCore::CaptionUserPreferencesMediaAF::cssPropertyWithTextEdgeColor):
+ * rendering/style/RenderStyle.cpp:
+ (WebCore::RenderStyle::diff):
+ (WebCore::RenderStyle::paintTypesForPaintOrder):
+ * rendering/style/RenderStyle.h:
+ (WebCore::RenderStyle::setPaintOrder):
+ (WebCore::RenderStyle::paintOrder):
+ (WebCore::RenderStyle::initialPaintOrder):
+ (WebCore::RenderStyle::setCapStyle):
+ (WebCore::RenderStyle::capStyle):
+ (WebCore::RenderStyle::initialCapStyle):
+ (WebCore::RenderStyle::setJoinStyle):
+ (WebCore::RenderStyle::joinStyle):
+ (WebCore::RenderStyle::initialJoinStyle):
+ (WebCore::RenderStyle::strokeWidth):
+ (WebCore::RenderStyle::setStrokeWidth):
+ (WebCore::RenderStyle::hasVisibleStroke):
+ (WebCore::RenderStyle::setStrokeOpacity):
+ * rendering/style/SVGRenderStyle.cpp:
+ (WebCore::SVGRenderStyle::diff):
+ (WebCore::SVGRenderStyle::paintTypesForPaintOrder): Deleted.
+ * rendering/style/SVGRenderStyle.h:
+ (WebCore::SVGRenderStyle::initialBufferedRendering):
+ (WebCore::SVGRenderStyle::initialFillRule):
+ (WebCore::SVGRenderStyle::initialMaskType):
+ (WebCore::SVGRenderStyle::setBufferedRendering):
+ (WebCore::SVGRenderStyle::setFillRule):
+ (WebCore::SVGRenderStyle::setMaskType):
+ (WebCore::SVGRenderStyle::bufferedRendering):
+ (WebCore::SVGRenderStyle::fillRule):
+ (WebCore::SVGRenderStyle::strokeMiterLimit):
+ (WebCore::SVGRenderStyle::maskType):
+ (WebCore::SVGRenderStyle::hasStroke):
+ (WebCore::SVGRenderStyle::setBitDefaults):
+ (WebCore::SVGRenderStyle::InheritedFlags::operator==):
+ (WebCore::SVGRenderStyle::initialCapStyle): Deleted.
+ (WebCore::SVGRenderStyle::initialJoinStyle): Deleted.
+ (WebCore::SVGRenderStyle::initialPaintOrder): Deleted.
+ (WebCore::SVGRenderStyle::setCapStyle): Deleted.
+ (WebCore::SVGRenderStyle::setJoinStyle): Deleted.
+ (WebCore::SVGRenderStyle::setPaintOrder): Deleted.
+ (WebCore::SVGRenderStyle::capStyle): Deleted.
+ (WebCore::SVGRenderStyle::joinStyle): Deleted.
+ (WebCore::SVGRenderStyle::strokeWidth): Deleted.
+ (WebCore::SVGRenderStyle::paintOrder): Deleted.
+ (WebCore::SVGRenderStyle::hasVisibleStroke): Deleted.
+ (WebCore::SVGRenderStyle::setStrokeWidth): Deleted.
+ * rendering/style/SVGRenderStyleDefs.cpp:
+ (WebCore::StyleStrokeData::StyleStrokeData):
+ (WebCore::StyleStrokeData::operator==):
+ * rendering/style/SVGRenderStyleDefs.h:
+ * rendering/style/StyleRareInheritedData.cpp:
+ (WebCore::StyleRareInheritedData::StyleRareInheritedData):
+ (WebCore::StyleRareInheritedData::operator==):
+ * rendering/style/StyleRareInheritedData.h:
+ * rendering/svg/RenderSVGEllipse.cpp:
+ (WebCore::RenderSVGEllipse::strokeShape):
+ * rendering/svg/RenderSVGPath.cpp:
+ (WebCore::RenderSVGPath::strokeShape):
+ (WebCore::RenderSVGPath::shapeDependentStrokeContains):
+ (WebCore::RenderSVGPath::shouldStrokeZeroLengthSubpath):
+ (WebCore::RenderSVGPath::zeroLengthLinecapPath):
+ * rendering/svg/RenderSVGRect.cpp:
+ (WebCore::RenderSVGRect::strokeShape):
+ * rendering/svg/RenderSVGShape.cpp:
+ (WebCore::RenderSVGShape::strokeShape):
+ (WebCore::RenderSVGShape::fillStrokeMarkers):
+ (WebCore::RenderSVGShape::strokeWidth):
+ (WebCore::RenderSVGShape::hasSmoothStroke):
+ * rendering/svg/RenderSVGText.cpp:
+ (WebCore::RenderSVGText::strokeBoundingBox):
+ * rendering/svg/SVGInlineTextBox.cpp:
+ (WebCore::SVGInlineTextBox::paint):
+ (WebCore::SVGInlineTextBox::paintDecoration):
+ * rendering/svg/SVGRenderSupport.cpp:
+ (WebCore::SVGRenderSupport::applyStrokeStyleToContext):
+ * rendering/svg/SVGRenderTreeAsText.cpp:
+ (WebCore::writeStyle):
+
</ins><span class="cx"> 2017-02-17 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [SOUP] Handle Settings::allowsAnySSLCertificate() in SSL sockets
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSComputedStyleDeclarationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp (212561 => 212562)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2017-02-17 19:13:36 UTC (rev 212561)
+++ trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2017-02-17 19:34:48 UTC (rev 212562)
</span><span class="lines">@@ -2479,6 +2479,41 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static Ref<CSSValue> paintOrder(PaintOrder paintOrder)
+{
+ if (paintOrder == PaintOrderNormal)
+ return CSSPrimitiveValue::createIdentifier(CSSValueNormal);
+
+ auto paintOrderList = CSSValueList::createSpaceSeparated();
+ switch (paintOrder) {
+ case PaintOrderNormal:
+ ASSERT_NOT_REACHED();
+ break;
+ case PaintOrderFill:
+ paintOrderList->append(CSSPrimitiveValue::createIdentifier(CSSValueFill));
+ break;
+ case PaintOrderFillMarkers:
+ paintOrderList->append(CSSPrimitiveValue::createIdentifier(CSSValueFill));
+ paintOrderList->append(CSSPrimitiveValue::createIdentifier(CSSValueMarkers));
+ break;
+ case PaintOrderStroke:
+ paintOrderList->append(CSSPrimitiveValue::createIdentifier(CSSValueStroke));
+ break;
+ case PaintOrderStrokeMarkers:
+ paintOrderList->append(CSSPrimitiveValue::createIdentifier(CSSValueStroke));
+ paintOrderList->append(CSSPrimitiveValue::createIdentifier(CSSValueMarkers));
+ break;
+ case PaintOrderMarkers:
+ paintOrderList->append(CSSPrimitiveValue::createIdentifier(CSSValueMarkers));
+ break;
+ case PaintOrderMarkersStroke:
+ paintOrderList->append(CSSPrimitiveValue::createIdentifier(CSSValueMarkers));
+ paintOrderList->append(CSSPrimitiveValue::createIdentifier(CSSValueStroke));
+ break;
+ }
+ return WTFMove(paintOrderList);
+}
+
</ins><span class="cx"> inline static bool isFlexOrGrid(ContainerNode* element)
</span><span class="cx"> {
</span><span class="cx"> return element && element->computedStyle() && element->computedStyle()->isDisplayFlexibleOrGridBox();
</span><span class="lines">@@ -3806,8 +3841,6 @@
</span><span class="cx"> return zoomAdjustedPixelValueForLength(style->svgStyle().rx(), *style);
</span><span class="cx"> case CSSPropertyRy:
</span><span class="cx"> return zoomAdjustedPixelValueForLength(style->svgStyle().ry(), *style);
</span><del>- case CSSPropertyStrokeWidth:
- return zoomAdjustedPixelValueForLength(style->svgStyle().strokeWidth(), *style);
</del><span class="cx"> case CSSPropertyStrokeDashoffset:
</span><span class="cx"> return zoomAdjustedPixelValueForLength(style->svgStyle().strokeDashOffset(), *style);
</span><span class="cx"> case CSSPropertyX:
</span><span class="lines">@@ -3817,6 +3850,15 @@
</span><span class="cx"> case CSSPropertyWebkitTextZoom:
</span><span class="cx"> return cssValuePool.createValue(style->textZoom());
</span><span class="cx">
</span><ins>+ case CSSPropertyPaintOrder:
+ return paintOrder(style->paintOrder());
+ case CSSPropertyStrokeLinecap:
+ return CSSPrimitiveValue::create(style->capStyle());
+ case CSSPropertyStrokeLinejoin:
+ return CSSPrimitiveValue::create(style->joinStyle());
+ case CSSPropertyStrokeWidth:
+ return zoomAdjustedPixelValueForLength(style->strokeWidth(), *style);
+
</ins><span class="cx"> /* Unimplemented CSS 3 properties (including CSS3 shorthand properties) */
</span><span class="cx"> case CSSPropertyAll:
</span><span class="cx"> case CSSPropertyAnimation:
</span><span class="lines">@@ -3930,12 +3972,9 @@
</span><span class="cx"> case CSSPropertyMarkerMid:
</span><span class="cx"> case CSSPropertyMarkerStart:
</span><span class="cx"> case CSSPropertyMaskType:
</span><del>- case CSSPropertyPaintOrder:
</del><span class="cx"> case CSSPropertyShapeRendering:
</span><span class="cx"> case CSSPropertyStroke:
</span><span class="cx"> case CSSPropertyStrokeDasharray:
</span><del>- case CSSPropertyStrokeLinecap:
- case CSSPropertyStrokeLinejoin:
</del><span class="cx"> case CSSPropertyStrokeMiterlimit:
</span><span class="cx"> case CSSPropertyStrokeOpacity:
</span><span class="cx"> case CSSPropertyAlignmentBaseline:
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSPropertiesjson"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSProperties.json (212561 => 212562)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSProperties.json 2017-02-17 19:13:36 UTC (rev 212561)
+++ trunk/Source/WebCore/css/CSSProperties.json 2017-02-17 19:34:48 UTC (rev 212562)
</span><span class="lines">@@ -1824,8 +1824,7 @@
</span><span class="cx"> },
</span><span class="cx"> "paint-order": {
</span><span class="cx"> "codegen-properties": {
</span><del>- "converter": "PaintOrder",
- "svg": true
</del><ins>+ "converter": "PaintOrder"
</ins><span class="cx"> }
</span><span class="cx"> },
</span><span class="cx"> "pointer-events": {
</span><span class="lines">@@ -1960,8 +1959,7 @@
</span><span class="cx"> "square"
</span><span class="cx"> ],
</span><span class="cx"> "codegen-properties": {
</span><del>- "name-for-methods": "CapStyle",
- "svg": true
</del><ins>+ "name-for-methods": "CapStyle"
</ins><span class="cx"> }
</span><span class="cx"> },
</span><span class="cx"> "stroke-linejoin": {
</span><span class="lines">@@ -1972,8 +1970,7 @@
</span><span class="cx"> "bevel"
</span><span class="cx"> ],
</span><span class="cx"> "codegen-properties": {
</span><del>- "name-for-methods": "JoinStyle",
- "svg": true
</del><ins>+ "name-for-methods": "JoinStyle"
</ins><span class="cx"> }
</span><span class="cx"> },
</span><span class="cx"> "stroke-miterlimit": {
</span></span></pre></div>
<a id="trunkSourceWebCorecssSVGCSSComputedStyleDeclarationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/SVGCSSComputedStyleDeclaration.cpp (212561 => 212562)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/SVGCSSComputedStyleDeclaration.cpp 2017-02-17 19:13:36 UTC (rev 212561)
+++ trunk/Source/WebCore/css/SVGCSSComputedStyleDeclaration.cpp 2017-02-17 19:34:48 UTC (rev 212562)
</span><span class="lines">@@ -30,41 +30,6 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-static Ref<CSSValue> paintOrder(PaintOrder paintOrder)
-{
- if (paintOrder == PaintOrderNormal)
- return CSSPrimitiveValue::createIdentifier(CSSValueNormal);
-
- auto paintOrderList = CSSValueList::createSpaceSeparated();
- switch (paintOrder) {
- case PaintOrderNormal:
- ASSERT_NOT_REACHED();
- break;
- case PaintOrderFill:
- paintOrderList->append(CSSPrimitiveValue::createIdentifier(CSSValueFill));
- break;
- case PaintOrderFillMarkers:
- paintOrderList->append(CSSPrimitiveValue::createIdentifier(CSSValueFill));
- paintOrderList->append(CSSPrimitiveValue::createIdentifier(CSSValueMarkers));
- break;
- case PaintOrderStroke:
- paintOrderList->append(CSSPrimitiveValue::createIdentifier(CSSValueStroke));
- break;
- case PaintOrderStrokeMarkers:
- paintOrderList->append(CSSPrimitiveValue::createIdentifier(CSSValueStroke));
- paintOrderList->append(CSSPrimitiveValue::createIdentifier(CSSValueMarkers));
- break;
- case PaintOrderMarkers:
- paintOrderList->append(CSSPrimitiveValue::createIdentifier(CSSValueMarkers));
- break;
- case PaintOrderMarkersStroke:
- paintOrderList->append(CSSPrimitiveValue::createIdentifier(CSSValueMarkers));
- paintOrderList->append(CSSPrimitiveValue::createIdentifier(CSSValueStroke));
- break;
- }
- return WTFMove(paintOrderList);
-}
-
</del><span class="cx"> static RefPtr<CSSPrimitiveValue> glyphOrientationToCSSPrimitiveValue(EGlyphOrientation orientation)
</span><span class="cx"> {
</span><span class="cx"> switch (orientation) {
</span><span class="lines">@@ -148,10 +113,6 @@
</span><span class="cx"> return CSSPrimitiveValue::create(svgStyle.colorRendering());
</span><span class="cx"> case CSSPropertyShapeRendering:
</span><span class="cx"> return CSSPrimitiveValue::create(svgStyle.shapeRendering());
</span><del>- case CSSPropertyStrokeLinecap:
- return CSSPrimitiveValue::create(svgStyle.capStyle());
- case CSSPropertyStrokeLinejoin:
- return CSSPrimitiveValue::create(svgStyle.joinStyle());
</del><span class="cx"> case CSSPropertyStrokeMiterlimit:
</span><span class="cx"> return CSSPrimitiveValue::create(svgStyle.strokeMiterLimit(), CSSPrimitiveValue::CSS_NUMBER);
</span><span class="cx"> case CSSPropertyStrokeOpacity:
</span><span class="lines">@@ -229,8 +190,6 @@
</span><span class="cx"> return CSSPrimitiveValue::create(svgStyle.vectorEffect());
</span><span class="cx"> case CSSPropertyMaskType:
</span><span class="cx"> return CSSPrimitiveValue::create(svgStyle.maskType());
</span><del>- case CSSPropertyPaintOrder:
- return paintOrder(svgStyle.paintOrder());
</del><span class="cx"> case CSSPropertyMarker:
</span><span class="cx"> case CSSPropertyEnableBackground:
</span><span class="cx"> case CSSPropertyColorProfile:
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleResolvercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleResolver.cpp (212561 => 212562)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleResolver.cpp 2017-02-17 19:13:36 UTC (rev 212561)
+++ trunk/Source/WebCore/css/StyleResolver.cpp 2017-02-17 19:34:48 UTC (rev 212562)
</span><span class="lines">@@ -1499,6 +1499,9 @@
</span><span class="cx"> case CSSPropertyTextDecoration:
</span><span class="cx"> case CSSPropertyTextShadow:
</span><span class="cx"> case CSSPropertyBorderStyle:
</span><ins>+ case CSSPropertyPaintOrder:
+ case CSSPropertyStrokeLinejoin:
+ case CSSPropertyStrokeLinecap:
</ins><span class="cx"> case CSSPropertyWebkitTextStrokeColor:
</span><span class="cx"> case CSSPropertyWebkitTextStrokeWidth:
</span><span class="cx"> return true;
</span></span></pre></div>
<a id="trunkSourceWebCorepageCaptionUserPreferencesMediaAFcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp (212561 => 212562)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp 2017-02-17 19:13:36 UTC (rev 212561)
+++ trunk/Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp 2017-02-17 19:34:48 UTC (rev 212562)
</span><span class="lines">@@ -368,6 +368,11 @@
</span><span class="cx"> if (important)
</span><span class="cx"> builder.appendLiteral(" !important");
</span><span class="cx"> builder.append(';');
</span><ins>+ if (id == CSSPropertyWebkitTextStroke) {
+ builder.append(" paint-order: stroke;");
+ builder.append(" stroke-linejoin: round;");
+ builder.append(" stroke-linecap: round;");
+ }
</ins><span class="cx">
</span><span class="cx"> return builder.toString();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleRenderStylecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/RenderStyle.cpp (212561 => 212562)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/RenderStyle.cpp 2017-02-17 19:13:36 UTC (rev 212561)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.cpp 2017-02-17 19:34:48 UTC (rev 212562)
</span><span class="lines">@@ -914,6 +914,12 @@
</span><span class="cx"> return svgChange;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ // These properties affect the cached stroke bounding box rects.
+ if (m_rareInheritedData->capStyle != other.m_rareInheritedData->capStyle
+ || m_rareInheritedData->joinStyle != other.m_rareInheritedData->joinStyle
+ || m_rareInheritedData->strokeWidth != other.m_rareInheritedData->strokeWidth)
+ return StyleDifferenceLayout;
+
</ins><span class="cx"> if (changeRequiresLayout(other, changedContextSensitiveProperties))
</span><span class="cx"> return StyleDifferenceLayout;
</span><span class="cx">
</span><span class="lines">@@ -2217,4 +2223,45 @@
</span><span class="cx">
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+Vector<PaintType, 3> RenderStyle::paintTypesForPaintOrder() const
+{
+ Vector<PaintType, 3> paintOrder;
+ switch (this->paintOrder()) {
+ case PaintOrderNormal:
+ FALLTHROUGH;
+ case PaintOrderFill:
+ paintOrder.append(PaintTypeFill);
+ paintOrder.append(PaintTypeStroke);
+ paintOrder.append(PaintTypeMarkers);
+ break;
+ case PaintOrderFillMarkers:
+ paintOrder.append(PaintTypeFill);
+ paintOrder.append(PaintTypeMarkers);
+ paintOrder.append(PaintTypeStroke);
+ break;
+ case PaintOrderStroke:
+ paintOrder.append(PaintTypeStroke);
+ paintOrder.append(PaintTypeFill);
+ paintOrder.append(PaintTypeMarkers);
+ break;
+ case PaintOrderStrokeMarkers:
+ paintOrder.append(PaintTypeStroke);
+ paintOrder.append(PaintTypeMarkers);
+ paintOrder.append(PaintTypeFill);
+ break;
+ case PaintOrderMarkers:
+ paintOrder.append(PaintTypeMarkers);
+ paintOrder.append(PaintTypeFill);
+ paintOrder.append(PaintTypeStroke);
+ break;
+ case PaintOrderMarkersStroke:
+ paintOrder.append(PaintTypeMarkers);
+ paintOrder.append(PaintTypeStroke);
+ paintOrder.append(PaintTypeFill);
+ break;
+ };
+ return paintOrder;
+}
+
+
</ins><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleRenderStyleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/RenderStyle.h (212561 => 212562)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/RenderStyle.h 2017-02-17 19:13:36 UTC (rev 212561)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.h 2017-02-17 19:34:48 UTC (rev 212562)
</span><span class="lines">@@ -1242,6 +1242,25 @@
</span><span class="cx"> void setApplePayButtonType(ApplePayButtonType type) { SET_VAR(m_rareNonInheritedData, applePayButtonType, static_cast<unsigned>(type)); }
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+ // Support for paint-order, stroke-linecap, and stroke-linejoin from https://drafts.fxtf.org/paint/.
+ void setPaintOrder(PaintOrder order) { SET_VAR(m_rareInheritedData, paintOrder, order); }
+ PaintOrder paintOrder() const { return static_cast<PaintOrder>(m_rareInheritedData->paintOrder); }
+ static PaintOrder initialPaintOrder() { return PaintOrderNormal; }
+ Vector<PaintType, 3> paintTypesForPaintOrder() const;
+
+ void setCapStyle(LineCap val) { SET_VAR(m_rareInheritedData, capStyle, val); }
+ LineCap capStyle() const { return static_cast<LineCap>(m_rareInheritedData->capStyle); }
+ static LineCap initialCapStyle() { return ButtCap; }
+
+ void setJoinStyle(LineJoin val) { SET_VAR(m_rareInheritedData, joinStyle, val); }
+ LineJoin joinStyle() const { return static_cast<LineJoin>(m_rareInheritedData->joinStyle); }
+ static LineJoin initialJoinStyle() { return MiterJoin; }
+
+ const Length& strokeWidth() const { return m_rareInheritedData->strokeWidth; }
+ void setStrokeWidth(Length&& w) { SET_VAR(m_rareInheritedData, strokeWidth, WTFMove(w)); }
+ bool hasVisibleStroke() const { return svgStyle().hasStroke() && !strokeWidth().isZero(); }
+
+
</ins><span class="cx"> const SVGRenderStyle& svgStyle() const { return m_svgStyle; }
</span><span class="cx"> SVGRenderStyle& accessSVGStyle() { return m_svgStyle.access(); }
</span><span class="cx">
</span><span class="lines">@@ -1256,8 +1275,6 @@
</span><span class="cx"> void setStrokePaintColor(const Color& color) { accessSVGStyle().setStrokePaint(SVG_PAINTTYPE_RGBCOLOR, color, emptyString()); }
</span><span class="cx"> float strokeOpacity() const { return svgStyle().strokeOpacity(); }
</span><span class="cx"> void setStrokeOpacity(float f) { accessSVGStyle().setStrokeOpacity(f); }
</span><del>- const Length& strokeWidth() const { return svgStyle().strokeWidth(); }
- void setStrokeWidth(Length&& w) { accessSVGStyle().setStrokeWidth(WTFMove(w)); }
</del><span class="cx"> Vector<SVGLengthValue> strokeDashArray() const { return svgStyle().strokeDashArray(); }
</span><span class="cx"> void setStrokeDashArray(Vector<SVGLengthValue> array) { accessSVGStyle().setStrokeDashArray(array); }
</span><span class="cx"> const Length& strokeDashOffset() const { return svgStyle().strokeDashOffset(); }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleSVGRenderStylecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/SVGRenderStyle.cpp (212561 => 212562)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/SVGRenderStyle.cpp 2017-02-17 19:13:36 UTC (rev 212561)
+++ trunk/Source/WebCore/rendering/style/SVGRenderStyle.cpp 2017-02-17 19:34:48 UTC (rev 212562)
</span><span class="lines">@@ -145,46 +145,6 @@
</span><span class="cx"> m_nonInheritedResourceData = other.m_nonInheritedResourceData;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Vector<PaintType, 3> SVGRenderStyle::paintTypesForPaintOrder() const
-{
- Vector<PaintType, 3> paintOrder;
- switch (this->paintOrder()) {
- case PaintOrderNormal:
- FALLTHROUGH;
- case PaintOrderFill:
- paintOrder.append(PaintTypeFill);
- paintOrder.append(PaintTypeStroke);
- paintOrder.append(PaintTypeMarkers);
- break;
- case PaintOrderFillMarkers:
- paintOrder.append(PaintTypeFill);
- paintOrder.append(PaintTypeMarkers);
- paintOrder.append(PaintTypeStroke);
- break;
- case PaintOrderStroke:
- paintOrder.append(PaintTypeStroke);
- paintOrder.append(PaintTypeFill);
- paintOrder.append(PaintTypeMarkers);
- break;
- case PaintOrderStrokeMarkers:
- paintOrder.append(PaintTypeStroke);
- paintOrder.append(PaintTypeMarkers);
- paintOrder.append(PaintTypeFill);
- break;
- case PaintOrderMarkers:
- paintOrder.append(PaintTypeMarkers);
- paintOrder.append(PaintTypeFill);
- paintOrder.append(PaintTypeStroke);
- break;
- case PaintOrderMarkersStroke:
- paintOrder.append(PaintTypeMarkers);
- paintOrder.append(PaintTypeStroke);
- paintOrder.append(PaintTypeFill);
- break;
- };
- return paintOrder;
-}
-
</del><span class="cx"> StyleDifference SVGRenderStyle::diff(const SVGRenderStyle& other) const
</span><span class="cx"> {
</span><span class="cx"> // NOTE: All comparisions that may return StyleDifferenceLayout have to go before those who return StyleDifferenceRepaint
</span><span class="lines">@@ -215,11 +175,6 @@
</span><span class="cx"> if (miscNotEqual && m_miscData->baselineShiftValue != other.m_miscData->baselineShiftValue)
</span><span class="cx"> return StyleDifferenceLayout;
</span><span class="cx">
</span><del>- // These properties affect the cached stroke bounding box rects.
- if (m_inheritedFlags.capStyle != other.m_inheritedFlags.capStyle
- || m_inheritedFlags.joinStyle != other.m_inheritedFlags.joinStyle)
- return StyleDifferenceLayout;
-
</del><span class="cx"> // Shadow changes require relayouts, as they affect the repaint rects.
</span><span class="cx"> if (m_shadowData != other.m_shadowData)
</span><span class="cx"> return StyleDifferenceLayout;
</span><span class="lines">@@ -230,8 +185,7 @@
</span><span class="cx">
</span><span class="cx"> // Some stroke properties, requires relayouts, as the cached stroke boundaries need to be recalculated.
</span><span class="cx"> if (m_strokeData != other.m_strokeData) {
</span><del>- if (m_strokeData->width != other.m_strokeData->width
- || m_strokeData->paintType != other.m_strokeData->paintType
</del><ins>+ if (m_strokeData->paintType != other.m_strokeData->paintType
</ins><span class="cx"> || m_strokeData->paintColor != other.m_strokeData->paintColor
</span><span class="cx"> || m_strokeData->paintUri != other.m_strokeData->paintUri
</span><span class="cx"> || m_strokeData->miterLimit != other.m_strokeData->miterLimit
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleSVGRenderStyleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/SVGRenderStyle.h (212561 => 212562)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/SVGRenderStyle.h 2017-02-17 19:13:36 UTC (rev 212561)
+++ trunk/Source/WebCore/rendering/style/SVGRenderStyle.h 2017-02-17 19:34:48 UTC (rev 212562)
</span><span class="lines">@@ -53,13 +53,11 @@
</span><span class="cx"> static EBaselineShift initialBaselineShift() { return BS_BASELINE; }
</span><span class="cx"> static EVectorEffect initialVectorEffect() { return VE_NONE; }
</span><span class="cx"> static EBufferedRendering initialBufferedRendering() { return BR_AUTO; }
</span><del>- static LineCap initialCapStyle() { return ButtCap; }
</del><span class="cx"> static WindRule initialClipRule() { return RULE_NONZERO; }
</span><span class="cx"> static EColorInterpolation initialColorInterpolation() { return CI_SRGB; }
</span><span class="cx"> static EColorInterpolation initialColorInterpolationFilters() { return CI_LINEARRGB; }
</span><span class="cx"> static EColorRendering initialColorRendering() { return CR_AUTO; }
</span><span class="cx"> static WindRule initialFillRule() { return RULE_NONZERO; }
</span><del>- static LineJoin initialJoinStyle() { return MiterJoin; }
</del><span class="cx"> static EShapeRendering initialShapeRendering() { return SR_AUTO; }
</span><span class="cx"> static ETextAnchor initialTextAnchor() { return TA_START; }
</span><span class="cx"> static EGlyphOrientation initialGlyphOrientationHorizontal() { return GO_0DEG; }
</span><span class="lines">@@ -86,7 +84,6 @@
</span><span class="cx"> static String initialMarkerMidResource() { return String(); }
</span><span class="cx"> static String initialMarkerEndResource() { return String(); }
</span><span class="cx"> static EMaskType initialMaskType() { return MT_LUMINANCE; }
</span><del>- static PaintOrder initialPaintOrder() { return PaintOrderNormal; }
</del><span class="cx"> static SVGLengthValue initialBaselineShiftValue();
</span><span class="cx"> static SVGLengthValue initialKerning();
</span><span class="cx">
</span><span class="lines">@@ -96,19 +93,16 @@
</span><span class="cx"> void setBaselineShift(EBaselineShift val) { m_nonInheritedFlags.flagBits.baselineShift = val; }
</span><span class="cx"> void setVectorEffect(EVectorEffect val) { m_nonInheritedFlags.flagBits.vectorEffect = val; }
</span><span class="cx"> void setBufferedRendering(EBufferedRendering val) { m_nonInheritedFlags.flagBits.bufferedRendering = val; }
</span><del>- void setCapStyle(LineCap val) { m_inheritedFlags.capStyle = val; }
</del><span class="cx"> void setClipRule(WindRule val) { m_inheritedFlags.clipRule = val; }
</span><span class="cx"> void setColorInterpolation(EColorInterpolation val) { m_inheritedFlags.colorInterpolation = val; }
</span><span class="cx"> void setColorInterpolationFilters(EColorInterpolation val) { m_inheritedFlags.colorInterpolationFilters = val; }
</span><span class="cx"> void setColorRendering(EColorRendering val) { m_inheritedFlags.colorRendering = val; }
</span><span class="cx"> void setFillRule(WindRule val) { m_inheritedFlags.fillRule = val; }
</span><del>- void setJoinStyle(LineJoin val) { m_inheritedFlags.joinStyle = val; }
</del><span class="cx"> void setShapeRendering(EShapeRendering val) { m_inheritedFlags.shapeRendering = val; }
</span><span class="cx"> void setTextAnchor(ETextAnchor val) { m_inheritedFlags.textAnchor = val; }
</span><span class="cx"> void setGlyphOrientationHorizontal(EGlyphOrientation val) { m_inheritedFlags.glyphOrientationHorizontal = val; }
</span><span class="cx"> void setGlyphOrientationVertical(EGlyphOrientation val) { m_inheritedFlags.glyphOrientationVertical = val; }
</span><span class="cx"> void setMaskType(EMaskType val) { m_nonInheritedFlags.flagBits.maskType = val; }
</span><del>- void setPaintOrder(PaintOrder val) { m_inheritedFlags.paintOrder = val; }
</del><span class="cx"> void setCx(const Length&);
</span><span class="cx"> void setCy(const Length&);
</span><span class="cx"> void setR(const Length&);
</span><span class="lines">@@ -123,7 +117,6 @@
</span><span class="cx">
</span><span class="cx"> void setStrokeDashArray(const Vector<SVGLengthValue>&);
</span><span class="cx"> void setStrokeMiterLimit(float);
</span><del>- void setStrokeWidth(const Length&);
</del><span class="cx"> void setStrokeDashOffset(const Length&);
</span><span class="cx"> void setKerning(const SVGLengthValue&);
</span><span class="cx"> void setStopOpacity(float);
</span><span class="lines">@@ -150,13 +143,11 @@
</span><span class="cx"> EBaselineShift baselineShift() const { return (EBaselineShift) m_nonInheritedFlags.flagBits.baselineShift; }
</span><span class="cx"> EVectorEffect vectorEffect() const { return (EVectorEffect) m_nonInheritedFlags.flagBits.vectorEffect; }
</span><span class="cx"> EBufferedRendering bufferedRendering() const { return (EBufferedRendering) m_nonInheritedFlags.flagBits.bufferedRendering; }
</span><del>- LineCap capStyle() const { return (LineCap) m_inheritedFlags.capStyle; }
</del><span class="cx"> WindRule clipRule() const { return (WindRule) m_inheritedFlags.clipRule; }
</span><span class="cx"> EColorInterpolation colorInterpolation() const { return (EColorInterpolation) m_inheritedFlags.colorInterpolation; }
</span><span class="cx"> EColorInterpolation colorInterpolationFilters() const { return (EColorInterpolation) m_inheritedFlags.colorInterpolationFilters; }
</span><span class="cx"> EColorRendering colorRendering() const { return (EColorRendering) m_inheritedFlags.colorRendering; }
</span><span class="cx"> WindRule fillRule() const { return (WindRule) m_inheritedFlags.fillRule; }
</span><del>- LineJoin joinStyle() const { return (LineJoin) m_inheritedFlags.joinStyle; }
</del><span class="cx"> EShapeRendering shapeRendering() const { return (EShapeRendering) m_inheritedFlags.shapeRendering; }
</span><span class="cx"> ETextAnchor textAnchor() const { return (ETextAnchor) m_inheritedFlags.textAnchor; }
</span><span class="cx"> EGlyphOrientation glyphOrientationHorizontal() const { return (EGlyphOrientation) m_inheritedFlags.glyphOrientationHorizontal; }
</span><span class="lines">@@ -171,7 +162,6 @@
</span><span class="cx"> const String& strokePaintUri() const { return m_strokeData->paintUri; }
</span><span class="cx"> Vector<SVGLengthValue> strokeDashArray() const { return m_strokeData->dashArray; }
</span><span class="cx"> float strokeMiterLimit() const { return m_strokeData->miterLimit; }
</span><del>- const Length& strokeWidth() const { return m_strokeData->width; }
</del><span class="cx"> const Length& strokeDashOffset() const { return m_strokeData->dashOffset; }
</span><span class="cx"> SVGLengthValue kerning() const { return m_textData->kerning; }
</span><span class="cx"> float stopOpacity() const { return m_stopData->opacity; }
</span><span class="lines">@@ -194,8 +184,6 @@
</span><span class="cx"> const String& markerMidResource() const { return m_inheritedResourceData->markerMid; }
</span><span class="cx"> const String& markerEndResource() const { return m_inheritedResourceData->markerEnd; }
</span><span class="cx"> EMaskType maskType() const { return (EMaskType) m_nonInheritedFlags.flagBits.maskType; }
</span><del>- PaintOrder paintOrder() const { return (PaintOrder) m_inheritedFlags.paintOrder; }
- Vector<PaintType, 3> paintTypesForPaintOrder() const;
</del><span class="cx">
</span><span class="cx"> const SVGPaintType& visitedLinkFillPaintType() const { return m_fillData->visitedLinkPaintType; }
</span><span class="cx"> const Color& visitedLinkFillPaintColor() const { return m_fillData->visitedLinkPaintColor; }
</span><span class="lines">@@ -209,7 +197,6 @@
</span><span class="cx"> bool hasMasker() const { return !maskerResource().isEmpty(); }
</span><span class="cx"> bool hasMarkers() const { return !markerStartResource().isEmpty() || !markerMidResource().isEmpty() || !markerEndResource().isEmpty(); }
</span><span class="cx"> bool hasStroke() const { return strokePaintType() != SVG_PAINTTYPE_NONE; }
</span><del>- bool hasVisibleStroke() const { return hasStroke() && !strokeWidth().isZero(); }
</del><span class="cx"> bool hasFill() const { return fillPaintType() != SVG_PAINTTYPE_NONE; }
</span><span class="cx"> bool isolatesBlending() const { return hasMasker() || shadow(); }
</span><span class="cx">
</span><span class="lines">@@ -230,14 +217,11 @@
</span><span class="cx"> unsigned shapeRendering : 2; // EShapeRendering
</span><span class="cx"> unsigned clipRule : 1; // WindRule
</span><span class="cx"> unsigned fillRule : 1; // WindRule
</span><del>- unsigned capStyle : 2; // LineCap
- unsigned joinStyle : 2; // LineJoin
</del><span class="cx"> unsigned textAnchor : 2; // ETextAnchor
</span><span class="cx"> unsigned colorInterpolation : 2; // EColorInterpolation
</span><span class="cx"> unsigned colorInterpolationFilters : 2; // EColorInterpolation
</span><span class="cx"> unsigned glyphOrientationHorizontal : 3; // EGlyphOrientation
</span><span class="cx"> unsigned glyphOrientationVertical : 3; // EGlyphOrientation
</span><del>- unsigned paintOrder : 3; // PaintOrder
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> struct NonInheritedFlags {
</span><span class="lines">@@ -396,12 +380,6 @@
</span><span class="cx"> m_strokeData.access().miterLimit = limit;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline void SVGRenderStyle::setStrokeWidth(const Length& width)
-{
- if (!(m_strokeData->width == width))
- m_strokeData.access().width = width;
-}
-
</del><span class="cx"> inline void SVGRenderStyle::setStrokeDashOffset(const Length& offset)
</span><span class="cx"> {
</span><span class="cx"> if (!(m_strokeData->dashOffset == offset))
</span><span class="lines">@@ -487,13 +465,10 @@
</span><span class="cx"> m_inheritedFlags.fillRule = initialFillRule();
</span><span class="cx"> m_inheritedFlags.shapeRendering = initialShapeRendering();
</span><span class="cx"> m_inheritedFlags.textAnchor = initialTextAnchor();
</span><del>- m_inheritedFlags.capStyle = initialCapStyle();
- m_inheritedFlags.joinStyle = initialJoinStyle();
</del><span class="cx"> m_inheritedFlags.colorInterpolation = initialColorInterpolation();
</span><span class="cx"> m_inheritedFlags.colorInterpolationFilters = initialColorInterpolationFilters();
</span><span class="cx"> m_inheritedFlags.glyphOrientationHorizontal = initialGlyphOrientationHorizontal();
</span><span class="cx"> m_inheritedFlags.glyphOrientationVertical = initialGlyphOrientationVertical();
</span><del>- m_inheritedFlags.paintOrder = initialPaintOrder();
</del><span class="cx">
</span><span class="cx"> m_nonInheritedFlags.flags = 0;
</span><span class="cx"> m_nonInheritedFlags.flagBits.alignmentBaseline = initialAlignmentBaseline();
</span><span class="lines">@@ -510,14 +485,11 @@
</span><span class="cx"> && shapeRendering == other.shapeRendering
</span><span class="cx"> && clipRule == other.clipRule
</span><span class="cx"> && fillRule == other.fillRule
</span><del>- && capStyle == other.capStyle
- && joinStyle == other.joinStyle
</del><span class="cx"> && textAnchor == other.textAnchor
</span><span class="cx"> && colorInterpolation == other.colorInterpolation
</span><span class="cx"> && colorInterpolationFilters == other.colorInterpolationFilters
</span><span class="cx"> && glyphOrientationHorizontal == other.glyphOrientationHorizontal
</span><del>- && glyphOrientationVertical == other.glyphOrientationVertical
- && paintOrder == other.paintOrder;
</del><ins>+ && glyphOrientationVertical == other.glyphOrientationVertical;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleSVGRenderStyleDefscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/SVGRenderStyleDefs.cpp (212561 => 212562)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/SVGRenderStyleDefs.cpp 2017-02-17 19:13:36 UTC (rev 212561)
+++ trunk/Source/WebCore/rendering/style/SVGRenderStyleDefs.cpp 2017-02-17 19:34:48 UTC (rev 212562)
</span><span class="lines">@@ -77,7 +77,6 @@
</span><span class="cx"> StyleStrokeData::StyleStrokeData()
</span><span class="cx"> : opacity(SVGRenderStyle::initialStrokeOpacity())
</span><span class="cx"> , miterLimit(SVGRenderStyle::initialStrokeMiterLimit())
</span><del>- , width(RenderStyle::initialOneLength())
</del><span class="cx"> , dashOffset(RenderStyle::initialZeroLength())
</span><span class="cx"> , dashArray(SVGRenderStyle::initialStrokeDashArray())
</span><span class="cx"> , paintType(SVGRenderStyle::initialStrokePaintType())
</span><span class="lines">@@ -93,7 +92,6 @@
</span><span class="cx"> : RefCounted<StyleStrokeData>()
</span><span class="cx"> , opacity(other.opacity)
</span><span class="cx"> , miterLimit(other.miterLimit)
</span><del>- , width(other.width)
</del><span class="cx"> , dashOffset(other.dashOffset)
</span><span class="cx"> , dashArray(other.dashArray)
</span><span class="cx"> , paintType(other.paintType)
</span><span class="lines">@@ -112,8 +110,7 @@
</span><span class="cx">
</span><span class="cx"> bool StyleStrokeData::operator==(const StyleStrokeData& other) const
</span><span class="cx"> {
</span><del>- return width == other.width
- && opacity == other.opacity
</del><ins>+ return opacity == other.opacity
</ins><span class="cx"> && miterLimit == other.miterLimit
</span><span class="cx"> && dashOffset == other.dashOffset
</span><span class="cx"> && dashArray == other.dashArray
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleSVGRenderStyleDefsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/SVGRenderStyleDefs.h (212561 => 212562)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/SVGRenderStyleDefs.h 2017-02-17 19:13:36 UTC (rev 212561)
+++ trunk/Source/WebCore/rendering/style/SVGRenderStyleDefs.h 2017-02-17 19:34:48 UTC (rev 212562)
</span><span class="lines">@@ -156,7 +156,6 @@
</span><span class="cx"> float opacity;
</span><span class="cx"> float miterLimit;
</span><span class="cx">
</span><del>- Length width;
</del><span class="cx"> Length dashOffset;
</span><span class="cx"> Vector<SVGLengthValue> dashArray;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleStyleRareInheritedDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/StyleRareInheritedData.cpp (212561 => 212562)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/StyleRareInheritedData.cpp 2017-02-17 19:13:36 UTC (rev 212561)
+++ trunk/Source/WebCore/rendering/style/StyleRareInheritedData.cpp 2017-02-17 19:34:48 UTC (rev 212562)
</span><span class="lines">@@ -125,6 +125,10 @@
</span><span class="cx"> , trailingWord(static_cast<unsigned>(RenderStyle::initialTrailingWord()))
</span><span class="cx"> #endif
</span><span class="cx"> , hangingPunctuation(RenderStyle::initialHangingPunctuation())
</span><ins>+ , paintOrder(RenderStyle::initialPaintOrder())
+ , capStyle(RenderStyle::initialCapStyle())
+ , joinStyle(RenderStyle::initialJoinStyle())
+ , strokeWidth(RenderStyle::initialOneLength())
</ins><span class="cx"> , hyphenationLimitBefore(-1)
</span><span class="cx"> , hyphenationLimitAfter(-1)
</span><span class="cx"> , hyphenationLimitLines(-1)
</span><span class="lines">@@ -207,6 +211,10 @@
</span><span class="cx"> , trailingWord(o.trailingWord)
</span><span class="cx"> #endif
</span><span class="cx"> , hangingPunctuation(o.hangingPunctuation)
</span><ins>+ , paintOrder(o.paintOrder)
+ , capStyle(o.capStyle)
+ , joinStyle(o.joinStyle)
+ , strokeWidth(o.strokeWidth)
</ins><span class="cx"> , hyphenationString(o.hyphenationString)
</span><span class="cx"> , hyphenationLimitBefore(o.hyphenationLimitBefore)
</span><span class="cx"> , hyphenationLimitAfter(o.hyphenationLimitAfter)
</span><span class="lines">@@ -313,6 +321,10 @@
</span><span class="cx"> && trailingWord == o.trailingWord
</span><span class="cx"> #endif
</span><span class="cx"> && hangingPunctuation == o.hangingPunctuation
</span><ins>+ && paintOrder == o.paintOrder
+ && capStyle == o.capStyle
+ && joinStyle == o.joinStyle
+ && strokeWidth == o.strokeWidth
</ins><span class="cx"> && customProperties == o.customProperties
</span><span class="cx"> && arePointingToEqualData(listStyleImage, o.listStyleImage);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleStyleRareInheritedDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/StyleRareInheritedData.h (212561 => 212562)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/StyleRareInheritedData.h 2017-02-17 19:13:36 UTC (rev 212561)
+++ trunk/Source/WebCore/rendering/style/StyleRareInheritedData.h 2017-02-17 19:34:48 UTC (rev 212562)
</span><span class="lines">@@ -136,6 +136,11 @@
</span><span class="cx">
</span><span class="cx"> unsigned hangingPunctuation : 4;
</span><span class="cx">
</span><ins>+ unsigned paintOrder : 3; // PaintOrder
+ unsigned capStyle : 2; // LineCap
+ unsigned joinStyle : 2; // LineJoin
+ Length strokeWidth;
+
</ins><span class="cx"> AtomicString hyphenationString;
</span><span class="cx"> short hyphenationLimitBefore;
</span><span class="cx"> short hyphenationLimitAfter;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGEllipsecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGEllipse.cpp (212561 => 212562)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGEllipse.cpp 2017-02-17 19:13:36 UTC (rev 212561)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGEllipse.cpp 2017-02-17 19:34:48 UTC (rev 212562)
</span><span class="lines">@@ -103,7 +103,7 @@
</span><span class="cx">
</span><span class="cx"> void RenderSVGEllipse::strokeShape(GraphicsContext& context) const
</span><span class="cx"> {
</span><del>- if (!style().svgStyle().hasVisibleStroke())
</del><ins>+ if (!style().hasVisibleStroke())
</ins><span class="cx"> return;
</span><span class="cx"> if (m_usePathFallback) {
</span><span class="cx"> RenderSVGShape::strokeShape(context);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGPathcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGPath.cpp (212561 => 212562)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGPath.cpp 2017-02-17 19:13:36 UTC (rev 212561)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGPath.cpp 2017-02-17 19:34:48 UTC (rev 212562)
</span><span class="lines">@@ -76,7 +76,7 @@
</span><span class="cx">
</span><span class="cx"> void RenderSVGPath::strokeShape(GraphicsContext& context) const
</span><span class="cx"> {
</span><del>- if (!style().svgStyle().hasVisibleStroke())
</del><ins>+ if (!style().hasVisibleStroke())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> RenderSVGShape::strokeShape(context);
</span><span class="lines">@@ -105,15 +105,14 @@
</span><span class="cx"> if (RenderSVGShape::shapeDependentStrokeContains(point))
</span><span class="cx"> return true;
</span><span class="cx">
</span><del>- const SVGRenderStyle& svgStyle = style().svgStyle();
</del><span class="cx"> for (size_t i = 0; i < m_zeroLengthLinecapLocations.size(); ++i) {
</span><del>- ASSERT(svgStyle.hasStroke());
</del><ins>+ ASSERT(style().svgStyle().hasStroke());
</ins><span class="cx"> float strokeWidth = this->strokeWidth();
</span><del>- if (svgStyle.capStyle() == SquareCap) {
</del><ins>+ if (style().capStyle() == SquareCap) {
</ins><span class="cx"> if (zeroLengthSubpathRect(m_zeroLengthLinecapLocations[i], strokeWidth).contains(point))
</span><span class="cx"> return true;
</span><span class="cx"> } else {
</span><del>- ASSERT(svgStyle.capStyle() == RoundCap);
</del><ins>+ ASSERT(style().capStyle() == RoundCap);
</ins><span class="cx"> FloatPoint radiusVector(point.x() - m_zeroLengthLinecapLocations[i].x(), point.y() - m_zeroLengthLinecapLocations[i].y());
</span><span class="cx"> if (radiusVector.lengthSquared() < strokeWidth * strokeWidth * .25f)
</span><span class="cx"> return true;
</span><span class="lines">@@ -126,7 +125,7 @@
</span><span class="cx"> {
</span><span class="cx"> // Spec(11.4): Any zero length subpath shall not be stroked if the "stroke-linecap" property has a value of butt
</span><span class="cx"> // but shall be stroked if the "stroke-linecap" property has a value of round or square
</span><del>- return style().svgStyle().hasStroke() && style().svgStyle().capStyle() != ButtCap;
</del><ins>+ return style().svgStyle().hasStroke() && style().capStyle() != ButtCap;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Path* RenderSVGPath::zeroLengthLinecapPath(const FloatPoint& linecapPosition) const
</span><span class="lines">@@ -134,7 +133,7 @@
</span><span class="cx"> static NeverDestroyed<Path> tempPath;
</span><span class="cx">
</span><span class="cx"> tempPath.get().clear();
</span><del>- if (style().svgStyle().capStyle() == SquareCap)
</del><ins>+ if (style().capStyle() == SquareCap)
</ins><span class="cx"> tempPath.get().addRect(zeroLengthSubpathRect(linecapPosition, this->strokeWidth()));
</span><span class="cx"> else
</span><span class="cx"> tempPath.get().addEllipse(zeroLengthSubpathRect(linecapPosition, this->strokeWidth()));
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGRectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGRect.cpp (212561 => 212562)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGRect.cpp 2017-02-17 19:13:36 UTC (rev 212561)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGRect.cpp 2017-02-17 19:34:48 UTC (rev 212562)
</span><span class="lines">@@ -120,7 +120,7 @@
</span><span class="cx">
</span><span class="cx"> void RenderSVGRect::strokeShape(GraphicsContext& context) const
</span><span class="cx"> {
</span><del>- if (!style().svgStyle().hasVisibleStroke())
</del><ins>+ if (!style().hasVisibleStroke())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (m_usePathFallback) {
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGShapecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGShape.cpp (212561 => 212562)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGShape.cpp 2017-02-17 19:13:36 UTC (rev 212561)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGShape.cpp 2017-02-17 19:34:48 UTC (rev 212562)
</span><span class="lines">@@ -263,7 +263,7 @@
</span><span class="cx">
</span><span class="cx"> void RenderSVGShape::strokeShape(GraphicsContext& context)
</span><span class="cx"> {
</span><del>- if (!style().svgStyle().hasVisibleStroke())
</del><ins>+ if (!style().hasVisibleStroke())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> GraphicsContextStateSaver stateSaver(context, false);
</span><span class="lines">@@ -277,7 +277,7 @@
</span><span class="cx">
</span><span class="cx"> void RenderSVGShape::fillStrokeMarkers(PaintInfo& childPaintInfo)
</span><span class="cx"> {
</span><del>- auto paintOrder = style().svgStyle().paintTypesForPaintOrder();
</del><ins>+ auto paintOrder = style().paintTypesForPaintOrder();
</ins><span class="cx"> for (unsigned i = 0; i < paintOrder.size(); ++i) {
</span><span class="cx"> switch (paintOrder.at(i)) {
</span><span class="cx"> case PaintTypeFill:
</span><span class="lines">@@ -438,7 +438,7 @@
</span><span class="cx"> float RenderSVGShape::strokeWidth() const
</span><span class="cx"> {
</span><span class="cx"> SVGLengthContext lengthContext(&graphicsElement());
</span><del>- return lengthContext.valueForLength(style().svgStyle().strokeWidth());
</del><ins>+ return lengthContext.valueForLength(style().strokeWidth());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool RenderSVGShape::hasSmoothStroke() const
</span><span class="lines">@@ -446,8 +446,8 @@
</span><span class="cx"> const SVGRenderStyle& svgStyle = style().svgStyle();
</span><span class="cx"> return svgStyle.strokeDashArray().isEmpty()
</span><span class="cx"> && svgStyle.strokeMiterLimit() == svgStyle.initialStrokeMiterLimit()
</span><del>- && svgStyle.joinStyle() == svgStyle.initialJoinStyle()
- && svgStyle.capStyle() == svgStyle.initialCapStyle();
</del><ins>+ && style().joinStyle() == style().initialJoinStyle()
+ && style().capStyle() == style().initialCapStyle();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderSVGShape::drawMarkers(PaintInfo& paintInfo)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGTextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGText.cpp (212561 => 212562)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGText.cpp 2017-02-17 19:13:36 UTC (rev 212561)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGText.cpp 2017-02-17 19:34:48 UTC (rev 212562)
</span><span class="lines">@@ -502,7 +502,7 @@
</span><span class="cx"> return strokeBoundaries;
</span><span class="cx">
</span><span class="cx"> SVGLengthContext lengthContext(&textElement());
</span><del>- strokeBoundaries.inflate(lengthContext.valueForLength(svgStyle.strokeWidth()));
</del><ins>+ strokeBoundaries.inflate(lengthContext.valueForLength(style().strokeWidth()));
</ins><span class="cx"> return strokeBoundaries;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgSVGInlineTextBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/SVGInlineTextBox.cpp (212561 => 212562)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/SVGInlineTextBox.cpp 2017-02-17 19:13:36 UTC (rev 212561)
+++ trunk/Source/WebCore/rendering/svg/SVGInlineTextBox.cpp 2017-02-17 19:34:48 UTC (rev 212562)
</span><span class="lines">@@ -260,7 +260,7 @@
</span><span class="cx"> const SVGRenderStyle& svgStyle = style.svgStyle();
</span><span class="cx">
</span><span class="cx"> bool hasFill = svgStyle.hasFill();
</span><del>- bool hasVisibleStroke = svgStyle.hasVisibleStroke();
</del><ins>+ bool hasVisibleStroke = style.hasVisibleStroke();
</ins><span class="cx">
</span><span class="cx"> const RenderStyle* selectionStyle = &style;
</span><span class="cx"> if (hasSelection && shouldPaintSelectionHighlight) {
</span><span class="lines">@@ -271,7 +271,7 @@
</span><span class="cx"> if (!hasFill)
</span><span class="cx"> hasFill = svgSelectionStyle.hasFill();
</span><span class="cx"> if (!hasVisibleStroke)
</span><del>- hasVisibleStroke = svgSelectionStyle.hasVisibleStroke();
</del><ins>+ hasVisibleStroke = selectionStyle->hasVisibleStroke();
</ins><span class="cx"> } else
</span><span class="cx"> selectionStyle = &style;
</span><span class="cx"> }
</span><span class="lines">@@ -299,7 +299,7 @@
</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.svgStyle().paintTypesForPaintOrder();
</del><ins>+ auto paintOrder = style.paintTypesForPaintOrder();
</ins><span class="cx"> for (unsigned i = 0; i < paintOrder.size(); ++i) {
</span><span class="cx"> switch (paintOrder.at(i)) {
</span><span class="cx"> case PaintTypeFill:
</span><span class="lines">@@ -489,7 +489,7 @@
</span><span class="cx"> const SVGRenderStyle& svgDecorationStyle = decorationStyle.svgStyle();
</span><span class="cx">
</span><span class="cx"> bool hasDecorationFill = svgDecorationStyle.hasFill();
</span><del>- bool hasVisibleDecorationStroke = svgDecorationStyle.hasVisibleStroke();
</del><ins>+ bool hasVisibleDecorationStroke = decorationStyle.hasVisibleStroke();
</ins><span class="cx">
</span><span class="cx"> if (hasDecorationFill) {
</span><span class="cx"> m_paintingResourceMode = ApplyToFillMode;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgSVGRenderSupportcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/SVGRenderSupport.cpp (212561 => 212562)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/SVGRenderSupport.cpp 2017-02-17 19:13:36 UTC (rev 212561)
+++ trunk/Source/WebCore/rendering/svg/SVGRenderSupport.cpp 2017-02-17 19:34:48 UTC (rev 212562)
</span><span class="lines">@@ -427,10 +427,10 @@
</span><span class="cx"> const SVGRenderStyle& svgStyle = style.svgStyle();
</span><span class="cx">
</span><span class="cx"> SVGLengthContext lengthContext(downcast<SVGElement>(renderer.element()));
</span><del>- context->setStrokeThickness(lengthContext.valueForLength(svgStyle.strokeWidth()));
- context->setLineCap(svgStyle.capStyle());
- context->setLineJoin(svgStyle.joinStyle());
- if (svgStyle.joinStyle() == MiterJoin)
</del><ins>+ context->setStrokeThickness(lengthContext.valueForLength(style.strokeWidth()));
+ context->setLineCap(style.capStyle());
+ context->setLineJoin(style.joinStyle());
+ if (style.joinStyle() == MiterJoin)
</ins><span class="cx"> context->setMiterLimit(svgStyle.strokeMiterLimit());
</span><span class="cx">
</span><span class="cx"> const Vector<SVGLengthValue>& dashes = svgStyle.strokeDashArray();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgSVGRenderTreeAsTextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/SVGRenderTreeAsText.cpp (212561 => 212562)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/SVGRenderTreeAsText.cpp 2017-02-17 19:13:36 UTC (rev 212561)
+++ trunk/Source/WebCore/rendering/svg/SVGRenderTreeAsText.cpp 2017-02-17 19:34:48 UTC (rev 212562)
</span><span class="lines">@@ -187,7 +187,7 @@
</span><span class="cx">
</span><span class="cx"> SVGLengthContext lengthContext(&shape.graphicsElement());
</span><span class="cx"> double dashOffset = lengthContext.valueForLength(svgStyle.strokeDashOffset());
</span><del>- double strokeWidth = lengthContext.valueForLength(svgStyle.strokeWidth());
</del><ins>+ double strokeWidth = lengthContext.valueForLength(style.strokeWidth());
</ins><span class="cx"> const auto& dashes = svgStyle.strokeDashArray();
</span><span class="cx">
</span><span class="cx"> DashArray dashArray;
</span><span class="lines">@@ -197,8 +197,8 @@
</span><span class="cx"> writeIfNotDefault(ts, "opacity", svgStyle.strokeOpacity(), 1.0f);
</span><span class="cx"> writeIfNotDefault(ts, "stroke width", strokeWidth, 1.0);
</span><span class="cx"> writeIfNotDefault(ts, "miter limit", svgStyle.strokeMiterLimit(), 4.0f);
</span><del>- writeIfNotDefault(ts, "line cap", svgStyle.capStyle(), ButtCap);
- writeIfNotDefault(ts, "line join", svgStyle.joinStyle(), MiterJoin);
</del><ins>+ writeIfNotDefault(ts, "line cap", style.capStyle(), ButtCap);
+ writeIfNotDefault(ts, "line join", style.joinStyle(), MiterJoin);
</ins><span class="cx"> writeIfNotDefault(ts, "dash offset", dashOffset, 0.0);
</span><span class="cx"> if (!dashArray.isEmpty())
</span><span class="cx"> writeNameValuePair(ts, "dash array", dashArray);
</span></span></pre>
</div>
</div>
</body>
</html>