<!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>[166631] 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/166631">166631</a></dd>
<dt>Author</dt> <dd>abucur@adobe.com</dd>
<dt>Date</dt> <dd>2014-04-01 22:36:54 -0700 (Tue, 01 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CSS Regions] Simplify the RenderFlowThread state pusher
https://bugs.webkit.org/show_bug.cgi?id=131035
Reviewed by David Hyatt.
The RenderFlowThread state pusher is desynchronized from the RenderView layout state pusher
by one renderer. This patch fixes the anomaly by correctly ordering the push and pop operations
between the two systems.
Tests: no functional change, no new tests.
* rendering/RenderFlowThread.cpp:
(WebCore::RenderFlowThread::pushFlowThreadLayoutState):
(WebCore::RenderFlowThread::popFlowThreadLayoutState):
(WebCore::RenderFlowThread::offsetFromLogicalTopOfFirstRegion):
* rendering/RenderView.cpp:
(WebCore::RenderView::pushLayoutState):
* rendering/RenderView.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderFlowThreadcpp">trunk/Source/WebCore/rendering/RenderFlowThread.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderViewcpp">trunk/Source/WebCore/rendering/RenderView.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderViewh">trunk/Source/WebCore/rendering/RenderView.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (166630 => 166631)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-04-02 04:49:28 UTC (rev 166630)
+++ trunk/Source/WebCore/ChangeLog 2014-04-02 05:36:54 UTC (rev 166631)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2014-04-01 Andrei Bucur <abucur@adobe.com>
+
+ [CSS Regions] Simplify the RenderFlowThread state pusher
+ https://bugs.webkit.org/show_bug.cgi?id=131035
+
+ Reviewed by David Hyatt.
+
+ The RenderFlowThread state pusher is desynchronized from the RenderView layout state pusher
+ by one renderer. This patch fixes the anomaly by correctly ordering the push and pop operations
+ between the two systems.
+
+ Tests: no functional change, no new tests.
+
+ * rendering/RenderFlowThread.cpp:
+ (WebCore::RenderFlowThread::pushFlowThreadLayoutState):
+ (WebCore::RenderFlowThread::popFlowThreadLayoutState):
+ (WebCore::RenderFlowThread::offsetFromLogicalTopOfFirstRegion):
+ * rendering/RenderView.cpp:
+ (WebCore::RenderView::pushLayoutState):
+ * rendering/RenderView.h:
+
</ins><span class="cx"> 2014-04-01 Beth Dakin <bdakin@apple.com>
</span><span class="cx">
</span><span class="cx"> willReveal edge events should be hooked up for overflow:scroll
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderFlowThreadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderFlowThread.cpp (166630 => 166631)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderFlowThread.cpp 2014-04-02 04:49:28 UTC (rev 166630)
+++ trunk/Source/WebCore/rendering/RenderFlowThread.cpp 2014-04-02 05:36:54 UTC (rev 166631)
</span><span class="lines">@@ -1144,6 +1144,8 @@
</span><span class="cx">
</span><span class="cx"> void RenderFlowThread::pushFlowThreadLayoutState(const RenderObject& object)
</span><span class="cx"> {
</span><ins>+ m_activeObjectsStack.add(&object);
+
</ins><span class="cx"> if (const RenderBox* currentBoxDescendant = currentActiveRenderBox()) {
</span><span class="cx"> LayoutState* layoutState = currentBoxDescendant->view().layoutState();
</span><span class="cx"> if (layoutState && layoutState->isPaginated()) {
</span><span class="lines">@@ -1152,19 +1154,17 @@
</span><span class="cx"> setOffsetFromLogicalTopOfFirstRegion(currentBoxDescendant, currentBoxDescendant->isHorizontalWritingMode() ? offsetDelta.height() : offsetDelta.width());
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
- m_activeObjectsStack.add(&object);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderFlowThread::popFlowThreadLayoutState()
</span><span class="cx"> {
</span><del>- m_activeObjectsStack.removeLast();
-
</del><span class="cx"> if (const RenderBox* currentBoxDescendant = currentActiveRenderBox()) {
</span><span class="cx"> LayoutState* layoutState = currentBoxDescendant->view().layoutState();
</span><span class="cx"> if (layoutState && layoutState->isPaginated())
</span><span class="cx"> clearOffsetFromLogicalTopOfFirstRegion(currentBoxDescendant);
</span><span class="cx"> }
</span><ins>+
+ m_activeObjectsStack.removeLast();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> LayoutUnit RenderFlowThread::offsetFromLogicalTopOfFirstRegion(const RenderBlock* currentBlock) const
</span><span class="lines">@@ -1174,16 +1174,6 @@
</span><span class="cx"> if (hasCachedOffsetFromLogicalTopOfFirstRegion(currentBlock))
</span><span class="cx"> return cachedOffsetFromLogicalTopOfFirstRegion(currentBlock);
</span><span class="cx">
</span><del>- // If it's the current box being laid out, use the layout state.
- const RenderBox* currentBoxDescendant = currentActiveRenderBox();
- if (currentBlock == currentBoxDescendant) {
- LayoutState* layoutState = view().layoutState();
- ASSERT(layoutState->m_renderer == currentBlock);
- ASSERT(layoutState && layoutState->isPaginated());
- LayoutSize offsetDelta = layoutState->m_layoutOffset - layoutState->m_pageOffset;
- return currentBoxDescendant->isHorizontalWritingMode() ? offsetDelta.height() : offsetDelta.width();
- }
-
</del><span class="cx"> // As a last resort, take the slow path.
</span><span class="cx"> LayoutRect blockRect(0, 0, currentBlock->width(), currentBlock->height());
</span><span class="cx"> while (currentBlock && !currentBlock->isRenderFlowThread()) {
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderView.cpp (166630 => 166631)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderView.cpp 2014-04-02 04:49:28 UTC (rev 166630)
+++ trunk/Source/WebCore/rendering/RenderView.cpp 2014-04-02 05:36:54 UTC (rev 166631)
</span><span class="lines">@@ -1019,8 +1019,8 @@
</span><span class="cx"> ASSERT(m_layoutStateDisableCount == 0);
</span><span class="cx"> ASSERT(m_layoutState == 0);
</span><span class="cx">
</span><ins>+ m_layoutState = std::make_unique<LayoutState>(root);
</ins><span class="cx"> pushLayoutStateForCurrentFlowThread(root);
</span><del>- m_layoutState = std::make_unique<LayoutState>(root);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool RenderView::shouldDisableLayoutStateForSubtree(RenderObject* renderer) const
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderView.h (166630 => 166631)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderView.h 2014-04-02 04:49:28 UTC (rev 166630)
+++ trunk/Source/WebCore/rendering/RenderView.h 2014-04-02 05:36:54 UTC (rev 166631)
</span><span class="lines">@@ -253,8 +253,8 @@
</span><span class="cx"> // We push LayoutState even if layoutState is disabled because it stores layoutDelta too.
</span><span class="cx"> if (!doingFullRepaint() || m_layoutState->isPaginated() || renderer.hasColumns() || renderer.flowThreadContainingBlock()
</span><span class="cx"> || m_layoutState->lineGrid() || (renderer.style().lineGrid() != RenderStyle::initialLineGrid() && renderer.isRenderBlockFlow())) {
</span><ins>+ m_layoutState = std::make_unique<LayoutState>(std::move(m_layoutState), &renderer, offset, pageHeight, pageHeightChanged, colInfo);
</ins><span class="cx"> pushLayoutStateForCurrentFlowThread(renderer);
</span><del>- m_layoutState = std::make_unique<LayoutState>(std::move(m_layoutState), &renderer, offset, pageHeight, pageHeightChanged, colInfo);
</del><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx"> return false;
</span><span class="lines">@@ -262,8 +262,8 @@
</span><span class="cx">
</span><span class="cx"> void popLayoutState()
</span><span class="cx"> {
</span><ins>+ popLayoutStateForCurrentFlowThread();
</ins><span class="cx"> m_layoutState = std::move(m_layoutState->m_next);
</span><del>- popLayoutStateForCurrentFlowThread();
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Suspends the LayoutState optimization. Used under transforms that cannot be represented by
</span></span></pre>
</div>
</div>
</body>
</html>