<!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>[170291] trunk/Source/WebCore</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/170291">170291</a></dd>
<dt>Author</dt> <dd>stavila@adobe.com</dd>
<dt>Date</dt> <dd>2014-06-23 07:59:48 -0700 (Mon, 23 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION (<a href="http://trac.webkit.org/projects/webkit/changeset/168046">r168046</a>): Incorrect handling of object information in WebCore::RenderFlowThread::removeLineRegionInfo
https://bugs.webkit.org/show_bug.cgi?id=133587
Reviewed by Antti Koivisto.
When an object flowed in multicol is moved from in-flow positioning to out-of-flow positioning,
its information must be removed from the flowthread prior to the change being made.
Otherwise, the flow thread will no longer be its containing block and a reference to it
will not be possible to obtain.
No new tests can be added because the code still hits in an unrelated assertion followed by a null dereference.
The issue was discussed with Antti Koivisto and we decided its better to fix this problem first and
handle the following issue in a separate bug.
* rendering/RenderBlockFlow.cpp:
(WebCore::RenderBlockFlow::styleWillChange):
* rendering/RenderObject.h:
(WebCore::RenderObject::flowThreadContainingBlock):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBlockFlowcpp">trunk/Source/WebCore/rendering/RenderBlockFlow.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderObjecth">trunk/Source/WebCore/rendering/RenderObject.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (170290 => 170291)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2014-06-23 14:59:26 UTC (rev 170290)
+++ trunk/Source/WebCore/ChangeLog        2014-06-23 14:59:48 UTC (rev 170291)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2014-06-23 Radu Stavila <stavila@adobe.com>
+
+ REGRESSION (r168046): Incorrect handling of object information in WebCore::RenderFlowThread::removeLineRegionInfo
+ https://bugs.webkit.org/show_bug.cgi?id=133587
+
+ Reviewed by Antti Koivisto.
+
+ When an object flowed in multicol is moved from in-flow positioning to out-of-flow positioning,
+ its information must be removed from the flowthread prior to the change being made.
+ Otherwise, the flow thread will no longer be its containing block and a reference to it
+ will not be possible to obtain.
+
+ No new tests can be added because the code still hits in an unrelated assertion followed by a null dereference.
+ The issue was discussed with Antti Koivisto and we decided its better to fix this problem first and
+ handle the following issue in a separate bug.
+
+ * rendering/RenderBlockFlow.cpp:
+ (WebCore::RenderBlockFlow::styleWillChange):
+ * rendering/RenderObject.h:
+ (WebCore::RenderObject::flowThreadContainingBlock):
+
</ins><span class="cx"> 2014-06-23 Krzysztof Czech <k.czech@samsung.com>
</span><span class="cx">
</span><span class="cx"> [EFL] Platform support for WebSpeech feature.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockFlowcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlockFlow.cpp (170290 => 170291)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlockFlow.cpp        2014-06-23 14:59:26 UTC (rev 170290)
+++ trunk/Source/WebCore/rendering/RenderBlockFlow.cpp        2014-06-23 14:59:48 UTC (rev 170291)
</span><span class="lines">@@ -1981,9 +1981,22 @@
</span><span class="cx"> const RenderStyle* oldStyle = hasInitializedStyle() ? &style() : nullptr;
</span><span class="cx"> s_canPropagateFloatIntoSibling = oldStyle ? !isFloatingOrOutOfFlowPositioned() && !avoidsFloats() : false;
</span><span class="cx">
</span><del>- if (oldStyle && parent() && diff == StyleDifferenceLayout && oldStyle->position() != newStyle.position()) {
- if (containsFloats() && !isFloating() && !isOutOfFlowPositioned() && newStyle.hasOutOfFlowPosition())
- markAllDescendantsWithFloatsForLayout();
</del><ins>+ if (oldStyle) {
+ EPosition oldPosition = oldStyle->position();
+ EPosition newPosition = newStyle.position();
+
+ if (parent() && diff == StyleDifferenceLayout && oldPosition != newPosition) {
+ if (containsFloats() && !isFloating() && !isOutOfFlowPositioned() && newStyle.hasOutOfFlowPosition())
+ markAllDescendantsWithFloatsForLayout();
+
+ // If this block is inside a multicol and is moving from in-flow positioning to out-of-flow positioning,
+ // remove its info (such as lines-to-region mapping) from the flowthread because it won't be able to do it later.
+ // The flowthread will no longer be in its containing block chain and, as such, flowThreadContainingBlock will return null.
+ if (RenderFlowThread* flowThread = flowThreadContainingBlock(SkipFlowThreadCache)) {
+ if (flowThread->isRenderMultiColumnFlowThread() && !isOutOfFlowPositioned() && (newPosition == AbsolutePosition || newPosition == FixedPosition))
+ flowThread->removeFlowChildInfo(this);
+ }
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RenderBlock::styleWillChange(diff, newStyle);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderObject.h (170290 => 170291)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderObject.h        2014-06-23 14:59:26 UTC (rev 170290)
+++ trunk/Source/WebCore/rendering/RenderObject.h        2014-06-23 14:59:48 UTC (rev 170291)
</span><span class="lines">@@ -210,13 +210,19 @@
</span><span class="cx"> RenderBoxModelObject& enclosingBoxModelObject() const;
</span><span class="cx">
</span><span class="cx"> bool fixedPositionedWithNamedFlowContainingBlock() const;
</span><ins>+
+ enum ShouldUseFlowThreadCache {
+ UseFlowThreadCache,
+ SkipFlowThreadCache
+ };
+
</ins><span class="cx"> // Function to return our enclosing flow thread if we are contained inside one. This
</span><span class="cx"> // function follows the containing block chain.
</span><del>- RenderFlowThread* flowThreadContainingBlock() const
</del><ins>+ RenderFlowThread* flowThreadContainingBlock(ShouldUseFlowThreadCache useCache = UseFlowThreadCache) const
</ins><span class="cx"> {
</span><span class="cx"> if (flowThreadState() == NotInsideFlowThread)
</span><span class="cx"> return 0;
</span><del>- return locateFlowThreadContainingBlock();
</del><ins>+ return (useCache == SkipFlowThreadCache) ? locateFlowThreadContainingBlockNoCache() : locateFlowThreadContainingBlock();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RenderNamedFlowFragment* currentRenderNamedFlowFragment() const;
</span></span></pre>
</div>
</div>
</body>
</html>