<!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>[206821] 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/206821">206821</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2016-10-05 11:50:20 -0700 (Wed, 05 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Missing quotation mark when <q> gets reparented.
https://bugs.webkit.org/show_bug.cgi?id=162940
Reviewed by Darin Adler.
Source/WebCore:
When an opening RenderQuote gets removed due to some change in the render tree,
we notify the closing RenderQuote so that it can update its content (") accordingly (and vice versa).
However when the same RenderQuote is added back to the render tree (aka reparenting), we fail to
let the other RenderQuote know about it and its content becomes stale.
This patch ensures that when either the opening or closing part of the quotation mark gets reparented,
we inform the other, corresponding opening/closing renderer about it.
Test: fast/css-generated-content/missing-quotes-with-dynamic-content.html
* dom/PseudoElement.cpp:
(WebCore::PseudoElement::didAttachRenderers):
* rendering/RenderQuote.cpp:
(WebCore::RenderQuote::insertedIntoTree):
* rendering/RenderQuote.h:
LayoutTests:
The position of the closing quotation mark is driven by the multicolumn code hence the cover div.
* fast/css-generated-content/missing-quotes-with-dynamic-content-expected.html: Added.
* fast/css-generated-content/missing-quotes-with-dynamic-content.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomPseudoElementcpp">trunk/Source/WebCore/dom/PseudoElement.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderQuotecpp">trunk/Source/WebCore/rendering/RenderQuote.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderQuoteh">trunk/Source/WebCore/rendering/RenderQuote.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastcssgeneratedcontentmissingquoteswithdynamiccontentexpectedhtml">trunk/LayoutTests/fast/css-generated-content/missing-quotes-with-dynamic-content-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgeneratedcontentmissingquoteswithdynamiccontenthtml">trunk/LayoutTests/fast/css-generated-content/missing-quotes-with-dynamic-content.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (206820 => 206821)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-10-05 18:42:09 UTC (rev 206820)
+++ trunk/LayoutTests/ChangeLog 2016-10-05 18:50:20 UTC (rev 206821)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-10-05 Zalan Bujtas <zalan@apple.com>
+
+ Missing quotation mark when <q> gets reparented.
+ https://bugs.webkit.org/show_bug.cgi?id=162940
+
+ Reviewed by Darin Adler.
+
+ The position of the closing quotation mark is driven by the multicolumn code hence the cover div.
+
+ * fast/css-generated-content/missing-quotes-with-dynamic-content-expected.html: Added.
+ * fast/css-generated-content/missing-quotes-with-dynamic-content.html: Added.
+
</ins><span class="cx"> 2016-10-05 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> [WK2][NetworkSession] Ping requests should follow redirects if applicable
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgeneratedcontentmissingquoteswithdynamiccontentexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css-generated-content/missing-quotes-with-dynamic-content-expected.html (0 => 206821)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-generated-content/missing-quotes-with-dynamic-content-expected.html (rev 0)
+++ trunk/LayoutTests/fast/css-generated-content/missing-quotes-with-dynamic-content-expected.html 2016-10-05 18:50:20 UTC (rev 206821)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<title>This tests that we render both quotation marks.</title>
+<style>
+</style>
+</head>
+<body>
+<div style="font-size: 10px; width: 40px;">"</div>
+<div style="margin-left: 8px; margin-top: -20px; width: 20px; height: 20px; background-color: black;"></div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcssgeneratedcontentmissingquoteswithdynamiccontenthtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css-generated-content/missing-quotes-with-dynamic-content.html (0 => 206821)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-generated-content/missing-quotes-with-dynamic-content.html (rev 0)
+++ trunk/LayoutTests/fast/css-generated-content/missing-quotes-with-dynamic-content.html 2016-10-05 18:50:20 UTC (rev 206821)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<title>This tests that we render both quotation marks.</title>
+<style>
+ q::before {
+ column-count: 2;
+ float: right;
+ }
+</style>
+</head>
+<body>
+<div style="font-size: 10px; width: 40px;"><q></q></div>
+<div style="margin-left: 8px; margin-top: -20px; width: 20px; height: 20px; background-color: black;"></div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (206820 => 206821)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-10-05 18:42:09 UTC (rev 206820)
+++ trunk/Source/WebCore/ChangeLog 2016-10-05 18:50:20 UTC (rev 206821)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2016-10-05 Zalan Bujtas <zalan@apple.com>
+
+ Missing quotation mark when <q> gets reparented.
+ https://bugs.webkit.org/show_bug.cgi?id=162940
+
+ Reviewed by Darin Adler.
+
+ When an opening RenderQuote gets removed due to some change in the render tree,
+ we notify the closing RenderQuote so that it can update its content (") accordingly (and vice versa).
+ However when the same RenderQuote is added back to the render tree (aka reparenting), we fail to
+ let the other RenderQuote know about it and its content becomes stale.
+ This patch ensures that when either the opening or closing part of the quotation mark gets reparented,
+ we inform the other, corresponding opening/closing renderer about it.
+
+ Test: fast/css-generated-content/missing-quotes-with-dynamic-content.html
+
+ * dom/PseudoElement.cpp:
+ (WebCore::PseudoElement::didAttachRenderers):
+ * rendering/RenderQuote.cpp:
+ (WebCore::RenderQuote::insertedIntoTree):
+ * rendering/RenderQuote.h:
+
</ins><span class="cx"> 2016-10-05 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> URLParser should correctly strip unnecessary 0's in IPv6 addresses
</span></span></pre></div>
<a id="trunkSourceWebCoredomPseudoElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/PseudoElement.cpp (206820 => 206821)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/PseudoElement.cpp 2016-10-05 18:42:09 UTC (rev 206820)
+++ trunk/Source/WebCore/dom/PseudoElement.cpp 2016-10-05 18:50:20 UTC (rev 206821)
</span><span class="lines">@@ -96,12 +96,8 @@
</span><span class="cx">
</span><span class="cx"> for (const ContentData* content = style.contentData(); content; content = content->next()) {
</span><span class="cx"> auto child = content->createContentRenderer(document(), style);
</span><del>- if (renderer->isChildAllowed(*child, style)) {
- auto* childPtr = child.get();
</del><ins>+ if (renderer->isChildAllowed(*child, style))
</ins><span class="cx"> renderer->addChild(child.leakPtr());
</span><del>- if (is<RenderQuote>(*childPtr))
- downcast<RenderQuote>(*childPtr).attachQuote();
- }
</del><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderQuotecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderQuote.cpp (206820 => 206821)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderQuote.cpp 2016-10-05 18:42:09 UTC (rev 206820)
+++ trunk/Source/WebCore/rendering/RenderQuote.cpp 2016-10-05 18:50:20 UTC (rev 206821)
</span><span class="lines">@@ -47,6 +47,12 @@
</span><span class="cx"> ASSERT(!m_previous);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void RenderQuote::insertedIntoTree()
+{
+ RenderInline::insertedIntoTree();
+ attachQuote();
+}
+
</ins><span class="cx"> void RenderQuote::willBeRemovedFromTree()
</span><span class="cx"> {
</span><span class="cx"> RenderInline::willBeRemovedFromTree();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderQuoteh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderQuote.h (206820 => 206821)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderQuote.h 2016-10-05 18:42:09 UTC (rev 206820)
+++ trunk/Source/WebCore/rendering/RenderQuote.h 2016-10-05 18:50:20 UTC (rev 206821)
</span><span class="lines">@@ -40,6 +40,7 @@
</span><span class="cx"> const char* renderName() const override { return "RenderQuote"; }
</span><span class="cx"> bool isQuote() const override { return true; }
</span><span class="cx"> void styleDidChange(StyleDifference, const RenderStyle*) override;
</span><ins>+ void insertedIntoTree() override;
</ins><span class="cx"> void willBeRemovedFromTree() override;
</span><span class="cx">
</span><span class="cx"> String computeText() const;
</span></span></pre>
</div>
</div>
</body>
</html>