<!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>[287356] 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/287356">287356</a></dd>
<dt>Author</dt> <dd>ntim@apple.com</dd>
<dt>Date</dt> <dd>2021-12-22 08:57:45 -0800 (Wed, 22 Dec 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>Internally unprefix -webkit-text-emphasis properties
https://bugs.webkit.org/show_bug.cgi?id=234602

Reviewed by Antti Koivisto.

LayoutTests/imported/w3c:

Adjust test expectations.

* web-platform-tests/css/css-cascade/all-prop-initial-xml-expected.txt:
* web-platform-tests/web-animations/animation-model/animation-types/accumulation-per-property-002-expected.txt:
* web-platform-tests/web-animations/animation-model/animation-types/addition-per-property-002-expected.txt:
* web-platform-tests/web-animations/animation-model/animation-types/interpolation-per-property-002-expected.txt:

Source/WebCore:

It's already exposed unprefixed externally, let's reflect this internally as well.

Makes it easier to remove prefixed versions later on if needed, and it's also less confusing when
going through the CSSProperties.json file.

* animation/CSSPropertyAnimation.cpp:
(WebCore::CSSPropertyAnimationWrapperMap::CSSPropertyAnimationWrapperMap):
* css/CSSComputedStyleDeclaration.cpp:
(WebCore::ComputedStyleExtractor::valueForPropertyInStyle):
* css/CSSProperties.json:
* css/CSSValueKeywords.in:
* css/StyleProperties.cpp:
(WebCore::StyleProperties::getPropertyValue const):
* css/parser/CSSPropertyParser.cpp:
(WebCore::CSSPropertyParser::parseSingleValue):
(WebCore::CSSPropertyParser::parseShorthand):
* rendering/RenderElement.cpp:
(WebCore::RenderElement::selectionEmphasisMarkColor const):
* rendering/TextPaintStyle.cpp:
(WebCore::computeTextPaintStyle):
* rendering/style/RenderStyle.cpp:
(WebCore::RenderStyle::unresolvedColorForProperty const):
* style/PropertyAllowlist.cpp:
(WebCore::Style::isValidMarkerStyleProperty):
* style/StyleBuilder.cpp:
(WebCore::Style::isValidVisitedLinkProperty):
* style/StyleBuilderCustom.h:
(WebCore::Style::BuilderCustom::applyInitialTextEmphasisStyle):
(WebCore::Style::BuilderCustom::applyInheritTextEmphasisStyle):
(WebCore::Style::BuilderCustom::applyValueTextEmphasisStyle):
(WebCore::Style::BuilderCustom::applyInitialWebkitTextEmphasisStyle): Deleted.
(WebCore::Style::BuilderCustom::applyInheritWebkitTextEmphasisStyle): Deleted.
(WebCore::Style::BuilderCustom::applyValueWebkitTextEmphasisStyle): Deleted.

LayoutTests:

Adjust test expectations.

* platform/mac/fast/css/getComputedStyle/computed-style-expected.txt:
* platform/mac/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
* platform/mac/svg/css/getComputedStyle-basic-expected.txt:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsimportedw3cChangeLog">trunk/LayoutTests/imported/w3c/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestscsscsscascadeallpropinitialxmlexpectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/all-prop-initial-xml-expected.txt</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestswebanimationsanimationmodelanimationtypesaccumulationperproperty002expectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/web-animations/animation-model/animation-types/accumulation-per-property-002-expected.txt</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestswebanimationsanimationmodelanimationtypesadditionperproperty002expectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/web-animations/animation-model/animation-types/addition-per-property-002-expected.txt</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestswebanimationsanimationmodelanimationtypesinterpolationperproperty002expectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/web-animations/animation-model/animation-types/interpolation-per-property-002-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastcssgetComputedStylecomputedstyleexpectedtxt">trunk/LayoutTests/platform/mac/fast/css/getComputedStyle/computed-style-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastcssgetComputedStylecomputedstylewithoutrendererexpectedtxt">trunk/LayoutTests/platform/mac/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacsvgcssgetComputedStylebasicexpectedtxt">trunk/LayoutTests/platform/mac/svg/css/getComputedStyle-basic-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreanimationCSSPropertyAnimationcpp">trunk/Source/WebCore/animation/CSSPropertyAnimation.cpp</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="#trunkSourceWebCorecssCSSValueKeywordsin">trunk/Source/WebCore/css/CSSValueKeywords.in</a></li>
<li><a href="#trunkSourceWebCorecssStylePropertiescpp">trunk/Source/WebCore/css/StyleProperties.cpp</a></li>
<li><a href="#trunkSourceWebCorecssparserCSSPropertyParsercpp">trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderElementcpp">trunk/Source/WebCore/rendering/RenderElement.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingTextPaintStylecpp">trunk/Source/WebCore/rendering/TextPaintStyle.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleRenderStylecpp">trunk/Source/WebCore/rendering/style/RenderStyle.cpp</a></li>
<li><a href="#trunkSourceWebCorestylePropertyAllowlistcpp">trunk/Source/WebCore/style/PropertyAllowlist.cpp</a></li>
<li><a href="#trunkSourceWebCorestyleStyleBuildercpp">trunk/Source/WebCore/style/StyleBuilder.cpp</a></li>
<li><a href="#trunkSourceWebCorestyleStyleBuilderCustomh">trunk/Source/WebCore/style/StyleBuilderCustom.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (287355 => 287356)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog      2021-12-22 15:27:57 UTC (rev 287355)
+++ trunk/LayoutTests/ChangeLog 2021-12-22 16:57:45 UTC (rev 287356)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2021-12-22  Tim Nguyen  <ntim@apple.com>
+
+        Internally unprefix -webkit-text-emphasis properties
+        https://bugs.webkit.org/show_bug.cgi?id=234602
+
+        Reviewed by Antti Koivisto.
+
+        Adjust test expectations.
+
+        * platform/mac/fast/css/getComputedStyle/computed-style-expected.txt:
+        * platform/mac/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
+        * platform/mac/svg/css/getComputedStyle-basic-expected.txt:
+
</ins><span class="cx"> 2021-12-22  Frédéric Wang  <fwang@igalia.com>
</span><span class="cx"> 
</span><span class="cx">         null ptr deref in DocumentTimeline::animate
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/ChangeLog (287355 => 287356)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/ChangeLog 2021-12-22 15:27:57 UTC (rev 287355)
+++ trunk/LayoutTests/imported/w3c/ChangeLog    2021-12-22 16:57:45 UTC (rev 287356)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2021-12-22  Tim Nguyen  <ntim@apple.com>
+
+        Internally unprefix -webkit-text-emphasis properties
+        https://bugs.webkit.org/show_bug.cgi?id=234602
+
+        Reviewed by Antti Koivisto.
+
+        Adjust test expectations.
+
+        * web-platform-tests/css/css-cascade/all-prop-initial-xml-expected.txt:
+        * web-platform-tests/web-animations/animation-model/animation-types/accumulation-per-property-002-expected.txt:
+        * web-platform-tests/web-animations/animation-model/animation-types/addition-per-property-002-expected.txt:
+        * web-platform-tests/web-animations/animation-model/animation-types/interpolation-per-property-002-expected.txt:
+
</ins><span class="cx"> 2021-12-21  Sergio Villar Senin  <svillar@igalia.com>
</span><span class="cx"> 
</span><span class="cx">         [REGRESSION][[css-flexbox] child elements are shrunk to fit into container after r286206
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestscsscsscascadeallpropinitialxmlexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/all-prop-initial-xml-expected.txt (287355 => 287356)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/all-prop-initial-xml-expected.txt      2021-12-22 15:27:57 UTC (rev 287355)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/all-prop-initial-xml-expected.txt 2021-12-22 16:57:45 UTC (rev 287356)
</span><span class="lines">@@ -287,6 +287,9 @@
</span><span class="cx"> PASS text-decoration-skip-ink
</span><span class="cx"> PASS text-decoration-style
</span><span class="cx"> PASS text-decoration-thickness
</span><ins>+PASS text-emphasis-color
+PASS text-emphasis-position
+PASS text-emphasis-style
</ins><span class="cx"> PASS text-indent
</span><span class="cx"> PASS text-orientation
</span><span class="cx"> PASS text-overflow
</span><span class="lines">@@ -387,9 +390,6 @@
</span><span class="cx"> PASS -webkit-rtl-ordering
</span><span class="cx"> PASS -webkit-ruby-position
</span><span class="cx"> PASS -webkit-text-combine
</span><del>-PASS -webkit-text-emphasis-color
-PASS -webkit-text-emphasis-position
-PASS -webkit-text-emphasis-style
</del><span class="cx"> PASS -webkit-text-fill-color
</span><span class="cx"> PASS -webkit-text-orientation
</span><span class="cx"> PASS -webkit-text-security
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestswebanimationsanimationmodelanimationtypesaccumulationperproperty002expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/web-animations/animation-model/animation-types/accumulation-per-property-002-expected.txt (287355 => 287356)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/web-animations/animation-model/animation-types/accumulation-per-property-002-expected.txt      2021-12-22 15:27:57 UTC (rev 287355)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/web-animations/animation-model/animation-types/accumulation-per-property-002-expected.txt 2021-12-22 16:57:45 UTC (rev 287356)
</span><span class="lines">@@ -152,6 +152,16 @@
</span><span class="cx"> PASS text-decoration-style (type: discrete) has testAccumulation function
</span><span class="cx"> PASS text-decoration-style: "dotted" onto "solid"
</span><span class="cx"> PASS text-decoration-style: "solid" onto "dotted"
</span><ins>+PASS text-emphasis-color (type: color) has testAccumulation function
+FAIL text-emphasis-color supports animating as color of rgb() with overflowed  from and to values assert_equals: The value should be rgb(255, 128, 128) at 0ms expected "rgb(255, 128, 128)" but got "rgb(255, 0, 0)"
+FAIL text-emphasis-color supports animating as color of #RGB assert_equals: The value should be rgb(255, 128, 128) at 0ms expected "rgb(255, 128, 128)" but got "rgb(255, 0, 0)"
+FAIL text-emphasis-color supports animating as color of hsl() assert_equals: The value should be rgb(255, 128, 128) at 0ms expected "rgb(255, 128, 128)" but got "rgb(255, 0, 0)"
+FAIL text-emphasis-color supports animating as color of #RGBa assert_equals: The value should be rgb(230, 128, 128) at 0ms expected "rgb(230, 128, 128)" but got "rgba(255, 0, 0, 0.4)"
+FAIL text-emphasis-color supports animating as color of rgba() assert_equals: The value should be rgb(230, 128, 128) at 0ms expected "rgb(230, 128, 128)" but got "rgba(255, 0, 0, 0.4)"
+FAIL text-emphasis-color supports animating as color of hsla() assert_equals: The value should be rgb(230, 128, 128) at 0ms expected "rgb(230, 128, 128)" but got "rgba(255, 0, 0, 0.4)"
+PASS text-emphasis-position (type: discrete) has testAccumulation function
+PASS text-emphasis-position: "under left" onto "over right"
+PASS text-emphasis-position: "over right" onto "under left"
</ins><span class="cx"> PASS text-overflow (type: discrete) has testAccumulation function
</span><span class="cx"> PASS text-overflow: "ellipsis" onto "clip"
</span><span class="cx"> PASS text-overflow: "clip" onto "ellipsis"
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestswebanimationsanimationmodelanimationtypesadditionperproperty002expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/web-animations/animation-model/animation-types/addition-per-property-002-expected.txt (287355 => 287356)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/web-animations/animation-model/animation-types/addition-per-property-002-expected.txt  2021-12-22 15:27:57 UTC (rev 287355)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/web-animations/animation-model/animation-types/addition-per-property-002-expected.txt     2021-12-22 16:57:45 UTC (rev 287356)
</span><span class="lines">@@ -152,6 +152,16 @@
</span><span class="cx"> PASS text-decoration-style (type: discrete) has testAddition function
</span><span class="cx"> PASS text-decoration-style: "dotted" onto "solid"
</span><span class="cx"> PASS text-decoration-style: "solid" onto "dotted"
</span><ins>+PASS text-emphasis-color (type: color) has testAddition function
+FAIL text-emphasis-color supports animating as color of rgb() with overflowed  from and to values assert_equals: The value should be rgb(255, 128, 128) at 0ms expected "rgb(255, 128, 128)" but got "rgb(255, 0, 0)"
+FAIL text-emphasis-color supports animating as color of #RGB assert_equals: The value should be rgb(255, 128, 128) at 0ms expected "rgb(255, 128, 128)" but got "rgb(255, 0, 0)"
+FAIL text-emphasis-color supports animating as color of hsl() assert_equals: The value should be rgb(255, 128, 128) at 0ms expected "rgb(255, 128, 128)" but got "rgb(255, 0, 0)"
+FAIL text-emphasis-color supports animating as color of #RGBa assert_equals: The value should be rgb(230, 128, 128) at 0ms expected "rgb(230, 128, 128)" but got "rgba(255, 0, 0, 0.4)"
+FAIL text-emphasis-color supports animating as color of rgba() assert_equals: The value should be rgb(230, 128, 128) at 0ms expected "rgb(230, 128, 128)" but got "rgba(255, 0, 0, 0.4)"
+FAIL text-emphasis-color supports animating as color of hsla() assert_equals: The value should be rgb(230, 128, 128) at 0ms expected "rgb(230, 128, 128)" but got "rgba(255, 0, 0, 0.4)"
+PASS text-emphasis-position (type: discrete) has testAddition function
+PASS text-emphasis-position: "under left" onto "over right"
+PASS text-emphasis-position: "over right" onto "under left"
</ins><span class="cx"> PASS text-overflow (type: discrete) has testAddition function
</span><span class="cx"> PASS text-overflow: "ellipsis" onto "clip"
</span><span class="cx"> PASS text-overflow: "clip" onto "ellipsis"
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestswebanimationsanimationmodelanimationtypesinterpolationperproperty002expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/web-animations/animation-model/animation-types/interpolation-per-property-002-expected.txt (287355 => 287356)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/web-animations/animation-model/animation-types/interpolation-per-property-002-expected.txt     2021-12-22 15:27:57 UTC (rev 287355)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/web-animations/animation-model/animation-types/interpolation-per-property-002-expected.txt        2021-12-22 16:57:45 UTC (rev 287356)
</span><span class="lines">@@ -178,6 +178,17 @@
</span><span class="cx"> PASS text-decoration-style uses discrete animation when animating between "solid" and "dotted" with linear easing
</span><span class="cx"> PASS text-decoration-style uses discrete animation when animating between "solid" and "dotted" with effect easing
</span><span class="cx"> PASS text-decoration-style uses discrete animation when animating between "solid" and "dotted" with keyframe easing
</span><ins>+PASS text-emphasis-color (type: color) has testInterpolation function
+FAIL text-emphasis-color supports animating as color of rgb() assert_equals: The value should be rgb(128, 0, 128) at 500ms expected "rgb(128, 0, 128)" but got "rgb(0, 0, 255)"
+FAIL text-emphasis-color supports animating as color of #RGB assert_equals: The value should be rgb(128, 0, 128) at 500ms expected "rgb(128, 0, 128)" but got "rgb(0, 0, 255)"
+FAIL text-emphasis-color supports animating as color of hsl() assert_equals: The value should be rgb(128, 0, 128) at 500ms expected "rgb(128, 0, 128)" but got "rgb(0, 0, 255)"
+FAIL text-emphasis-color supports animating as color of #RGBa assert_equals: The value should be rgba(85, 0, 170, 0.6) at 500ms expected "rgba(85, 0, 170, 0.6)" but got "rgba(0, 0, 255, 0.8)"
+FAIL text-emphasis-color supports animating as color of rgba() assert_equals: The value should be rgba(85, 0, 170, 0.6) at 500ms expected "rgba(85, 0, 170, 0.6)" but got "rgba(0, 0, 255, 0.8)"
+FAIL text-emphasis-color supports animating as color of hsla() assert_equals: The value should be rgba(85, 0, 170, 0.6) at 500ms expected "rgba(85, 0, 170, 0.6)" but got "rgba(0, 0, 255, 0.8)"
+PASS text-emphasis-position (type: discrete) has testInterpolation function
+PASS text-emphasis-position uses discrete animation when animating between "over right" and "under left" with linear easing
+PASS text-emphasis-position uses discrete animation when animating between "over right" and "under left" with effect easing
+PASS text-emphasis-position uses discrete animation when animating between "over right" and "under left" with keyframe easing
</ins><span class="cx"> PASS text-overflow (type: discrete) has testInterpolation function
</span><span class="cx"> PASS text-overflow uses discrete animation when animating between "clip" and "ellipsis" with linear easing
</span><span class="cx"> PASS text-overflow uses discrete animation when animating between "clip" and "ellipsis" with effect easing
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastcssgetComputedStylecomputedstyleexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/fast/css/getComputedStyle/computed-style-expected.txt (287355 => 287356)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/css/getComputedStyle/computed-style-expected.txt     2021-12-22 15:27:57 UTC (rev 287355)
+++ trunk/LayoutTests/platform/mac/fast/css/getComputedStyle/computed-style-expected.txt        2021-12-22 16:57:45 UTC (rev 287356)
</span><span class="lines">@@ -246,9 +246,6 @@
</span><span class="cx"> -webkit-print-color-adjust: economy;
</span><span class="cx"> -webkit-rtl-ordering: logical;
</span><span class="cx"> -webkit-text-combine: none;
</span><del>--webkit-text-emphasis-color: rgb(0, 0, 0);
--webkit-text-emphasis-position: over right;
--webkit-text-emphasis-style: none;
</del><span class="cx"> -webkit-text-fill-color: rgb(0, 0, 0);
</span><span class="cx"> -webkit-text-orientation: mixed;
</span><span class="cx"> -webkit-text-security: none;
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastcssgetComputedStylecomputedstylewithoutrendererexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt (287355 => 287356)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt    2021-12-22 15:27:57 UTC (rev 287355)
+++ trunk/LayoutTests/platform/mac/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt       2021-12-22 16:57:45 UTC (rev 287356)
</span><span class="lines">@@ -245,9 +245,6 @@
</span><span class="cx"> -webkit-print-color-adjust: economy
</span><span class="cx"> -webkit-rtl-ordering: logical
</span><span class="cx"> -webkit-text-combine: none
</span><del>--webkit-text-emphasis-color: rgb(0, 0, 0)
--webkit-text-emphasis-position: over right
--webkit-text-emphasis-style: none
</del><span class="cx"> -webkit-text-fill-color: rgb(0, 0, 0)
</span><span class="cx"> -webkit-text-orientation: mixed
</span><span class="cx"> -webkit-text-security: none
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacsvgcssgetComputedStylebasicexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/svg/css/getComputedStyle-basic-expected.txt (287355 => 287356)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/svg/css/getComputedStyle-basic-expected.txt       2021-12-22 15:27:57 UTC (rev 287355)
+++ trunk/LayoutTests/platform/mac/svg/css/getComputedStyle-basic-expected.txt  2021-12-22 16:57:45 UTC (rev 287356)
</span><span class="lines">@@ -490,12 +490,6 @@
</span><span class="cx"> rect: style.getPropertyCSSValue(-webkit-rtl-ordering) : [object CSSPrimitiveValue]
</span><span class="cx"> rect: style.getPropertyValue(-webkit-text-combine) : none
</span><span class="cx"> rect: style.getPropertyCSSValue(-webkit-text-combine) : [object CSSPrimitiveValue]
</span><del>-rect: style.getPropertyValue(-webkit-text-emphasis-color) : rgb(0, 0, 0)
-rect: style.getPropertyCSSValue(-webkit-text-emphasis-color) : [object CSSPrimitiveValue]
-rect: style.getPropertyValue(-webkit-text-emphasis-position) : over right
-rect: style.getPropertyCSSValue(-webkit-text-emphasis-position) : [object CSSValueList]
-rect: style.getPropertyValue(-webkit-text-emphasis-style) : none
-rect: style.getPropertyCSSValue(-webkit-text-emphasis-style) : [object CSSPrimitiveValue]
</del><span class="cx"> rect: style.getPropertyValue(-webkit-text-fill-color) : rgb(0, 0, 0)
</span><span class="cx"> rect: style.getPropertyCSSValue(-webkit-text-fill-color) : [object CSSPrimitiveValue]
</span><span class="cx"> rect: style.getPropertyValue(-webkit-text-orientation) : mixed
</span><span class="lines">@@ -1006,12 +1000,6 @@
</span><span class="cx"> g: style.getPropertyCSSValue(-webkit-rtl-ordering) : [object CSSPrimitiveValue]
</span><span class="cx"> g: style.getPropertyValue(-webkit-text-combine) : none
</span><span class="cx"> g: style.getPropertyCSSValue(-webkit-text-combine) : [object CSSPrimitiveValue]
</span><del>-g: style.getPropertyValue(-webkit-text-emphasis-color) : rgb(0, 0, 0)
-g: style.getPropertyCSSValue(-webkit-text-emphasis-color) : [object CSSPrimitiveValue]
-g: style.getPropertyValue(-webkit-text-emphasis-position) : over right
-g: style.getPropertyCSSValue(-webkit-text-emphasis-position) : [object CSSValueList]
-g: style.getPropertyValue(-webkit-text-emphasis-style) : none
-g: style.getPropertyCSSValue(-webkit-text-emphasis-style) : [object CSSPrimitiveValue]
</del><span class="cx"> g: style.getPropertyValue(-webkit-text-fill-color) : rgb(0, 0, 0)
</span><span class="cx"> g: style.getPropertyCSSValue(-webkit-text-fill-color) : [object CSSPrimitiveValue]
</span><span class="cx"> g: style.getPropertyValue(-webkit-text-orientation) : mixed
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (287355 => 287356)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2021-12-22 15:27:57 UTC (rev 287355)
+++ trunk/Source/WebCore/ChangeLog      2021-12-22 16:57:45 UTC (rev 287356)
</span><span class="lines">@@ -1,3 +1,44 @@
</span><ins>+2021-12-22  Tim Nguyen  <ntim@apple.com>
+
+        Internally unprefix -webkit-text-emphasis properties
+        https://bugs.webkit.org/show_bug.cgi?id=234602
+
+        Reviewed by Antti Koivisto.
+
+        It's already exposed unprefixed externally, let's reflect this internally as well.
+
+        Makes it easier to remove prefixed versions later on if needed, and it's also less confusing when
+        going through the CSSProperties.json file.
+
+        * animation/CSSPropertyAnimation.cpp:
+        (WebCore::CSSPropertyAnimationWrapperMap::CSSPropertyAnimationWrapperMap):
+        * css/CSSComputedStyleDeclaration.cpp:
+        (WebCore::ComputedStyleExtractor::valueForPropertyInStyle):
+        * css/CSSProperties.json:
+        * css/CSSValueKeywords.in:
+        * css/StyleProperties.cpp:
+        (WebCore::StyleProperties::getPropertyValue const):
+        * css/parser/CSSPropertyParser.cpp:
+        (WebCore::CSSPropertyParser::parseSingleValue):
+        (WebCore::CSSPropertyParser::parseShorthand):
+        * rendering/RenderElement.cpp:
+        (WebCore::RenderElement::selectionEmphasisMarkColor const):
+        * rendering/TextPaintStyle.cpp:
+        (WebCore::computeTextPaintStyle):
+        * rendering/style/RenderStyle.cpp:
+        (WebCore::RenderStyle::unresolvedColorForProperty const):
+        * style/PropertyAllowlist.cpp:
+        (WebCore::Style::isValidMarkerStyleProperty):
+        * style/StyleBuilder.cpp:
+        (WebCore::Style::isValidVisitedLinkProperty):
+        * style/StyleBuilderCustom.h:
+        (WebCore::Style::BuilderCustom::applyInitialTextEmphasisStyle):
+        (WebCore::Style::BuilderCustom::applyInheritTextEmphasisStyle):
+        (WebCore::Style::BuilderCustom::applyValueTextEmphasisStyle):
+        (WebCore::Style::BuilderCustom::applyInitialWebkitTextEmphasisStyle): Deleted.
+        (WebCore::Style::BuilderCustom::applyInheritWebkitTextEmphasisStyle): Deleted.
+        (WebCore::Style::BuilderCustom::applyValueWebkitTextEmphasisStyle): Deleted.
+
</ins><span class="cx"> 2021-12-21  Sergio Villar Senin  <svillar@igalia.com>
</span><span class="cx"> 
</span><span class="cx">         [REGRESSION][[css-flexbox] child elements are shrunk to fit into container after r286206
</span></span></pre></div>
<a id="trunkSourceWebCoreanimationCSSPropertyAnimationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/animation/CSSPropertyAnimation.cpp (287355 => 287356)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/animation/CSSPropertyAnimation.cpp  2021-12-22 15:27:57 UTC (rev 287355)
+++ trunk/Source/WebCore/animation/CSSPropertyAnimation.cpp     2021-12-22 16:57:45 UTC (rev 287356)
</span><span class="lines">@@ -2764,8 +2764,8 @@
</span><span class="cx">         new DiscretePropertyWrapper<TextAlignMode>(CSSPropertyTextAlign, &RenderStyle::textAlign, &RenderStyle::setTextAlign),
</span><span class="cx">         new DiscretePropertyWrapper<OptionSet<TextDecorationLine>>(CSSPropertyTextDecorationLine, &RenderStyle::textDecoration, &RenderStyle::setTextDecoration),
</span><span class="cx">         new DiscretePropertyWrapper<TextDecorationStyle>(CSSPropertyTextDecorationStyle, &RenderStyle::textDecorationStyle, &RenderStyle::setTextDecorationStyle),
</span><del>-        new DiscretePropertyWrapper<const Color&>(CSSPropertyWebkitTextEmphasisColor, &RenderStyle::textEmphasisColor, &RenderStyle::setTextEmphasisColor),
-        new DiscretePropertyWrapper<OptionSet<TextEmphasisPosition>>(CSSPropertyWebkitTextEmphasisPosition, &RenderStyle::textEmphasisPosition, &RenderStyle::setTextEmphasisPosition),
</del><ins>+        new DiscretePropertyWrapper<const Color&>(CSSPropertyTextEmphasisColor, &RenderStyle::textEmphasisColor, &RenderStyle::setTextEmphasisColor),
+        new DiscretePropertyWrapper<OptionSet<TextEmphasisPosition>>(CSSPropertyTextEmphasisPosition, &RenderStyle::textEmphasisPosition, &RenderStyle::setTextEmphasisPosition),
</ins><span class="cx">         new DiscretePropertyWrapper<TextOverflow>(CSSPropertyTextOverflow, &RenderStyle::textOverflow, &RenderStyle::setTextOverflow),
</span><span class="cx">         new DiscretePropertyWrapper<OptionSet<TouchAction>>(CSSPropertyTouchAction, &RenderStyle::touchActions, &RenderStyle::setTouchActions),
</span><span class="cx">         new DiscretePropertyWrapper<TextTransform>(CSSPropertyTextTransform, &RenderStyle::textTransform, &RenderStyle::setTextTransform),
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSComputedStyleDeclarationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp (287355 => 287356)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2021-12-22 15:27:57 UTC (rev 287355)
+++ trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp    2021-12-22 16:57:45 UTC (rev 287356)
</span><span class="lines">@@ -3359,11 +3359,11 @@
</span><span class="cx">             return renderTextDecorationLineFlagsToCSSValue(style.textDecorationsInEffect());
</span><span class="cx">         case CSSPropertyWebkitTextFillColor:
</span><span class="cx">             return currentColorOrValidColor(&style, style.textFillColor());
</span><del>-        case CSSPropertyWebkitTextEmphasisColor:
</del><ins>+        case CSSPropertyTextEmphasisColor:
</ins><span class="cx">             return currentColorOrValidColor(&style, style.textEmphasisColor());
</span><del>-        case CSSPropertyWebkitTextEmphasisPosition:
</del><ins>+        case CSSPropertyTextEmphasisPosition:
</ins><span class="cx">             return renderEmphasisPositionFlagsToCSSValue(style.textEmphasisPosition());
</span><del>-        case CSSPropertyWebkitTextEmphasisStyle:
</del><ins>+        case CSSPropertyTextEmphasisStyle:
</ins><span class="cx">             switch (style.textEmphasisMark()) {
</span><span class="cx">             case TextEmphasisMark::None:
</span><span class="cx">                 return cssValuePool.createIdentifierValue(CSSValueNone);
</span><span class="lines">@@ -4088,7 +4088,7 @@
</span><span class="cx">         /* Unimplemented CSS 3 properties (including CSS3 shorthand properties) */
</span><span class="cx">         case CSSPropertyAll:
</span><span class="cx">         case CSSPropertyAnimation:
</span><del>-        case CSSPropertyWebkitTextEmphasis:
</del><ins>+        case CSSPropertyTextEmphasis:
</ins><span class="cx">             break;
</span><span class="cx"> 
</span><span class="cx">         /* Directional properties are resolved by resolveDirectionAwareProperty() before the switch. */
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSPropertiesjson"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSProperties.json (287355 => 287356)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSProperties.json      2021-12-22 15:27:57 UTC (rev 287355)
+++ trunk/Source/WebCore/css/CSSProperties.json 2021-12-22 16:57:45 UTC (rev 287356)
</span><span class="lines">@@ -6910,16 +6910,16 @@
</span><span class="cx">             },
</span><span class="cx">             "status": "non-standard"
</span><span class="cx">         },
</span><del>-        "-webkit-text-emphasis": {
</del><ins>+        "text-emphasis": {
</ins><span class="cx">             "inherited": true,
</span><span class="cx">             "codegen-properties": {
</span><span class="cx">                 "aliases": [
</span><span class="cx">                     "-epub-text-emphasis",
</span><del>-                    "text-emphasis"
</del><ins>+                    "-webkit-text-emphasis"
</ins><span class="cx">                 ],
</span><span class="cx">                 "longhands": [
</span><del>-                    "-webkit-text-emphasis-style",
-                    "-webkit-text-emphasis-color"
</del><ins>+                    "text-emphasis-style",
+                    "text-emphasis-color"
</ins><span class="cx">                 ]
</span><span class="cx">             },
</span><span class="cx">             "status": {
</span><span class="lines">@@ -6930,12 +6930,12 @@
</span><span class="cx">                 "url": "https://www.w3.org/TR/css-text-decor-3/#text-emphasis"
</span><span class="cx">             }
</span><span class="cx">         },
</span><del>-        "-webkit-text-emphasis-color": {
</del><ins>+        "text-emphasis-color": {
</ins><span class="cx">             "inherited": true,
</span><span class="cx">             "codegen-properties": {
</span><span class="cx">                 "aliases": [
</span><span class="cx">                     "-epub-text-emphasis-color",
</span><del>-                    "text-emphasis-color"
</del><ins>+                    "-webkit-text-emphasis-color"
</ins><span class="cx">                 ],
</span><span class="cx">                 "initial": "currentColor",
</span><span class="cx">                 "visited-link-color-support": true,
</span><span class="lines">@@ -6949,11 +6949,11 @@
</span><span class="cx">                 "url": "https://www.w3.org/TR/css-text-decor-3/#text-emphasis-color"
</span><span class="cx">             }
</span><span class="cx">         },
</span><del>-        "-webkit-text-emphasis-position": {
</del><ins>+        "text-emphasis-position": {
</ins><span class="cx">             "inherited": true,
</span><span class="cx">             "codegen-properties": {
</span><span class="cx">                 "aliases": [
</span><del>-                    "text-emphasis-position"
</del><ins>+                    "-webkit-text-emphasis-position"
</ins><span class="cx">                 ],
</span><span class="cx">                 "converter": "TextEmphasisPosition"
</span><span class="cx">             },
</span><span class="lines">@@ -6965,12 +6965,12 @@
</span><span class="cx">                 "url": "https://www.w3.org/TR/css-text-decor-3/#text-emphasis-position"
</span><span class="cx">             }
</span><span class="cx">         },
</span><del>-        "-webkit-text-emphasis-style": {
</del><ins>+        "text-emphasis-style": {
</ins><span class="cx">             "inherited": true,
</span><span class="cx">             "codegen-properties": {
</span><span class="cx">                 "aliases": [
</span><span class="cx">                     "-epub-text-emphasis-style",
</span><del>-                    "text-emphasis-style"
</del><ins>+                    "-webkit-text-emphasis-style"
</ins><span class="cx">                 ],
</span><span class="cx">                 "custom": "All"
</span><span class="cx">             },
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSValueKeywordsin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSValueKeywords.in (287355 => 287356)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSValueKeywords.in     2021-12-22 15:27:57 UTC (rev 287355)
+++ trunk/Source/WebCore/css/CSSValueKeywords.in        2021-12-22 16:57:45 UTC (rev 287356)
</span><span class="lines">@@ -1114,11 +1114,11 @@
</span><span class="cx"> before
</span><span class="cx"> inter-character
</span><span class="cx"> 
</span><del>-// -webkit-text-emphasis-position
</del><ins>+// text-emphasis-position
</ins><span class="cx"> over
</span><span class="cx"> under
</span><span class="cx"> 
</span><del>-// -webkit-text-emphasis-style
</del><ins>+// text-emphasis-style
</ins><span class="cx"> filled
</span><span class="cx"> open
</span><span class="cx"> dot
</span></span></pre></div>
<a id="trunkSourceWebCorecssStylePropertiescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleProperties.cpp (287355 => 287356)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleProperties.cpp     2021-12-22 15:27:57 UTC (rev 287355)
+++ trunk/Source/WebCore/css/StyleProperties.cpp        2021-12-22 16:57:45 UTC (rev 287356)
</span><span class="lines">@@ -310,8 +310,8 @@
</span><span class="cx">     case CSSPropertyMask:
</span><span class="cx">     case CSSPropertyWebkitMask:
</span><span class="cx">         return getLayeredShorthandValue(shorthandForProperty(propertyID));
</span><del>-    case CSSPropertyWebkitTextEmphasis:
-        return getShorthandValue(webkitTextEmphasisShorthand());
</del><ins>+    case CSSPropertyTextEmphasis:
+        return getShorthandValue(textEmphasisShorthand());
</ins><span class="cx">     case CSSPropertyWebkitTextStroke:
</span><span class="cx">         return getShorthandValue(webkitTextStrokeShorthand());
</span><span class="cx">     case CSSPropertyPerspectiveOrigin:
</span></span></pre></div>
<a id="trunkSourceWebCorecssparserCSSPropertyParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp (287355 => 287356)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp    2021-12-22 15:27:57 UTC (rev 287355)
+++ trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp       2021-12-22 16:57:45 UTC (rev 287356)
</span><span class="lines">@@ -4344,7 +4344,7 @@
</span><span class="cx"> #if ENABLE(TOUCH_EVENTS)
</span><span class="cx">     case CSSPropertyWebkitTapHighlightColor:
</span><span class="cx"> #endif
</span><del>-    case CSSPropertyWebkitTextEmphasisColor:
</del><ins>+    case CSSPropertyTextEmphasisColor:
</ins><span class="cx">     case CSSPropertyBorderInlineStartColor:
</span><span class="cx">     case CSSPropertyBorderInlineEndColor:
</span><span class="cx">     case CSSPropertyBorderBlockStartColor:
</span><span class="lines">@@ -4407,7 +4407,7 @@
</span><span class="cx">     case CSSPropertyWebkitTextDecorationsInEffect:
</span><span class="cx">     case CSSPropertyTextDecorationLine:
</span><span class="cx">         return consumeTextDecorationLine(m_range);
</span><del>-    case CSSPropertyWebkitTextEmphasisStyle:
</del><ins>+    case CSSPropertyTextEmphasisStyle:
</ins><span class="cx">         return consumeTextEmphasisStyle(m_range);
</span><span class="cx">     case CSSPropertyOutlineColor:
</span><span class="cx">         return consumeOutlineColor(m_range, m_context.mode);
</span><span class="lines">@@ -4633,7 +4633,7 @@
</span><span class="cx">         if (!m_context.containmentEnabled)
</span><span class="cx">             return nullptr;
</span><span class="cx">         return consumeContain(m_range);
</span><del>-    case CSSPropertyWebkitTextEmphasisPosition:
</del><ins>+    case CSSPropertyTextEmphasisPosition:
</ins><span class="cx">         return consumeTextEmphasisPosition(m_range);
</span><span class="cx"> #if ENABLE(DARK_MODE_CSS)
</span><span class="cx">     case CSSPropertyColorScheme:
</span><span class="lines">@@ -6183,8 +6183,8 @@
</span><span class="cx">         return consume2ValueShorthand(scrollPaddingBlockShorthand(), important);
</span><span class="cx">     case CSSPropertyScrollPaddingInline:
</span><span class="cx">         return consume2ValueShorthand(scrollPaddingInlineShorthand(), important);
</span><del>-    case CSSPropertyWebkitTextEmphasis:
-        return consumeShorthandGreedily(webkitTextEmphasisShorthand(), important);
</del><ins>+    case CSSPropertyTextEmphasis:
+        return consumeShorthandGreedily(textEmphasisShorthand(), important);
</ins><span class="cx">     case CSSPropertyOutline:
</span><span class="cx">         return consumeShorthandGreedily(outlineShorthand(), important);
</span><span class="cx">     case CSSPropertyBorderInline: {
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderElement.cpp (287355 => 287356)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderElement.cpp 2021-12-22 15:27:57 UTC (rev 287355)
+++ trunk/Source/WebCore/rendering/RenderElement.cpp    2021-12-22 16:57:45 UTC (rev 287356)
</span><span class="lines">@@ -1590,7 +1590,7 @@
</span><span class="cx"> 
</span><span class="cx"> Color RenderElement::selectionEmphasisMarkColor() const
</span><span class="cx"> {
</span><del>-    return selectionColor(CSSPropertyWebkitTextEmphasisColor);
</del><ins>+    return selectionColor(CSSPropertyTextEmphasisColor);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> Color RenderElement::selectionBackgroundColor() const
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingTextPaintStylecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/TextPaintStyle.cpp (287355 => 287356)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/TextPaintStyle.cpp        2021-12-22 15:27:57 UTC (rev 287355)
+++ trunk/Source/WebCore/rendering/TextPaintStyle.cpp   2021-12-22 16:57:45 UTC (rev 287356)
</span><span class="lines">@@ -126,7 +126,7 @@
</span><span class="cx">     if (forceBackgroundToWhite)
</span><span class="cx">         paintStyle.strokeColor = adjustColorForVisibilityOnBackground(paintStyle.strokeColor, Color::white);
</span><span class="cx"> 
</span><del>-    paintStyle.emphasisMarkColor = lineStyle.visitedDependentColorWithColorFilter(CSSPropertyWebkitTextEmphasisColor);
</del><ins>+    paintStyle.emphasisMarkColor = lineStyle.visitedDependentColorWithColorFilter(CSSPropertyTextEmphasisColor);
</ins><span class="cx"> 
</span><span class="cx">     // Make the text stroke color legible against a white background
</span><span class="cx">     if (forceBackgroundToWhite)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleRenderStylecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/RenderStyle.cpp (287355 => 287356)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/RenderStyle.cpp     2021-12-22 15:27:57 UTC (rev 287355)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.cpp        2021-12-22 16:57:45 UTC (rev 287356)
</span><span class="lines">@@ -2147,7 +2147,7 @@
</span><span class="cx">         return unresolvedColorForProperty(CSSProperty::resolveDirectionAwareProperty(colorProperty, direction(), writingMode()));
</span><span class="cx">     case CSSPropertyColumnRuleColor:
</span><span class="cx">         return visitedLink ? visitedLinkColumnRuleColor() : columnRuleColor();
</span><del>-    case CSSPropertyWebkitTextEmphasisColor:
</del><ins>+    case CSSPropertyTextEmphasisColor:
</ins><span class="cx">         return visitedLink ? visitedLinkTextEmphasisColor() : textEmphasisColor();
</span><span class="cx">     case CSSPropertyWebkitTextFillColor:
</span><span class="cx">         return visitedLink ? visitedLinkTextFillColor() : textFillColor();
</span></span></pre></div>
<a id="trunkSourceWebCorestylePropertyAllowlistcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/style/PropertyAllowlist.cpp (287355 => 287356)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/style/PropertyAllowlist.cpp 2021-12-22 15:27:57 UTC (rev 287355)
+++ trunk/Source/WebCore/style/PropertyAllowlist.cpp    2021-12-22 16:57:45 UTC (rev 287356)
</span><span class="lines">@@ -70,10 +70,10 @@
</span><span class="cx">     case CSSPropertyOverflowWrap:
</span><span class="cx">     case CSSPropertyTabSize:
</span><span class="cx">     case CSSPropertyTextDecorationSkipInk:
</span><del>-    case CSSPropertyWebkitTextEmphasis:
-    case CSSPropertyWebkitTextEmphasisColor:
-    case CSSPropertyWebkitTextEmphasisPosition:
-    case CSSPropertyWebkitTextEmphasisStyle:
</del><ins>+    case CSSPropertyTextEmphasis:
+    case CSSPropertyTextEmphasisColor:
+    case CSSPropertyTextEmphasisPosition:
+    case CSSPropertyTextEmphasisStyle:
</ins><span class="cx">     case CSSPropertyTextShadow:
</span><span class="cx">     case CSSPropertyTextTransform:
</span><span class="cx">     case CSSPropertyUnicodeBidi:
</span></span></pre></div>
<a id="trunkSourceWebCorestyleStyleBuildercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/style/StyleBuilder.cpp (287355 => 287356)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/style/StyleBuilder.cpp      2021-12-22 15:27:57 UTC (rev 287355)
+++ trunk/Source/WebCore/style/StyleBuilder.cpp 2021-12-22 16:57:45 UTC (rev 287356)
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx">     case CSSPropertyOutlineColor:
</span><span class="cx">     case CSSPropertyColumnRuleColor:
</span><span class="cx">     case CSSPropertyTextDecorationColor:
</span><del>-    case CSSPropertyWebkitTextEmphasisColor:
</del><ins>+    case CSSPropertyTextEmphasisColor:
</ins><span class="cx">     case CSSPropertyWebkitTextFillColor:
</span><span class="cx">     case CSSPropertyWebkitTextStrokeColor:
</span><span class="cx">     case CSSPropertyFill:
</span></span></pre></div>
<a id="trunkSourceWebCorestyleStyleBuilderCustomh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/style/StyleBuilderCustom.h (287355 => 287356)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/style/StyleBuilderCustom.h  2021-12-22 15:27:57 UTC (rev 287355)
+++ trunk/Source/WebCore/style/StyleBuilderCustom.h     2021-12-22 16:57:45 UTC (rev 287356)
</span><span class="lines">@@ -112,7 +112,7 @@
</span><span class="cx">     DECLARE_PROPERTY_CUSTOM_HANDLERS(WebkitMaskBoxImageRepeat);
</span><span class="cx">     DECLARE_PROPERTY_CUSTOM_HANDLERS(WebkitMaskBoxImageSlice);
</span><span class="cx">     DECLARE_PROPERTY_CUSTOM_HANDLERS(WebkitMaskBoxImageWidth);
</span><del>-    DECLARE_PROPERTY_CUSTOM_HANDLERS(WebkitTextEmphasisStyle);
</del><ins>+    DECLARE_PROPERTY_CUSTOM_HANDLERS(TextEmphasisStyle);
</ins><span class="cx">     DECLARE_PROPERTY_CUSTOM_HANDLERS(Zoom);
</span><span class="cx"> 
</span><span class="cx">     // Custom handling of initial + inherit value setting only.
</span><span class="lines">@@ -1187,7 +1187,7 @@
</span><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-inline void BuilderCustom::applyInitialWebkitTextEmphasisStyle(BuilderState& builderState)
</del><ins>+inline void BuilderCustom::applyInitialTextEmphasisStyle(BuilderState& builderState)
</ins><span class="cx"> {
</span><span class="cx">     builderState.style().setTextEmphasisFill(RenderStyle::initialTextEmphasisFill());
</span><span class="cx">     builderState.style().setTextEmphasisMark(RenderStyle::initialTextEmphasisMark());
</span><span class="lines">@@ -1194,7 +1194,7 @@
</span><span class="cx">     builderState.style().setTextEmphasisCustomMark(RenderStyle::initialTextEmphasisCustomMark());
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-inline void BuilderCustom::applyInheritWebkitTextEmphasisStyle(BuilderState& builderState)
</del><ins>+inline void BuilderCustom::applyInheritTextEmphasisStyle(BuilderState& builderState)
</ins><span class="cx"> {
</span><span class="cx">     builderState.style().setTextEmphasisFill(builderState.parentStyle().textEmphasisFill());
</span><span class="cx">     builderState.style().setTextEmphasisMark(builderState.parentStyle().textEmphasisMark());
</span><span class="lines">@@ -1287,7 +1287,7 @@
</span><span class="cx">     return builderState.style().setContain(containment);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-inline void BuilderCustom::applyValueWebkitTextEmphasisStyle(BuilderState& builderState, CSSValue& value)
</del><ins>+inline void BuilderCustom::applyValueTextEmphasisStyle(BuilderState& builderState, CSSValue& value)
</ins><span class="cx"> {
</span><span class="cx">     if (is<CSSValueList>(value)) {
</span><span class="cx">         auto& list = downcast<CSSValueList>(value);
</span></span></pre>
</div>
</div>

</body>
</html>