<!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>[188485] 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/188485">188485</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2015-08-14 13:27:58 -0700 (Fri, 14 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>RenderBlock::simplifiedLayout should pop LayoutStateMaintainer when early returns.
https://bugs.webkit.org/show_bug.cgi?id=148031
Reviewed by Simon Fraser.
LayoutStateMaintainer push/pop calls need to be balanced to ensure layout consistency.
Unable to make a test case for this.
* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::simplifiedLayout):
* rendering/RenderView.h:
(WebCore::LayoutStateMaintainer::~LayoutStateMaintainer): ASSERT the state properly.
(WebCore::LayoutStateMaintainer::push):
(WebCore::LayoutStateMaintainer::pop):
(WebCore::LayoutStateMaintainer::didPush):
(WebCore::LayoutStateMaintainer::LayoutStateMaintainer): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBlockcpp">trunk/Source/WebCore/rendering/RenderBlock.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 (188484 => 188485)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-08-14 20:07:15 UTC (rev 188484)
+++ trunk/Source/WebCore/ChangeLog 2015-08-14 20:27:58 UTC (rev 188485)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2015-08-14 Zalan Bujtas <zalan@apple.com>
+
+ RenderBlock::simplifiedLayout should pop LayoutStateMaintainer when early returns.
+ https://bugs.webkit.org/show_bug.cgi?id=148031
+
+ Reviewed by Simon Fraser.
+
+ LayoutStateMaintainer push/pop calls need to be balanced to ensure layout consistency.
+
+ Unable to make a test case for this.
+
+ * rendering/RenderBlock.cpp:
+ (WebCore::RenderBlock::simplifiedLayout):
+ * rendering/RenderView.h:
+ (WebCore::LayoutStateMaintainer::~LayoutStateMaintainer): ASSERT the state properly.
+ (WebCore::LayoutStateMaintainer::push):
+ (WebCore::LayoutStateMaintainer::pop):
+ (WebCore::LayoutStateMaintainer::didPush):
+ (WebCore::LayoutStateMaintainer::LayoutStateMaintainer): Deleted.
+
</ins><span class="cx"> 2015-08-14 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove a few includes from RenderObject.h
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (188484 => 188485)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlock.cpp 2015-08-14 20:07:15 UTC (rev 188484)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp 2015-08-14 20:27:58 UTC (rev 188485)
</span><span class="lines">@@ -1205,9 +1205,10 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> LayoutStateMaintainer statePusher(view(), *this, locationOffset(), hasTransform() || hasReflection() || style().isFlippedBlocksWritingMode());
</span><del>-
- if (needsPositionedMovementLayout() && !tryLayoutDoingPositionedMovementOnly())
</del><ins>+ if (needsPositionedMovementLayout() && !tryLayoutDoingPositionedMovementOnly()) {
+ statePusher.pop();
</ins><span class="cx"> return false;
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // Lay out positioned descendants or objects that just need to recompute overflow.
</span><span class="cx"> if (needsSimplifiedNormalFlowLayout())
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderView.h (188484 => 188485)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderView.h 2015-08-14 20:07:15 UTC (rev 188484)
+++ trunk/Source/WebCore/rendering/RenderView.h 2015-08-14 20:27:58 UTC (rev 188485)
</span><span class="lines">@@ -387,9 +387,6 @@
</span><span class="cx"> explicit LayoutStateMaintainer(RenderView& view, RenderBox& root, LayoutSize offset, bool disableState = false, LayoutUnit pageHeight = 0, bool pageHeightChanged = false)
</span><span class="cx"> : m_view(view)
</span><span class="cx"> , m_disabled(disableState)
</span><del>- , m_didStart(false)
- , m_didEnd(false)
- , m_didCreateLayoutState(false)
</del><span class="cx"> {
</span><span class="cx"> push(root, offset, pageHeight, pageHeightChanged);
</span><span class="cx"> }
</span><span class="lines">@@ -397,50 +394,47 @@
</span><span class="cx"> // Constructor to maybe push later.
</span><span class="cx"> explicit LayoutStateMaintainer(RenderView& view)
</span><span class="cx"> : m_view(view)
</span><del>- , m_disabled(false)
- , m_didStart(false)
- , m_didEnd(false)
- , m_didCreateLayoutState(false)
</del><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ~LayoutStateMaintainer()
</span><span class="cx"> {
</span><del>- ASSERT(m_didStart == m_didEnd); // if this fires, it means that someone did a push(), but forgot to pop().
</del><ins>+ ASSERT(!m_didCallPush || m_didCallPush == m_didCallPop);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void push(RenderBox& root, LayoutSize offset, LayoutUnit pageHeight = 0, bool pageHeightChanged = false)
</span><span class="cx"> {
</span><del>- ASSERT(!m_didStart);
</del><ins>+ ASSERT(!m_didCallPush);
+ m_didCallPush = true;
</ins><span class="cx"> // We push state even if disabled, because we still need to store layoutDelta
</span><del>- m_didCreateLayoutState = m_view.pushLayoutState(root, offset, pageHeight, pageHeightChanged);
- if (m_disabled && m_didCreateLayoutState)
</del><ins>+ m_didPushLayoutState = m_view.pushLayoutState(root, offset, pageHeight, pageHeightChanged);
+ if (!m_didPushLayoutState)
+ return;
+ if (m_disabled)
</ins><span class="cx"> m_view.disableLayoutState();
</span><del>- m_didStart = true;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void pop()
</span><span class="cx"> {
</span><del>- if (m_didStart) {
- ASSERT(!m_didEnd);
- if (m_didCreateLayoutState) {
- m_view.popLayoutState();
- if (m_disabled)
- m_view.enableLayoutState();
- }
-
- m_didEnd = true;
- }
</del><ins>+ ASSERT(!m_didCallPop);
+ m_didCallPop = true;
+ if (!m_didCallPush)
+ return;
+ if (!m_didPushLayoutState)
+ return;
+ m_view.popLayoutState();
+ if (m_disabled)
+ m_view.enableLayoutState();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- bool didPush() const { return m_didStart; }
</del><ins>+ bool didPush() const { return m_didCallPush; }
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> RenderView& m_view;
</span><del>- bool m_disabled : 1; // true if the offset and clip part of layoutState is disabled
- bool m_didStart : 1; // true if we did a push or disable
- bool m_didEnd : 1; // true if we popped or re-enabled
- bool m_didCreateLayoutState : 1; // true if we actually made a layout state.
</del><ins>+ bool m_disabled { false };
+ bool m_didCallPush { false };
+ bool m_didCallPop { false };
+ bool m_didPushLayoutState { false };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class LayoutStateDisabler {
</span></span></pre>
</div>
</div>
</body>
</html>