<!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>[190957] releases/WebKitGTK/webkit-2.10</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/190957">190957</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-10-13 03:49:47 -0700 (Tue, 13 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/190570">r190570</a> - Mark the line dirty when RenderQuote's text changes.
https://bugs.webkit.org/show_bug.cgi?id=149784
rdar://problem/22558169
Reviewed by Antti Koivisto.
When quotation mark changes ( " -> ' or empty string), we
need to mark the line dirty to ensure its content gets laid out properly.
Source/WebCore:
Test: fast/inline/quotation-text-changes-dynamically.html
* rendering/RenderQuote.cpp:
(WebCore::quoteTextRenderer):
(WebCore::RenderQuote::updateText):
(WebCore::fragmentChild): Deleted.
LayoutTests:
* fast/inline/quotation-text-changes-dynamically-expected.txt: Added.
* fast/inline/quotation-text-changes-dynamically.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit210LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCorerenderingRenderQuotecpp">releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderQuote.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit210LayoutTestsfastinlinequotationtextchangesdynamicallyexpectedtxt">releases/WebKitGTK/webkit-2.10/LayoutTests/fast/inline/quotation-text-changes-dynamically-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit210LayoutTestsfastinlinequotationtextchangesdynamicallyhtml">releases/WebKitGTK/webkit-2.10/LayoutTests/fast/inline/quotation-text-changes-dynamically.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit210LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog (190956 => 190957)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog        2015-10-13 10:47:08 UTC (rev 190956)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog        2015-10-13 10:49:47 UTC (rev 190957)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-10-05 Zalan Bujtas <zalan@apple.com>
+
+ Mark the line dirty when RenderQuote's text changes.
+ https://bugs.webkit.org/show_bug.cgi?id=149784
+ rdar://problem/22558169
+
+ Reviewed by Antti Koivisto.
+
+ When quotation mark changes ( " -> ' or empty string), we
+ need to mark the line dirty to ensure its content gets laid out properly.
+
+ * fast/inline/quotation-text-changes-dynamically-expected.txt: Added.
+ * fast/inline/quotation-text-changes-dynamically.html: Added.
+
</ins><span class="cx"> 2015-10-02 Antoine Quint <graouts@apple.com>
</span><span class="cx">
</span><span class="cx"> popstate is fired at the wrong time on load
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210LayoutTestsfastinlinequotationtextchangesdynamicallyexpectedtxt"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.10/LayoutTests/fast/inline/quotation-text-changes-dynamically-expected.txt (0 => 190957)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/fast/inline/quotation-text-changes-dynamically-expected.txt         (rev 0)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/fast/inline/quotation-text-changes-dynamically-expected.txt        2015-10-13 10:49:47 UTC (rev 190957)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+PASS if no crash or assert in debug
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit210LayoutTestsfastinlinequotationtextchangesdynamicallyhtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.10/LayoutTests/fast/inline/quotation-text-changes-dynamically.html (0 => 190957)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/fast/inline/quotation-text-changes-dynamically.html         (rev 0)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/fast/inline/quotation-text-changes-dynamically.html        2015-10-13 10:49:47 UTC (rev 190957)
</span><span class="lines">@@ -0,0 +1,23 @@
</span><ins>+<script>
+ if (window.testRunner)
+ testRunner.dumpAsText();
+</script>
+
+<style>
+q:before {
+ position: fixed;
+ -webkit-animation-name: name1;
+ -webkit-animation-duration: 1s;
+}
+
+@-webkit-keyframes name1 {
+ from {
+ column-width: 10px;
+ }
+ to {
+ column-width: 20px;
+ }
+}
+</style>
+
+<q>PASS if no crash or assert in debug</q>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog (190956 => 190957)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog        2015-10-13 10:47:08 UTC (rev 190956)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog        2015-10-13 10:49:47 UTC (rev 190957)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2015-10-05 Zalan Bujtas <zalan@apple.com>
+
+ Mark the line dirty when RenderQuote's text changes.
+ https://bugs.webkit.org/show_bug.cgi?id=149784
+ rdar://problem/22558169
+
+ Reviewed by Antti Koivisto.
+
+ When quotation mark changes ( " -> ' or empty string), we
+ need to mark the line dirty to ensure its content gets laid out properly.
+
+ Test: fast/inline/quotation-text-changes-dynamically.html
+
+ * rendering/RenderQuote.cpp:
+ (WebCore::quoteTextRenderer):
+ (WebCore::RenderQuote::updateText):
+ (WebCore::fragmentChild): Deleted.
+
</ins><span class="cx"> 2015-10-05 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><span class="cx"> GLContext should control ownership of context-related objects
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCorerenderingRenderQuotecpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderQuote.cpp (190956 => 190957)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderQuote.cpp        2015-10-13 10:47:08 UTC (rev 190956)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderQuote.cpp        2015-10-13 10:49:47 UTC (rev 190957)
</span><span class="lines">@@ -330,7 +330,7 @@
</span><span class="cx"> return apostropheString;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static RenderTextFragment* fragmentChild(RenderObject* lastChild)
</del><ins>+static RenderTextFragment* quoteTextRenderer(RenderObject* lastChild)
</ins><span class="cx"> {
</span><span class="cx"> if (!lastChild)
</span><span class="cx"> return nullptr;
</span><span class="lines">@@ -349,8 +349,9 @@
</span><span class="cx"> m_text = text;
</span><span class="cx"> // Start from the end of the child list because, if we've had a first-letter
</span><span class="cx"> // renderer inserted then the remaining text will be at the end.
</span><del>- if (auto* fragment = fragmentChild(lastChild())) {
- fragment->setContentString(m_text);
</del><ins>+ if (auto* renderText = quoteTextRenderer(lastChild())) {
+ renderText->setContentString(m_text);
+ renderText->dirtyLineBoxes(false);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> addChild(new RenderTextFragment(document(), m_text));
</span></span></pre>
</div>
</div>
</body>
</html>