<!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>[168971] 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/168971">168971</a></dd>
<dt>Author</dt> <dd>stavila@adobe.com</dd>
<dt>Date</dt> <dd>2014-05-16 11:26:24 -0700 (Fri, 16 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CSS Regions] Add ASSERT to make sure using the flowThread cache does not return incorrect results
https://bugs.webkit.org/show_bug.cgi?id=132906
Reviewed by Simon Fraser.
If flowThreadContainingBlock() is called on an object which is in a different
flow thread than the one currently being laid out, this method will return an incorrect
result. I added an assertion for that to make sure we catch and treat any such scenarios.
For the moment, this assertion is only validated for regions, as multicol still has some issues.
No new tests required.
* rendering/RenderObject.cpp:
(WebCore::RenderObject::locateFlowThreadContainingBlockNoCache):
(WebCore::RenderObject::locateFlowThreadContainingBlock):
* rendering/RenderObject.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderObjectcpp">trunk/Source/WebCore/rendering/RenderObject.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 (168970 => 168971)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-05-16 17:07:09 UTC (rev 168970)
+++ trunk/Source/WebCore/ChangeLog 2014-05-16 18:26:24 UTC (rev 168971)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2014-05-16 Radu Stavila <stavila@adobe.com>
+
+ [CSS Regions] Add ASSERT to make sure using the flowThread cache does not return incorrect results
+ https://bugs.webkit.org/show_bug.cgi?id=132906
+
+ Reviewed by Simon Fraser.
+
+ If flowThreadContainingBlock() is called on an object which is in a different
+ flow thread than the one currently being laid out, this method will return an incorrect
+ result. I added an assertion for that to make sure we catch and treat any such scenarios.
+ For the moment, this assertion is only validated for regions, as multicol still has some issues.
+
+ No new tests required.
+
+ * rendering/RenderObject.cpp:
+ (WebCore::RenderObject::locateFlowThreadContainingBlockNoCache):
+ (WebCore::RenderObject::locateFlowThreadContainingBlock):
+ * rendering/RenderObject.h:
+
</ins><span class="cx"> 2014-05-16 Martin Hock <mhock@apple.com>
</span><span class="cx">
</span><span class="cx"> MemoryCache::addImageToCache should return the result of add().
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderObject.cpp (168970 => 168971)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderObject.cpp 2014-05-16 17:07:09 UTC (rev 168970)
+++ trunk/Source/WebCore/rendering/RenderObject.cpp 2014-05-16 18:26:24 UTC (rev 168971)
</span><span class="lines">@@ -523,16 +523,10 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RenderFlowThread* RenderObject::locateFlowThreadContainingBlock() const
</del><ins>+RenderFlowThread* RenderObject::locateFlowThreadContainingBlockNoCache() const
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(flowThreadState() != NotInsideFlowThread);
</span><span class="cx">
</span><del>- // See if we have the thread cached because we're in the middle of layout.
- RenderFlowThread* flowThread = view().flowThreadController().currentRenderFlowThread();
- if (flowThread && (flowThreadState() == flowThread->flowThreadState()))
- return flowThread;
-
- // Not in the middle of layout so have to find the thread the slow way.
</del><span class="cx"> RenderObject* curr = const_cast<RenderObject*>(this);
</span><span class="cx"> while (curr) {
</span><span class="cx"> if (curr->isRenderFlowThread())
</span><span class="lines">@@ -542,6 +536,25 @@
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+RenderFlowThread* RenderObject::locateFlowThreadContainingBlock() const
+{
+ ASSERT(flowThreadState() != NotInsideFlowThread);
+
+ // See if we have the thread cached because we're in the middle of layout.
+ RenderFlowThread* flowThread = view().flowThreadController().currentRenderFlowThread();
+ if (flowThread && (flowThreadState() == flowThread->flowThreadState())) {
+ // Make sure the slow path would return the same result as our cache.
+ // FIXME: For the moment, only apply this assertion to regions, as multicol
+ // still has some issues and triggers this assert.
+ // Created https://bugs.webkit.org/show_bug.cgi?id=132946 for this issue.
+ ASSERT(!flowThread->isRenderNamedFlowThread() || flowThread == locateFlowThreadContainingBlockNoCache());
+ return flowThread;
+ }
+
+ // Not in the middle of layout so have to find the thread the slow way.
+ return locateFlowThreadContainingBlockNoCache();
+}
+
</ins><span class="cx"> RenderBlock* RenderObject::firstLineBlock() const
</span><span class="cx"> {
</span><span class="cx"> return 0;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderObject.h (168970 => 168971)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderObject.h 2014-05-16 17:07:09 UTC (rev 168970)
+++ trunk/Source/WebCore/rendering/RenderObject.h 2014-05-16 18:26:24 UTC (rev 168971)
</span><span class="lines">@@ -891,6 +891,8 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> RenderFlowThread* locateFlowThreadContainingBlock() const;
</span><ins>+ RenderFlowThread* locateFlowThreadContainingBlockNoCache() const;
+
</ins><span class="cx"> void removeFromRenderFlowThread();
</span><span class="cx"> void removeFromRenderFlowThreadRecursive(RenderFlowThread*);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>