<!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>[287448] trunk/Source/WebCore</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/287448">287448</a></dd>
<dt>Author</dt> <dd>ntim@apple.com</dd>
<dt>Date</dt> <dd>2021-12-26 13:40:03 -0800 (Sun, 26 Dec 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>Remove -webkit-{border-fit/margin-collapse} leftovers in StyleRareNonInheritedData
https://bugs.webkit.org/show_bug.cgi?id=234692

Reviewed by Simon Fraser.

<a href="http://trac.webkit.org/projects/webkit/changeset/285615">r285615</a> removed -webkit-border-fit.
<a href="http://trac.webkit.org/projects/webkit/changeset/287429">r287429</a> removed -webkit-margin-collapse properties.

* rendering/style/RenderStyle.cpp:
(WebCore::RenderStyle::hashForTextAutosizing const):
(WebCore::RenderStyle::equalForTextAutosizing const):
(WebCore::rareNonInheritedDataChangeRequiresLayout):
* rendering/style/StyleRareNonInheritedData.cpp:
(WebCore::StyleRareNonInheritedData::StyleRareNonInheritedData):
(WebCore::StyleRareNonInheritedData::operator== const):
* rendering/style/StyleRareNonInheritedData.h:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleRenderStylecpp">trunk/Source/WebCore/rendering/style/RenderStyle.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleStyleRareNonInheritedDatacpp">trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleStyleRareNonInheritedDatah">trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (287447 => 287448)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2021-12-26 19:24:52 UTC (rev 287447)
+++ trunk/Source/WebCore/ChangeLog      2021-12-26 21:40:03 UTC (rev 287448)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2021-12-26  Tim Nguyen  <ntim@apple.com>
+
+        Remove -webkit-{border-fit/margin-collapse} leftovers in StyleRareNonInheritedData
+        https://bugs.webkit.org/show_bug.cgi?id=234692
+
+        Reviewed by Simon Fraser.
+
+        r285615 removed -webkit-border-fit.
+        r287429 removed -webkit-margin-collapse properties.
+
+        * rendering/style/RenderStyle.cpp:
+        (WebCore::RenderStyle::hashForTextAutosizing const):
+        (WebCore::RenderStyle::equalForTextAutosizing const):
+        (WebCore::rareNonInheritedDataChangeRequiresLayout):
+        * rendering/style/StyleRareNonInheritedData.cpp:
+        (WebCore::StyleRareNonInheritedData::StyleRareNonInheritedData):
+        (WebCore::StyleRareNonInheritedData::operator== const):
+        * rendering/style/StyleRareNonInheritedData.h:
+
</ins><span class="cx"> 2021-12-26  Alan Bujtas  <zalan@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [IFC][Integration] Update text renderer's needsVisualReordering bit
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleRenderStylecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/RenderStyle.cpp (287447 => 287448)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/RenderStyle.cpp     2021-12-26 19:24:52 UTC (rev 287447)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.cpp        2021-12-26 21:40:03 UTC (rev 287448)
</span><span class="lines">@@ -461,8 +461,6 @@
</span><span class="cx"> {
</span><span class="cx">     // FIXME: Not a very smart hash. Could be improved upon. See <https://bugs.webkit.org/show_bug.cgi?id=121131>.
</span><span class="cx">     unsigned hash = m_rareNonInheritedData->effectiveAppearance;
</span><del>-    hash ^= m_rareNonInheritedData->marginBeforeCollapse;
-    hash ^= m_rareNonInheritedData->marginAfterCollapse;
</del><span class="cx">     hash ^= m_rareNonInheritedData->lineClamp.value();
</span><span class="cx">     hash ^= m_rareInheritedData->overflowWrap;
</span><span class="cx">     hash ^= m_rareInheritedData->nbspMode;
</span><span class="lines">@@ -483,8 +481,6 @@
</span><span class="cx"> bool RenderStyle::equalForTextAutosizing(const RenderStyle& other) const
</span><span class="cx"> {
</span><span class="cx">     return m_rareNonInheritedData->effectiveAppearance == other.m_rareNonInheritedData->effectiveAppearance
</span><del>-        && m_rareNonInheritedData->marginBeforeCollapse == other.m_rareNonInheritedData->marginBeforeCollapse
-        && m_rareNonInheritedData->marginAfterCollapse == other.m_rareNonInheritedData->marginAfterCollapse
</del><span class="cx">         && m_rareNonInheritedData->lineClamp == other.m_rareNonInheritedData->lineClamp
</span><span class="cx">         && m_rareInheritedData->textSizeAdjust == other.m_rareInheritedData->textSizeAdjust
</span><span class="cx">         && m_rareInheritedData->overflowWrap == other.m_rareInheritedData->overflowWrap
</span><span class="lines">@@ -654,8 +650,6 @@
</span><span class="cx">     ASSERT(&first != &second);
</span><span class="cx"> 
</span><span class="cx">     if (first.effectiveAppearance != second.effectiveAppearance
</span><del>-        || first.marginBeforeCollapse != second.marginBeforeCollapse
-        || first.marginAfterCollapse != second.marginAfterCollapse
</del><span class="cx">         || first.lineClamp != second.lineClamp
</span><span class="cx">         || first.initialLetter != second.initialLetter
</span><span class="cx">         || first.textOverflow != second.textOverflow)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleStyleRareNonInheritedDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp (287447 => 287448)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp       2021-12-26 19:24:52 UTC (rev 287447)
+++ trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp  2021-12-26 21:40:03 UTC (rev 287448)
</span><span class="lines">@@ -193,11 +193,8 @@
</span><span class="cx">     , userDrag(o.userDrag)
</span><span class="cx">     , textOverflow(o.textOverflow)
</span><span class="cx">     , useSmoothScrolling(o.useSmoothScrolling)
</span><del>-    , marginBeforeCollapse(o.marginBeforeCollapse)
-    , marginAfterCollapse(o.marginAfterCollapse)
</del><span class="cx">     , appearance(o.appearance)
</span><span class="cx">     , effectiveAppearance(o.effectiveAppearance)
</span><del>-    , borderFit(o.borderFit)
</del><span class="cx">     , textCombine(o.textCombine)
</span><span class="cx">     , textDecorationStyle(o.textDecorationStyle)
</span><span class="cx">     , aspectRatioType(o.aspectRatioType)
</span><span class="lines">@@ -302,11 +299,8 @@
</span><span class="cx">         && userDrag == o.userDrag
</span><span class="cx">         && textOverflow == o.textOverflow
</span><span class="cx">         && useSmoothScrolling == o.useSmoothScrolling
</span><del>-        && marginBeforeCollapse == o.marginBeforeCollapse
-        && marginAfterCollapse == o.marginAfterCollapse
</del><span class="cx">         && appearance == o.appearance
</span><span class="cx">         && effectiveAppearance == o.effectiveAppearance
</span><del>-        && borderFit == o.borderFit
</del><span class="cx">         && textCombine == o.textCombine
</span><span class="cx">         && textDecorationStyle == o.textDecorationStyle
</span><span class="cx">         && arePointingToEqualData(rotate, o.rotate)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleStyleRareNonInheritedDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.h (287447 => 287448)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.h 2021-12-26 19:24:52 UTC (rev 287447)
+++ trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.h    2021-12-26 21:40:03 UTC (rev 287448)
</span><span class="lines">@@ -200,11 +200,8 @@
</span><span class="cx">     unsigned userDrag : 2; // UserDrag
</span><span class="cx">     unsigned textOverflow : 1; // Whether or not lines that spill out should be truncated with "..."
</span><span class="cx">     unsigned useSmoothScrolling : 1; // ScrollBehavior
</span><del>-    unsigned marginBeforeCollapse : 2; // MarginCollapse
-    unsigned marginAfterCollapse : 2; // MarginCollapse
</del><span class="cx">     unsigned appearance : 6; // EAppearance
</span><span class="cx">     unsigned effectiveAppearance : 6; // EAppearance
</span><del>-    unsigned borderFit : 1; // BorderFit
</del><span class="cx">     unsigned textCombine : 1; // CSS3 text-combine properties
</span><span class="cx"> 
</span><span class="cx">     unsigned textDecorationStyle : 3; // TextDecorationStyle
</span></span></pre>
</div>
</div>

</body>
</html>