<!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>[192299] 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/192299">192299</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-11-11 00:45:26 -0800 (Wed, 11 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/192169">r192169</a> - Some style changes cause tatechuyoko to be drawn off center
https://bugs.webkit.org/show_bug.cgi?id=150986
<rdar://problem/20748013>
Reviewed by Darin Adler.
Source/WebCore:
Layouts should be idempotent. In particular, during layout, an element should not
rely on a previous call to styleDidChange() with a sufficiently high StyleDifference.
RenderCombineText was assuming that, if a layout occurs, a previous call to
styleDidChange() would have reset the renderedText. However, an ancestor element might
cause the RenderCombineText to re-combine when it is already combined. Therefore, the
recombination should fully uncombine before recombining.
Test: fast/text/text-combine-style-change-extra-layout.html
* rendering/RenderCombineText.cpp:
(WebCore::RenderCombineText::combineText): Fully uncombine before recombining.
LayoutTests:
* fast/text/text-combine-style-change-extra-layout-expected.html: Added.
* fast/text/text-combine-style-change-extra-layout.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="#releasesWebKitGTKwebkit210SourceWebCorerenderingRenderCombineTextcpp">releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderCombineText.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit210LayoutTestsfasttexttextcombinestylechangeextralayoutexpectedhtml">releases/WebKitGTK/webkit-2.10/LayoutTests/fast/text/text-combine-style-change-extra-layout-expected.html</a></li>
<li><a href="#releasesWebKitGTKwebkit210LayoutTestsfasttexttextcombinestylechangeextralayouthtml">releases/WebKitGTK/webkit-2.10/LayoutTests/fast/text/text-combine-style-change-extra-layout.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 (192298 => 192299)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog 2015-11-11 08:39:42 UTC (rev 192298)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog 2015-11-11 08:45:26 UTC (rev 192299)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-11-09 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Some style changes cause tatechuyoko to be drawn off center
+ https://bugs.webkit.org/show_bug.cgi?id=150986
+ <rdar://problem/20748013>
+
+ Reviewed by Darin Adler.
+
+ * fast/text/text-combine-style-change-extra-layout-expected.html: Added.
+ * fast/text/text-combine-style-change-extra-layout.html: Added.
+
</ins><span class="cx"> 2015-11-07 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> Crash when subtree layout is set on FrameView while auto size mode is enabled.
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210LayoutTestsfasttexttextcombinestylechangeextralayoutexpectedhtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.10/LayoutTests/fast/text/text-combine-style-change-extra-layout-expected.html (0 => 192299)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/fast/text/text-combine-style-change-extra-layout-expected.html (rev 0)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/fast/text/text-combine-style-change-extra-layout-expected.html 2015-11-11 08:45:26 UTC (rev 192299)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+<html>
+ <head>
+ <style>
+ #w {
+ background-color: green;
+ }
+ </style>
+ </head>
+ <body style="-webkit-writing-mode: vertical-rl; font-size: 320px;">
+ <span id="w" style="-webkit-text-combine: horizontal;">39</span>
+ </body>
+</html>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit210LayoutTestsfasttexttextcombinestylechangeextralayouthtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.10/LayoutTests/fast/text/text-combine-style-change-extra-layout.html (0 => 192299)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/fast/text/text-combine-style-change-extra-layout.html (rev 0)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/fast/text/text-combine-style-change-extra-layout.html 2015-11-11 08:45:26 UTC (rev 192299)
</span><span class="lines">@@ -0,0 +1,22 @@
</span><ins>+<!DOCTYPE html>
+<html>
+ <head>
+ <style>
+ .asdf {
+ background-color: green;
+ }
+ </style>
+ </head>
+ <body style="-webkit-writing-mode: vertical-rl; font-size: 320px;">
+ <span id="w" style="-webkit-text-combine: horizontal;">39</span>
+ <script>
+ if (window.testRunner)
+ testRunner.waitUntilDone();
+ window.setTimeout(function() {
+ document.getElementById("w").className = "asdf";
+ if (window.testRunner)
+ testRunner.notifyDone();
+ }, 0);
+ </script>
+ </body>
+</html>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog (192298 => 192299)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog 2015-11-11 08:39:42 UTC (rev 192298)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog 2015-11-11 08:45:26 UTC (rev 192299)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2015-11-09 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Some style changes cause tatechuyoko to be drawn off center
+ https://bugs.webkit.org/show_bug.cgi?id=150986
+ <rdar://problem/20748013>
+
+ Reviewed by Darin Adler.
+
+ Layouts should be idempotent. In particular, during layout, an element should not
+ rely on a previous call to styleDidChange() with a sufficiently high StyleDifference.
+ RenderCombineText was assuming that, if a layout occurs, a previous call to
+ styleDidChange() would have reset the renderedText. However, an ancestor element might
+ cause the RenderCombineText to re-combine when it is already combined. Therefore, the
+ recombination should fully uncombine before recombining.
+
+ Test: fast/text/text-combine-style-change-extra-layout.html
+
+ * rendering/RenderCombineText.cpp:
+ (WebCore::RenderCombineText::combineText): Fully uncombine before recombining.
+
</ins><span class="cx"> 2015-11-07 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> Crash when subtree layout is set on FrameView while auto size mode is enabled.
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCorerenderingRenderCombineTextcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderCombineText.cpp (192298 => 192299)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderCombineText.cpp 2015-11-11 08:39:42 UTC (rev 192298)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderCombineText.cpp 2015-11-11 08:45:26 UTC (rev 192299)
</span><span class="lines">@@ -90,6 +90,10 @@
</span><span class="cx"> if (!m_needsFontUpdate)
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ // An ancestor element may trigger us to lay out again, even when we're already combined.
+ if (m_isCombined)
+ RenderText::setRenderedText(originalText());
+
</ins><span class="cx"> m_isCombined = false;
</span><span class="cx"> m_needsFontUpdate = false;
</span><span class="cx">
</span><span class="lines">@@ -141,8 +145,8 @@
</span><span class="cx"> m_combineFontStyle->fontCascade().update(fontSelector);
</span><span class="cx">
</span><span class="cx"> if (m_isCombined) {
</span><del>- DEPRECATED_DEFINE_STATIC_LOCAL(String, objectReplacementCharacterString, (&objectReplacementCharacter, 1));
- RenderText::setRenderedText(objectReplacementCharacterString.impl());
</del><ins>+ static NeverDestroyed<String> objectReplacementCharacterString(&objectReplacementCharacter, 1);
+ RenderText::setRenderedText(objectReplacementCharacterString.get());
</ins><span class="cx"> m_combinedTextSize = FloatSize(combinedTextWidth, glyphOverflow.bottom + glyphOverflow.top);
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>