<!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>[225431] 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/225431">225431</a></dd>
<dt>Author</dt> <dd>dbates@webkit.org</dd>
<dt>Date</dt> <dd>2017-12-01 16:28:46 -0800 (Fri, 01 Dec 2017)</dd>
</dl>

<h3>Log Message</h3>
<pre>AlternativePresentationButtonSubstitution::unapply() may not undo substitution
https://bugs.webkit.org/show_bug.cgi?id=180279
<rdar://problem/35800599>

Reviewed by Simon Fraser.

Source/WebCore:

Fixes an issue where removing an alternative presentation button substituted for a non-HTML input
element did not restore the original appearance of the element before the substitution.

To substitute the alternative presentation button for a non-HTML input element we attach a
user-agent shadow root to it. Adding a shadow root, including a user-agent shadow root,
tears down the existing renderers for the element. Currently when we unapply such a substitution
we ultimately just remove the shadow root and do not create new renderers for the subtree
that the shadow root was removed from. We need to create new renderers for this subtree
to restore the original appearance of the element before the substitution.

* editing/cocoa/AlternativePresentationButtonSubstitution.cpp:
(WebCore::AlternativePresentationButtonSubstitution::unapply):

LayoutTests:

Update test to ensure that we undo the alternative presentation button substitution
made to an HTML label element.

* fast/forms/alternative-presentation-button/replace-and-remove-expected.html:
* fast/forms/alternative-presentation-button/replace-and-remove.html:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastformsalternativepresentationbuttonreplaceandremoveexpectedhtml">trunk/LayoutTests/fast/forms/alternative-presentation-button/replace-and-remove-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastformsalternativepresentationbuttonreplaceandremovehtml">trunk/LayoutTests/fast/forms/alternative-presentation-button/replace-and-remove.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreeditingcocoaAlternativePresentationButtonSubstitutioncpp">trunk/Source/WebCore/editing/cocoa/AlternativePresentationButtonSubstitution.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (225430 => 225431)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog      2017-12-02 00:20:57 UTC (rev 225430)
+++ trunk/LayoutTests/ChangeLog 2017-12-02 00:28:46 UTC (rev 225431)
</span><span class="lines">@@ -1,5 +1,19 @@
</span><span class="cx"> 2017-12-01  Daniel Bates  <dabates@apple.com>
</span><span class="cx"> 
</span><ins>+        AlternativePresentationButtonSubstitution::unapply() may not undo substitution
+        https://bugs.webkit.org/show_bug.cgi?id=180279
+        <rdar://problem/35800599>
+
+        Reviewed by Simon Fraser.
+
+        Update test to ensure that we undo the alternative presentation button substitution
+        made to an HTML label element.
+
+        * fast/forms/alternative-presentation-button/replace-and-remove-expected.html:
+        * fast/forms/alternative-presentation-button/replace-and-remove.html:
+
+2017-12-01  Daniel Bates  <dabates@apple.com>
+
</ins><span class="cx">         Alternative Presentation Button: Provide a way to query for the replaced elements
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=180114
</span><span class="cx">         <rdar://problem/35710539>
</span></span></pre></div>
<a id="trunkLayoutTestsfastformsalternativepresentationbuttonreplaceandremoveexpectedhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/forms/alternative-presentation-button/replace-and-remove-expected.html (225430 => 225431)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/forms/alternative-presentation-button/replace-and-remove-expected.html    2017-12-02 00:20:57 UTC (rev 225430)
+++ trunk/LayoutTests/fast/forms/alternative-presentation-button/replace-and-remove-expected.html       2017-12-02 00:28:46 UTC (rev 225431)
</span><span class="lines">@@ -39,6 +39,9 @@
</span><span class="cx">                 </tr>
</span><span class="cx">         </table>
</span><span class="cx">     </div>
</span><ins>+    <div>
+        <label>First name <input type="text"></label>
+    </div>
</ins><span class="cx">     <p>Name</p>
</span><span class="cx"> </div>
</span><span class="cx"> </body>
</span></span></pre></div>
<a id="trunkLayoutTestsfastformsalternativepresentationbuttonreplaceandremovehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/forms/alternative-presentation-button/replace-and-remove.html (225430 => 225431)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/forms/alternative-presentation-button/replace-and-remove.html     2017-12-02 00:20:57 UTC (rev 225430)
+++ trunk/LayoutTests/fast/forms/alternative-presentation-button/replace-and-remove.html        2017-12-02 00:28:46 UTC (rev 225431)
</span><span class="lines">@@ -39,6 +39,9 @@
</span><span class="cx">                 </tr>
</span><span class="cx">         </table>
</span><span class="cx">     </div>
</span><ins>+    <div class="test">
+        <label>First name <input type="text"></label>
+    </div>
</ins><span class="cx"> </div>
</span><span class="cx"> <script>
</span><span class="cx"> var id = 0;
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (225430 => 225431)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2017-12-02 00:20:57 UTC (rev 225430)
+++ trunk/Source/WebCore/ChangeLog      2017-12-02 00:28:46 UTC (rev 225431)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2017-12-01  Daniel Bates  <dabates@apple.com>
+
+        AlternativePresentationButtonSubstitution::unapply() may not undo substitution
+        https://bugs.webkit.org/show_bug.cgi?id=180279
+        <rdar://problem/35800599>
+
+        Reviewed by Simon Fraser.
+
+        Fixes an issue where removing an alternative presentation button substituted for a non-HTML input
+        element did not restore the original appearance of the element before the substitution.
+
+        To substitute the alternative presentation button for a non-HTML input element we attach a
+        user-agent shadow root to it. Adding a shadow root, including a user-agent shadow root,
+        tears down the existing renderers for the element. Currently when we unapply such a substitution
+        we ultimately just remove the shadow root and do not create new renderers for the subtree
+        that the shadow root was removed from. We need to create new renderers for this subtree
+        to restore the original appearance of the element before the substitution.
+
+        * editing/cocoa/AlternativePresentationButtonSubstitution.cpp:
+        (WebCore::AlternativePresentationButtonSubstitution::unapply):
+
</ins><span class="cx"> 2017-12-01  Christopher Reid  <chris.reid@sony.com>
</span><span class="cx"> 
</span><span class="cx">         Move DateComponents into WTF
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingcocoaAlternativePresentationButtonSubstitutioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/cocoa/AlternativePresentationButtonSubstitution.cpp (225430 => 225431)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/cocoa/AlternativePresentationButtonSubstitution.cpp 2017-12-02 00:20:57 UTC (rev 225430)
+++ trunk/Source/WebCore/editing/cocoa/AlternativePresentationButtonSubstitution.cpp    2017-12-02 00:28:46 UTC (rev 225431)
</span><span class="lines">@@ -110,6 +110,7 @@
</span><span class="cx">         m_shadowHost->userAgentShadowRoot()->removeChild(*m_alternativePresentationButtonElement);
</span><span class="cx">         ASSERT(!m_shadowHost->userAgentShadowRoot()->countChildNodes());
</span><span class="cx">         m_shadowHost->removeShadowRoot();
</span><ins>+        m_shadowHost->invalidateStyleAndRenderersForSubtree();
</ins><span class="cx">     };
</span><span class="cx">     auto restoreStyles = [&] {
</span><span class="cx">         for (auto& savedDisplayStyle : m_savedDisplayStyles) {
</span></span></pre>
</div>
</div>

</body>
</html>