<!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>[187493] 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/187493">187493</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2015-07-28 11:22:53 -0700 (Tue, 28 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Change markContainingBlocksForLayout() to take an enum, rather than a bool
https://bugs.webkit.org/show_bug.cgi?id=147345
Reviewed by Daniel Bates.
Change markContainingBlocksForLayout to take an enum class for the scheduleRelayout
argument, for better code readability.
* page/FrameView.cpp:
(WebCore::FrameView::layout):
(WebCore::FrameView::scheduleRelayout):
(WebCore::FrameView::scheduleRelayoutOfSubtree):
* rendering/RenderObject.cpp:
(WebCore::RenderObject::markContainingBlocksForLayout):
* rendering/RenderObject.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepageFrameViewcpp">trunk/Source/WebCore/page/FrameView.cpp</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 (187492 => 187493)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-07-28 18:22:00 UTC (rev 187492)
+++ trunk/Source/WebCore/ChangeLog 2015-07-28 18:22:53 UTC (rev 187493)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2015-07-28 Simon Fraser <simon.fraser@apple.com>
+
+ Change markContainingBlocksForLayout() to take an enum, rather than a bool
+ https://bugs.webkit.org/show_bug.cgi?id=147345
+
+ Reviewed by Daniel Bates.
+
+ Change markContainingBlocksForLayout to take an enum class for the scheduleRelayout
+ argument, for better code readability.
+
+ * page/FrameView.cpp:
+ (WebCore::FrameView::layout):
+ (WebCore::FrameView::scheduleRelayout):
+ (WebCore::FrameView::scheduleRelayoutOfSubtree):
+ * rendering/RenderObject.cpp:
+ (WebCore::RenderObject::markContainingBlocksForLayout):
+ * rendering/RenderObject.h:
+
</ins><span class="cx"> 2015-07-27 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> PathApplierFunction should take a reference to a PathElement
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.cpp (187492 => 187493)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.cpp 2015-07-28 18:22:00 UTC (rev 187492)
+++ trunk/Source/WebCore/page/FrameView.cpp 2015-07-28 18:22:53 UTC (rev 187493)
</span><span class="lines">@@ -1213,7 +1213,7 @@
</span><span class="cx"> AnimationUpdateBlock animationUpdateBlock(&frame().animation());
</span><span class="cx">
</span><span class="cx"> if (!allowSubtree && m_layoutRoot) {
</span><del>- m_layoutRoot->markContainingBlocksForLayout(false);
</del><ins>+ m_layoutRoot->markContainingBlocksForLayout(ScheduleRelayout::No);
</ins><span class="cx"> m_layoutRoot = nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2550,7 +2550,7 @@
</span><span class="cx"> ASSERT(frame().view() == this);
</span><span class="cx">
</span><span class="cx"> if (m_layoutRoot) {
</span><del>- m_layoutRoot->markContainingBlocksForLayout(false);
</del><ins>+ m_layoutRoot->markContainingBlocksForLayout(ScheduleRelayout::No);
</ins><span class="cx"> m_layoutRoot = nullptr;
</span><span class="cx"> }
</span><span class="cx"> if (!m_layoutSchedulingEnabled)
</span><span class="lines">@@ -2600,7 +2600,7 @@
</span><span class="cx"> ASSERT(frame().view() == this);
</span><span class="cx">
</span><span class="cx"> if (renderView.needsLayout()) {
</span><del>- newRelayoutRoot.markContainingBlocksForLayout(false);
</del><ins>+ newRelayoutRoot.markContainingBlocksForLayout(ScheduleRelayout::No);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2619,21 +2619,21 @@
</span><span class="cx">
</span><span class="cx"> if (!m_layoutRoot) {
</span><span class="cx"> // Just relayout the subtree.
</span><del>- newRelayoutRoot.markContainingBlocksForLayout(false);
</del><ins>+ newRelayoutRoot.markContainingBlocksForLayout(ScheduleRelayout::No);
</ins><span class="cx"> InspectorInstrumentation::didInvalidateLayout(frame());
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (isObjectAncestorContainerOf(m_layoutRoot, &newRelayoutRoot)) {
</span><span class="cx"> // Keep the current root.
</span><del>- newRelayoutRoot.markContainingBlocksForLayout(false, m_layoutRoot);
</del><ins>+ newRelayoutRoot.markContainingBlocksForLayout(ScheduleRelayout::No, m_layoutRoot);
</ins><span class="cx"> ASSERT(!m_layoutRoot->container() || !m_layoutRoot->container()->needsLayout());
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (isObjectAncestorContainerOf(&newRelayoutRoot, m_layoutRoot)) {
</span><span class="cx"> // Re-root at newRelayoutRoot.
</span><del>- m_layoutRoot->markContainingBlocksForLayout(false, &newRelayoutRoot);
</del><ins>+ m_layoutRoot->markContainingBlocksForLayout(ScheduleRelayout::No, &newRelayoutRoot);
</ins><span class="cx"> m_layoutRoot = &newRelayoutRoot;
</span><span class="cx"> ASSERT(!m_layoutRoot->container() || !m_layoutRoot->container()->needsLayout());
</span><span class="cx"> InspectorInstrumentation::didInvalidateLayout(frame());
</span><span class="lines">@@ -2641,9 +2641,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Just do a full relayout.
</span><del>- m_layoutRoot->markContainingBlocksForLayout(false);
</del><ins>+ m_layoutRoot->markContainingBlocksForLayout(ScheduleRelayout::No);
</ins><span class="cx"> m_layoutRoot = nullptr;
</span><del>- newRelayoutRoot.markContainingBlocksForLayout(false);
</del><ins>+ newRelayoutRoot.markContainingBlocksForLayout(ScheduleRelayout::No);
</ins><span class="cx"> InspectorInstrumentation::didInvalidateLayout(frame());
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderObject.cpp (187492 => 187493)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderObject.cpp 2015-07-28 18:22:00 UTC (rev 187492)
+++ trunk/Source/WebCore/rendering/RenderObject.cpp 2015-07-28 18:22:53 UTC (rev 187493)
</span><span class="lines">@@ -580,9 +580,9 @@
</span><span class="cx"> downcast<RenderView>(renderer).frameView().scheduleRelayout();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderObject::markContainingBlocksForLayout(bool scheduleRelayout, RenderElement* newRoot)
</del><ins>+void RenderObject::markContainingBlocksForLayout(ScheduleRelayout scheduleRelayout, RenderElement* newRoot)
</ins><span class="cx"> {
</span><del>- ASSERT(!scheduleRelayout || !newRoot);
</del><ins>+ ASSERT(scheduleRelayout == ScheduleRelayout::No || !newRoot);
</ins><span class="cx"> ASSERT(!isSetNeedsLayoutForbidden());
</span><span class="cx">
</span><span class="cx"> auto ancestor = container();
</span><span class="lines">@@ -626,14 +626,14 @@
</span><span class="cx"> if (ancestor == newRoot)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (scheduleRelayout && objectIsRelayoutBoundary(ancestor))
</del><ins>+ if (scheduleRelayout == ScheduleRelayout::Yes && objectIsRelayoutBoundary(ancestor))
</ins><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> hasOutOfFlowPosition = ancestor->style().hasOutOfFlowPosition();
</span><span class="cx"> ancestor = container;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (scheduleRelayout && ancestor)
</del><ins>+ if (scheduleRelayout == ScheduleRelayout::Yes && ancestor)
</ins><span class="cx"> scheduleRelayoutForSubtree(*ancestor);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderObject.h (187492 => 187493)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderObject.h 2015-07-28 18:22:00 UTC (rev 187492)
+++ trunk/Source/WebCore/rendering/RenderObject.h 2015-07-28 18:22:53 UTC (rev 187493)
</span><span class="lines">@@ -105,6 +105,8 @@
</span><span class="cx"> MarkContainingBlockChain,
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+enum class ScheduleRelayout { No, Yes };
+
</ins><span class="cx"> enum MapCoordinatesMode {
</span><span class="cx"> IsFixed = 1 << 0,
</span><span class="cx"> UseTransforms = 1 << 1,
</span><span class="lines">@@ -590,7 +592,7 @@
</span><span class="cx">
</span><span class="cx"> RenderBoxModelObject* offsetParent() const;
</span><span class="cx">
</span><del>- void markContainingBlocksForLayout(bool scheduleRelayout = true, RenderElement* newRoot = nullptr);
</del><ins>+ void markContainingBlocksForLayout(ScheduleRelayout = ScheduleRelayout::Yes, RenderElement* newRoot = nullptr);
</ins><span class="cx"> void setNeedsLayout(MarkingBehavior = MarkContainingBlockChain);
</span><span class="cx"> void clearNeedsLayout();
</span><span class="cx"> void setPreferredLogicalWidthsDirty(bool, MarkingBehavior = MarkContainingBlockChain);
</span></span></pre>
</div>
</div>
</body>
</html>