<!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>[260088] 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/260088">260088</a></dd>
<dt>Author</dt> <dd>graouts@webkit.org</dd>
<dt>Date</dt> <dd>2020-04-14 12:12:50 -0700 (Tue, 14 Apr 2020)</dd>
</dl>

<h3>Log Message</h3>
<pre>Factor PseudoElement creation calls into a single Element::ensurePseudoElement(pseudoId) method
https://bugs.webkit.org/show_bug.cgi?id=210495

Reviewed by Antti Koivisto.

To support webkit.org/b/207290 we need a way to ensure a PseudoElement is available for ::before and ::after
pseudo-elements on a given Element. We now use a Element::ensurePseudoElement(pseudoId) method to do this and
replace existing places where we would do something similar.

* dom/Element.cpp:
(WebCore::Element::ensurePseudoElement):
* dom/Element.h:
* rendering/updating/RenderTreeUpdaterGeneratedContent.cpp:
(WebCore::RenderTreeUpdater::GeneratedContent::updatePseudoElement):
* style/StyleTreeResolver.cpp:
(WebCore::Style::TreeResolver::resolvePseudoStyle):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomElementcpp">trunk/Source/WebCore/dom/Element.cpp</a></li>
<li><a href="#trunkSourceWebCoredomElementh">trunk/Source/WebCore/dom/Element.h</a></li>
<li><a href="#trunkSourceWebCorerenderingupdatingRenderTreeUpdaterGeneratedContentcpp">trunk/Source/WebCore/rendering/updating/RenderTreeUpdaterGeneratedContent.cpp</a></li>
<li><a href="#trunkSourceWebCorestyleStyleTreeResolvercpp">trunk/Source/WebCore/style/StyleTreeResolver.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (260087 => 260088)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2020-04-14 19:09:30 UTC (rev 260087)
+++ trunk/Source/WebCore/ChangeLog      2020-04-14 19:12:50 UTC (rev 260088)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2020-04-14  Antoine Quint  <graouts@apple.com>
+
+        Factor PseudoElement creation calls into a single Element::ensurePseudoElement(pseudoId) method
+        https://bugs.webkit.org/show_bug.cgi?id=210495
+
+        Reviewed by Antti Koivisto.
+
+        To support webkit.org/b/207290 we need a way to ensure a PseudoElement is available for ::before and ::after
+        pseudo-elements on a given Element. We now use a Element::ensurePseudoElement(pseudoId) method to do this and
+        replace existing places where we would do something similar.
+
+        * dom/Element.cpp:
+        (WebCore::Element::ensurePseudoElement):
+        * dom/Element.h:
+        * rendering/updating/RenderTreeUpdaterGeneratedContent.cpp:
+        (WebCore::RenderTreeUpdater::GeneratedContent::updatePseudoElement):
+        * style/StyleTreeResolver.cpp:
+        (WebCore::Style::TreeResolver::resolvePseudoStyle):
+
</ins><span class="cx"> 2020-04-14  Simon Fraser  <simon.fraser@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Scroll snap in subframes is often broken
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Element.cpp (260087 => 260088)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Element.cpp     2020-04-14 19:09:30 UTC (rev 260087)
+++ trunk/Source/WebCore/dom/Element.cpp        2020-04-14 19:12:50 UTC (rev 260088)
</span><span class="lines">@@ -3481,6 +3481,20 @@
</span><span class="cx">         attrNode->normalize();
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+PseudoElement& Element::ensurePseudoElement(PseudoId pseudoId)
+{
+    if (pseudoId == PseudoId::Before) {
+        if (!beforePseudoElement())
+            ensureElementRareData().setBeforePseudoElement(PseudoElement::create(*this, pseudoId));
+        return *beforePseudoElement();
+    }
+
+    ASSERT(pseudoId == PseudoId::After);
+    if (!afterPseudoElement())
+        ensureElementRareData().setAfterPseudoElement(PseudoElement::create(*this, pseudoId));
+    return *afterPseudoElement();
+}
+
</ins><span class="cx"> PseudoElement* Element::beforePseudoElement() const
</span><span class="cx"> {
</span><span class="cx">     return hasRareData() ? elementRareData()->beforePseudoElement() : nullptr;
</span><span class="lines">@@ -3491,16 +3505,6 @@
</span><span class="cx">     return hasRareData() ? elementRareData()->afterPseudoElement() : nullptr;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void Element::setBeforePseudoElement(Ref<PseudoElement>&& element)
-{
-    ensureElementRareData().setBeforePseudoElement(WTFMove(element));
-}
-
-void Element::setAfterPseudoElement(Ref<PseudoElement>&& element)
-{
-    ensureElementRareData().setAfterPseudoElement(WTFMove(element));
-}
-
</del><span class="cx"> static void disconnectPseudoElement(PseudoElement* pseudoElement)
</span><span class="cx"> {
</span><span class="cx">     if (!pseudoElement)
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Element.h (260087 => 260088)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Element.h       2020-04-14 19:09:30 UTC (rev 260087)
+++ trunk/Source/WebCore/dom/Element.h  2020-04-14 19:12:50 UTC (rev 260088)
</span><span class="lines">@@ -428,6 +428,7 @@
</span><span class="cx">     void finishParsingChildren() override;
</span><span class="cx">     void beginParsingChildren() final;
</span><span class="cx"> 
</span><ins>+    PseudoElement& ensurePseudoElement(PseudoId);
</ins><span class="cx">     WEBCORE_EXPORT PseudoElement* beforePseudoElement() const;
</span><span class="cx">     WEBCORE_EXPORT PseudoElement* afterPseudoElement() const;
</span><span class="cx">     bool childNeedsShadowWalker() const;
</span><span class="lines">@@ -552,8 +553,6 @@
</span><span class="cx">     const RenderStyle* existingComputedStyle() const;
</span><span class="cx">     WEBCORE_EXPORT const RenderStyle* renderOrDisplayContentsStyle() const;
</span><span class="cx"> 
</span><del>-    void setBeforePseudoElement(Ref<PseudoElement>&&);
-    void setAfterPseudoElement(Ref<PseudoElement>&&);
</del><span class="cx">     void clearBeforePseudoElement();
</span><span class="cx">     void clearAfterPseudoElement();
</span><span class="cx">     void resetComputedStyle();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingupdatingRenderTreeUpdaterGeneratedContentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/updating/RenderTreeUpdaterGeneratedContent.cpp (260087 => 260088)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/updating/RenderTreeUpdaterGeneratedContent.cpp    2020-04-14 19:09:30 UTC (rev 260087)
+++ trunk/Source/WebCore/rendering/updating/RenderTreeUpdaterGeneratedContent.cpp       2020-04-14 19:12:50 UTC (rev 260088)
</span><span class="lines">@@ -107,21 +107,10 @@
</span><span class="cx">         return;
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    RefPtr<PseudoElement> newPseudoElement;
-    if (!pseudoElement) {
-        newPseudoElement = PseudoElement::create(current, pseudoId);
-        pseudoElement = newPseudoElement.get();
-    }
-
</del><span class="cx">     if (update->change == Style::NoChange)
</span><span class="cx">         return;
</span><span class="cx"> 
</span><del>-    if (newPseudoElement) {
-        if (pseudoId == PseudoId::Before)
-            current.setBeforePseudoElement(newPseudoElement.releaseNonNull());
-        else
-            current.setAfterPseudoElement(newPseudoElement.releaseNonNull());
-    }
</del><ins>+    pseudoElement = &current.ensurePseudoElement(pseudoId);
</ins><span class="cx"> 
</span><span class="cx">     if (update->style->display() == DisplayType::Contents) {
</span><span class="cx">         // For display:contents we create an inline wrapper that inherits its
</span></span></pre></div>
<a id="trunkSourceWebCorestyleStyleTreeResolvercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/style/StyleTreeResolver.cpp (260087 => 260088)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/style/StyleTreeResolver.cpp 2020-04-14 19:09:30 UTC (rev 260087)
+++ trunk/Source/WebCore/style/StyleTreeResolver.cpp    2020-04-14 19:12:50 UTC (rev 260088)
</span><span class="lines">@@ -268,17 +268,7 @@
</span><span class="cx">     if (!pseudoElementRendererIsNeeded(pseudoStyle.get()))
</span><span class="cx">         return { };
</span><span class="cx"> 
</span><del>-    PseudoElement* pseudoElement = pseudoId == PseudoId::Before ? element.beforePseudoElement() : element.afterPseudoElement();
-    if (!pseudoElement) {
-        auto newPseudoElement = PseudoElement::create(element, pseudoId);
-        pseudoElement = newPseudoElement.ptr();
-        if (pseudoId == PseudoId::Before)
-            element.setBeforePseudoElement(WTFMove(newPseudoElement));
-        else
-            element.setAfterPseudoElement(WTFMove(newPseudoElement));
-    }
-
-    return createAnimatedElementUpdate(WTFMove(pseudoStyle), *pseudoElement, elementUpdate.change);
</del><ins>+    return createAnimatedElementUpdate(WTFMove(pseudoStyle), element.ensurePseudoElement(pseudoId), elementUpdate.change);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> const RenderStyle* TreeResolver::parentBoxStyle() const
</span></span></pre>
</div>
</div>

</body>
</html>