<!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>[287430] 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/287430">287430</a></dd>
<dt>Author</dt> <dd>ntim@apple.com</dd>
<dt>Date</dt> <dd>2021-12-24 12:20:17 -0800 (Fri, 24 Dec 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>Unreviewed, <a href="http://trac.webkit.org/projects/webkit/changeset/287356">r287356</a> followups and rebaselining for glib

Source/WebCore:

* css/html.css:
(rt): unprefix usage of -webkit-text-emphasis
* style/StyleBuilderCustom.h:
Sort per Darin Adler's comment

LayoutTests:

* platform/glib/fast/css/getComputedStyle/computed-style-expected.txt:
* platform/glib/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
* platform/glib/svg/css/getComputedStyle-basic-expected.txt:
* platform/ios/imported/w3c/web-platform-tests/css/css-cascade/all-prop-initial-xml-expected.txt:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformglibfastcssgetComputedStylecomputedstyleexpectedtxt">trunk/LayoutTests/platform/glib/fast/css/getComputedStyle/computed-style-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformglibfastcssgetComputedStylecomputedstylewithoutrendererexpectedtxt">trunk/LayoutTests/platform/glib/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformglibsvgcssgetComputedStylebasicexpectedtxt">trunk/LayoutTests/platform/glib/svg/css/getComputedStyle-basic-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformiosimportedw3cwebplatformtestscsscsscascadeallpropinitialxmlexpectedtxt">trunk/LayoutTests/platform/ios/imported/w3c/web-platform-tests/css/css-cascade/all-prop-initial-xml-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecsshtmlcss">trunk/Source/WebCore/css/html.css</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 (287429 => 287430)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog      2021-12-24 18:55:35 UTC (rev 287429)
+++ trunk/LayoutTests/ChangeLog 2021-12-24 20:20:17 UTC (rev 287430)
</span><span class="lines">@@ -1,5 +1,14 @@
</span><span class="cx"> 2021-12-24  Tim Nguyen  <ntim@apple.com>
</span><span class="cx"> 
</span><ins>+        Unreviewed, r287356 followups and rebaselining for glib
+
+        * platform/glib/fast/css/getComputedStyle/computed-style-expected.txt:
+        * platform/glib/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
+        * platform/glib/svg/css/getComputedStyle-basic-expected.txt:
+        * platform/ios/imported/w3c/web-platform-tests/css/css-cascade/all-prop-initial-xml-expected.txt:
+
+2021-12-24  Tim Nguyen  <ntim@apple.com>
+
</ins><span class="cx">         Remove non-standard -webkit-margin-collapse CSS property and longhands
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=190788
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkLayoutTestsplatformglibfastcssgetComputedStylecomputedstyleexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/glib/fast/css/getComputedStyle/computed-style-expected.txt (287429 => 287430)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/glib/fast/css/getComputedStyle/computed-style-expected.txt    2021-12-24 18:55:35 UTC (rev 287429)
+++ trunk/LayoutTests/platform/glib/fast/css/getComputedStyle/computed-style-expected.txt       2021-12-24 20:20:17 UTC (rev 287430)
</span><span class="lines">@@ -244,9 +244,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="trunkLayoutTestsplatformglibfastcssgetComputedStylecomputedstylewithoutrendererexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/glib/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt (287429 => 287430)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/glib/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt   2021-12-24 18:55:35 UTC (rev 287429)
+++ trunk/LayoutTests/platform/glib/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt      2021-12-24 20:20:17 UTC (rev 287430)
</span><span class="lines">@@ -243,9 +243,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="trunkLayoutTestsplatformglibsvgcssgetComputedStylebasicexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/glib/svg/css/getComputedStyle-basic-expected.txt (287429 => 287430)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/glib/svg/css/getComputedStyle-basic-expected.txt      2021-12-24 18:55:35 UTC (rev 287429)
+++ trunk/LayoutTests/platform/glib/svg/css/getComputedStyle-basic-expected.txt 2021-12-24 20:20:17 UTC (rev 287430)
</span><span class="lines">@@ -486,12 +486,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">@@ -998,12 +992,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="trunkLayoutTestsplatformiosimportedw3cwebplatformtestscsscsscascadeallpropinitialxmlexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/ios/imported/w3c/web-platform-tests/css/css-cascade/all-prop-initial-xml-expected.txt (287429 => 287430)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/ios/imported/w3c/web-platform-tests/css/css-cascade/all-prop-initial-xml-expected.txt 2021-12-24 18:55:35 UTC (rev 287429)
+++ trunk/LayoutTests/platform/ios/imported/w3c/web-platform-tests/css/css-cascade/all-prop-initial-xml-expected.txt    2021-12-24 20:20:17 UTC (rev 287430)
</span><span class="lines">@@ -258,6 +258,9 @@
</span><span class="cx"> PASS text-decoration-skip
</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">@@ -360,9 +363,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="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (287429 => 287430)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2021-12-24 18:55:35 UTC (rev 287429)
+++ trunk/Source/WebCore/ChangeLog      2021-12-24 20:20:17 UTC (rev 287430)
</span><span class="lines">@@ -1,5 +1,14 @@
</span><span class="cx"> 2021-12-24  Tim Nguyen  <ntim@apple.com>
</span><span class="cx"> 
</span><ins>+        Unreviewed, r287356 followups and rebaselining for glib
+
+        * css/html.css:
+        (rt): unprefix usage of -webkit-text-emphasis
+        * style/StyleBuilderCustom.h:
+        Sort per Darin Adler's comment
+
+2021-12-24  Tim Nguyen  <ntim@apple.com>
+
</ins><span class="cx">         Remove non-standard -webkit-margin-collapse CSS property and longhands
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=190788
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorecsshtmlcss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/html.css (287429 => 287430)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/html.css        2021-12-24 18:55:35 UTC (rev 287429)
+++ trunk/Source/WebCore/css/html.css   2021-12-24 20:20:17 UTC (rev 287430)
</span><span class="lines">@@ -1300,7 +1300,7 @@
</span><span class="cx"> 
</span><span class="cx"> rt {
</span><span class="cx">     line-height: normal;
</span><del>-    -webkit-text-emphasis: none;
</del><ins>+    text-emphasis: none;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> ruby > rt {
</span></span></pre></div>
<a id="trunkSourceWebCorestyleStyleBuilderCustomh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/style/StyleBuilderCustom.h (287429 => 287430)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/style/StyleBuilderCustom.h  2021-12-24 18:55:35 UTC (rev 287429)
+++ trunk/Source/WebCore/style/StyleBuilderCustom.h     2021-12-24 20:20:17 UTC (rev 287430)
</span><span class="lines">@@ -99,6 +99,7 @@
</span><span class="cx">     DECLARE_PROPERTY_CUSTOM_HANDLERS(OutlineStyle);
</span><span class="cx">     DECLARE_PROPERTY_CUSTOM_HANDLERS(Size);
</span><span class="cx">     DECLARE_PROPERTY_CUSTOM_HANDLERS(Stroke);
</span><ins>+    DECLARE_PROPERTY_CUSTOM_HANDLERS(TextEmphasisStyle);
</ins><span class="cx">     DECLARE_PROPERTY_CUSTOM_HANDLERS(TextIndent);
</span><span class="cx">     DECLARE_PROPERTY_CUSTOM_HANDLERS(TextShadow);
</span><span class="cx">     DECLARE_PROPERTY_CUSTOM_HANDLERS(WebkitBoxShadow);
</span><span class="lines">@@ -112,7 +113,6 @@
</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(TextEmphasisStyle);
</del><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></pre>
</div>
</div>

</body>
</html>