<!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>[203415] 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/203415">203415</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2016-07-19 13:10:02 -0700 (Tue, 19 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>theguardian.co.uk crossword puzzles are sometimes not displaying text
https://bugs.webkit.org/show_bug.cgi?id=159924
<rdar://problem/27409483>
Reviewed by Simon Fraser.
Source/WebCore:
This patch fixes the case when
- 2 disjoint subtrees are dirty
- RenderView is also dirty.
and we end up not laying out one of the 2 subtrees.
In FrameView::scheduleRelayoutOfSubtree, we assume that when the RenderView is dirty
we already have a pending full layout which means that any previous subtree layouts have already been
converted to full layouts.
However this assumption is incorrect. RenderView can get dirty without checking if there's
already a pending subtree layout.
One option to solve this problem would be to override RenderObject::setNeedsLayout in RenderView
so that when the RenderView gets dirty, we could also convert any pending subtree layout to full layout.
However RenderObject::setNeedsLayout is a hot function and making it virtual would impact performance.
The other option is to always normalize subtree layouts in FrameView::scheduleRelayoutOfSubtree().
This patch implements the second option.
Test: fast/misc/subtree-layouts.html
* page/FrameView.cpp:
(WebCore::FrameView::scheduleRelayoutOfSubtree):
LayoutTests:
* fast/misc/subtree-layouts-expected.html: Added.
* fast/misc/subtree-layouts.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="#trunkSourceWebCorepageFrameViewcpp">trunk/Source/WebCore/page/FrameView.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastmiscsubtreelayoutsexpectedhtml">trunk/LayoutTests/fast/misc/subtree-layouts-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastmiscsubtreelayoutshtml">trunk/LayoutTests/fast/misc/subtree-layouts.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (203414 => 203415)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-07-19 20:07:38 UTC (rev 203414)
+++ trunk/LayoutTests/ChangeLog 2016-07-19 20:10:02 UTC (rev 203415)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-07-19 Zalan Bujtas <zalan@apple.com>
+
+ theguardian.co.uk crossword puzzles are sometimes not displaying text
+ https://bugs.webkit.org/show_bug.cgi?id=159924
+ <rdar://problem/27409483>
+
+ Reviewed by Simon Fraser.
+
+ * fast/misc/subtree-layouts-expected.html: Added.
+ * fast/misc/subtree-layouts.html: Added.
+
</ins><span class="cx"> 2016-07-19 Nan Wang <n_wang@apple.com>
</span><span class="cx">
</span><span class="cx"> AX: Incorrect behavior for word related text marker functions when there's collapsed whitespace
</span></span></pre></div>
<a id="trunkLayoutTestsfastmiscsubtreelayoutsexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/misc/subtree-layouts-expected.html (0 => 203415)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/misc/subtree-layouts-expected.html (rev 0)
+++ trunk/LayoutTests/fast/misc/subtree-layouts-expected.html 2016-07-19 20:10:02 UTC (rev 203415)
</span><span class="lines">@@ -0,0 +1,18 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests that we layout both subtrees when they change the same time with selection on.</title>
+</head>
+<body>
+<div>
+ <svg height="30" width="200">
+ <text id=first x="0" y="15">second</text>
+ </svg>
+</div>
+<div>
+ <svg height="30" width="200">
+ <text id=second x="0" y="15">first</text>
+ </svg>
+</div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastmiscsubtreelayoutshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/misc/subtree-layouts.html (0 => 203415)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/misc/subtree-layouts.html (rev 0)
+++ trunk/LayoutTests/fast/misc/subtree-layouts.html 2016-07-19 20:10:02 UTC (rev 203415)
</span><span class="lines">@@ -0,0 +1,34 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests that we layout both subtrees when they change the same time with selection on.</title>
+</head>
+<body>
+<div>
+ <svg height="30" width="200">
+ <text id=first x="0" y="15">first</text>
+ </svg>
+</div>
+<div>
+ <svg height="30" width="200">
+ <text id=second x="0" y="15">second</text>
+ </svg>
+</div>
+
+<script>
+if (window.testRunner)
+ testRunner.waitUntilDone();
+var selection = window.getSelection();
+var range = document.createRange();
+range.selectNodeContents(document.getElementById("second"));
+selection.addRange(range);
+
+setTimeout(function() {
+ document.getElementById("first").textContent = "second";
+ document.getElementById("second").textContent = "first";
+ if (window.testRunner)
+ testRunner.notifyDone();
+}, 0);
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (203414 => 203415)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-07-19 20:07:38 UTC (rev 203414)
+++ trunk/Source/WebCore/ChangeLog 2016-07-19 20:10:02 UTC (rev 203415)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2016-07-19 Zalan Bujtas <zalan@apple.com>
+
+ theguardian.co.uk crossword puzzles are sometimes not displaying text
+ https://bugs.webkit.org/show_bug.cgi?id=159924
+ <rdar://problem/27409483>
+
+ Reviewed by Simon Fraser.
+
+ This patch fixes the case when
+ - 2 disjoint subtrees are dirty
+ - RenderView is also dirty.
+ and we end up not laying out one of the 2 subtrees.
+
+ In FrameView::scheduleRelayoutOfSubtree, we assume that when the RenderView is dirty
+ we already have a pending full layout which means that any previous subtree layouts have already been
+ converted to full layouts.
+ However this assumption is incorrect. RenderView can get dirty without checking if there's
+ already a pending subtree layout.
+ One option to solve this problem would be to override RenderObject::setNeedsLayout in RenderView
+ so that when the RenderView gets dirty, we could also convert any pending subtree layout to full layout.
+ However RenderObject::setNeedsLayout is a hot function and making it virtual would impact performance.
+ The other option is to always normalize subtree layouts in FrameView::scheduleRelayoutOfSubtree().
+ This patch implements the second option.
+
+ Test: fast/misc/subtree-layouts.html
+
+ * page/FrameView.cpp:
+ (WebCore::FrameView::scheduleRelayoutOfSubtree):
+
</ins><span class="cx"> 2016-07-19 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Some payment authorization status values should keep the sheet active
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.cpp (203414 => 203415)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.cpp 2016-07-19 20:07:38 UTC (rev 203414)
+++ trunk/Source/WebCore/page/FrameView.cpp 2016-07-19 20:10:02 UTC (rev 203415)
</span><span class="lines">@@ -2737,7 +2737,9 @@
</span><span class="cx"> ASSERT(!renderView.documentBeingDestroyed());
</span><span class="cx"> ASSERT(frame().view() == this);
</span><span class="cx">
</span><del>- if (renderView.needsLayout()) {
</del><ins>+ // When m_layoutRoot is already set, ignore the renderView's needsLayout bit
+ // since we need to resolve the conflict between the m_layoutRoot and newRelayoutRoot layouts.
+ if (renderView.needsLayout() && !m_layoutRoot) {
</ins><span class="cx"> m_layoutRoot = &newRelayoutRoot;
</span><span class="cx"> convertSubtreeLayoutToFullLayout();
</span><span class="cx"> return;
</span></span></pre>
</div>
</div>
</body>
</html>