<!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>[178689] 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/178689">178689</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-01-19 19:43:00 -0800 (Mon, 19 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/178683">r178683</a>.
https://bugs.webkit.org/show_bug.cgi?id=140657
Lots of asserts in tests. (Requested by JoePeck on #webkit).
Reverted changeset:
"LayoutState and subtree layout code should use
RenderElement."
https://bugs.webkit.org/show_bug.cgi?id=126878
http://trac.webkit.org/changeset/178683</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorTimelineAgentcpp">trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp</a></li>
<li><a href="#trunkSourceWebCorepageFrameViewcpp">trunk/Source/WebCore/page/FrameView.cpp</a></li>
<li><a href="#trunkSourceWebCorepageFrameViewh">trunk/Source/WebCore/page/FrameView.h</a></li>
<li><a href="#trunkSourceWebCorerenderingLayoutStatecpp">trunk/Source/WebCore/rendering/LayoutState.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingLayoutStateh">trunk/Source/WebCore/rendering/LayoutState.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderElementcpp">trunk/Source/WebCore/rendering/RenderElement.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>
<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 (178688 => 178689)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-01-20 03:38:56 UTC (rev 178688)
+++ trunk/Source/WebCore/ChangeLog 2015-01-20 03:43:00 UTC (rev 178689)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-01-19 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r178683.
+ https://bugs.webkit.org/show_bug.cgi?id=140657
+
+ Lots of asserts in tests. (Requested by JoePeck on #webkit).
+
+ Reverted changeset:
+
+ "LayoutState and subtree layout code should use
+ RenderElement."
+ https://bugs.webkit.org/show_bug.cgi?id=126878
+ http://trac.webkit.org/changeset/178683
+
</ins><span class="cx"> 2015-01-19 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [Win] Unreviewed gardening.
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorTimelineAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp (178688 => 178689)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp 2015-01-20 03:38:56 UTC (rev 178688)
+++ trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp 2015-01-20 03:43:00 UTC (rev 178689)
</span><span class="lines">@@ -282,7 +282,7 @@
</span><span class="cx">
</span><span class="cx"> void InspectorTimelineAgent::willLayout(Frame& frame)
</span><span class="cx"> {
</span><del>- RenderElement* root = frame.view()->layoutRoot();
</del><ins>+ RenderObject* root = frame.view()->layoutRoot();
</ins><span class="cx"> bool partialLayout = !!root;
</span><span class="cx">
</span><span class="cx"> if (!partialLayout)
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.cpp (178688 => 178689)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.cpp 2015-01-20 03:38:56 UTC (rev 178688)
+++ trunk/Source/WebCore/page/FrameView.cpp 2015-01-20 03:43:00 UTC (rev 178689)
</span><span class="lines">@@ -1083,9 +1083,9 @@
</span><span class="cx"> renderView->setIsInWindow(isInWindow);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RenderElement* FrameView::layoutRoot(bool onlyDuringLayout) const
</del><ins>+RenderObject* FrameView::layoutRoot(bool onlyDuringLayout) const
</ins><span class="cx"> {
</span><del>- return onlyDuringLayout && layoutPending() ? nullptr : m_layoutRoot;
</del><ins>+ return onlyDuringLayout && layoutPending() ? 0 : m_layoutRoot;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline void FrameView::forceLayoutParentViewIfNeeded()
</span><span class="lines">@@ -1301,7 +1301,7 @@
</span><span class="cx">
</span><span class="cx"> bool disableLayoutState = false;
</span><span class="cx"> if (subtree) {
</span><del>- disableLayoutState = root->view().shouldDisableLayoutStateForSubtree(*root);
</del><ins>+ disableLayoutState = root->view().shouldDisableLayoutStateForSubtree(root);
</ins><span class="cx"> root->view().pushLayoutState(*root);
</span><span class="cx"> }
</span><span class="cx"> LayoutStateDisabler layoutStateDisabler(disableLayoutState ? &root->view() : 0);
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.h (178688 => 178689)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.h 2015-01-20 03:38:56 UTC (rev 178688)
+++ trunk/Source/WebCore/page/FrameView.h 2015-01-20 03:43:00 UTC (rev 178689)
</span><span class="lines">@@ -114,7 +114,7 @@
</span><span class="cx"> bool layoutPending() const;
</span><span class="cx"> bool isInLayout() const { return m_layoutPhase == InLayout; }
</span><span class="cx">
</span><del>- RenderElement* layoutRoot(bool onlyDuringLayout = false) const;
</del><ins>+ RenderObject* layoutRoot(bool onlyDuringLayout = false) const;
</ins><span class="cx"> void clearLayoutRoot() { m_layoutRoot = nullptr; }
</span><span class="cx"> int layoutCount() const { return m_layoutCount; }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingLayoutStatecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/LayoutState.cpp (178688 => 178689)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/LayoutState.cpp 2015-01-20 03:38:56 UTC (rev 178688)
+++ trunk/Source/WebCore/rendering/LayoutState.cpp 2015-01-20 03:43:00 UTC (rev 178689)
</span><span class="lines">@@ -122,7 +122,7 @@
</span><span class="cx"> // FIXME: <http://bugs.webkit.org/show_bug.cgi?id=13443> Apply control clip if present.
</span><span class="cx"> }
</span><span class="cx">
</span><del>-LayoutState::LayoutState(RenderElement& root)
</del><ins>+LayoutState::LayoutState(RenderObject& root)
</ins><span class="cx"> : m_clipped(false)
</span><span class="cx"> , m_isPaginated(false)
</span><span class="cx"> , m_pageLogicalHeightChanged(false)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingLayoutStateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/LayoutState.h (178688 => 178689)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/LayoutState.h 2015-01-20 03:38:56 UTC (rev 178688)
+++ trunk/Source/WebCore/rendering/LayoutState.h 2015-01-20 03:43:00 UTC (rev 178689)
</span><span class="lines">@@ -37,6 +37,7 @@
</span><span class="cx"> class RenderBox;
</span><span class="cx"> class RenderElement;
</span><span class="cx"> class RenderFlowThread;
</span><ins>+class RenderObject;
</ins><span class="cx"> class ShapeInsideInfo;
</span><span class="cx">
</span><span class="cx"> class LayoutState {
</span><span class="lines">@@ -60,7 +61,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> LayoutState(std::unique_ptr<LayoutState>, RenderBox*, const LayoutSize& offset, LayoutUnit pageHeight, bool pageHeightChanged);
</span><del>- explicit LayoutState(RenderElement&);
</del><ins>+ explicit LayoutState(RenderObject&);
</ins><span class="cx">
</span><span class="cx"> void clearPaginationInformation();
</span><span class="cx"> bool isPaginated() const { return m_isPaginated; }
</span><span class="lines">@@ -128,7 +129,7 @@
</span><span class="cx"> RenderFlowThread* m_currentRenderFlowThread { nullptr };
</span><span class="cx">
</span><span class="cx"> #ifndef NDEBUG
</span><del>- RenderElement* m_renderer;
</del><ins>+ RenderObject* m_renderer;
</ins><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderElement.cpp (178688 => 178689)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderElement.cpp 2015-01-20 03:38:56 UTC (rev 178688)
+++ trunk/Source/WebCore/rendering/RenderElement.cpp 2015-01-20 03:43:00 UTC (rev 178689)
</span><span class="lines">@@ -1064,14 +1064,6 @@
</span><span class="cx"> if (hasCounterNodeMap())
</span><span class="cx"> RenderCounter::destroyCounterNodes(*this);
</span><span class="cx">
</span><del>- if (!documentBeingDestroyed() && view().frameView().layoutRoot() == this) {
- ASSERT_NOT_REACHED();
- // This indicates a failure to layout the child, which is why
- // the layout root is still set to |this|. Make sure to clear it
- // since we are getting destroyed.
- view().frameView().clearLayoutRoot();
- }
-
</del><span class="cx"> RenderObject::willBeDestroyed();
</span><span class="cx">
</span><span class="cx"> #if !ASSERT_DISABLED
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderObject.cpp (178688 => 178689)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderObject.cpp 2015-01-20 03:38:56 UTC (rev 178688)
+++ trunk/Source/WebCore/rendering/RenderObject.cpp 2015-01-20 03:43:00 UTC (rev 178689)
</span><span class="lines">@@ -1865,6 +1865,20 @@
</span><span class="cx"> || view().selectionUnsplitEnd() == this;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+inline void RenderObject::clearLayoutRootIfNeeded() const
+{
+ if (documentBeingDestroyed())
+ return;
+
+ if (view().frameView().layoutRoot() == this) {
+ ASSERT_NOT_REACHED();
+ // This indicates a failure to layout the child, which is why
+ // the layout root is still set to |this|. Make sure to clear it
+ // since we are getting destroyed.
+ view().frameView().clearLayoutRoot();
+ }
+}
+
</ins><span class="cx"> void RenderObject::willBeDestroyed()
</span><span class="cx"> {
</span><span class="cx"> // For accessibility management, notify the parent of the imminent change to its child set.
</span><span class="lines">@@ -1887,6 +1901,8 @@
</span><span class="cx"> setHasLayer(false);
</span><span class="cx"> downcast<RenderLayerModelObject>(*this).destroyLayer();
</span><span class="cx"> }
</span><ins>+
+ clearLayoutRootIfNeeded();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderObject::insertedIntoTree()
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderObject.h (178688 => 178689)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderObject.h 2015-01-20 03:38:56 UTC (rev 178688)
+++ trunk/Source/WebCore/rendering/RenderObject.h 2015-01-20 03:43:00 UTC (rev 178689)
</span><span class="lines">@@ -856,6 +856,7 @@
</span><span class="cx">
</span><span class="cx"> void adjustRectForOutlineAndShadow(LayoutRect&) const;
</span><span class="cx">
</span><ins>+ void clearLayoutRootIfNeeded() const;
</ins><span class="cx"> virtual void willBeDestroyed();
</span><span class="cx">
</span><span class="cx"> virtual void insertedIntoTree();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderView.cpp (178688 => 178689)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderView.cpp 2015-01-20 03:38:56 UTC (rev 178688)
+++ trunk/Source/WebCore/rendering/RenderView.cpp 2015-01-20 03:43:00 UTC (rev 178689)
</span><span class="lines">@@ -1186,7 +1186,7 @@
</span><span class="cx"> return frameView().frame().pageZoomFactor();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderView::pushLayoutState(RenderElement& root)
</del><ins>+void RenderView::pushLayoutState(RenderObject& root)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(m_layoutStateDisableCount == 0);
</span><span class="cx"> ASSERT(m_layoutState == 0);
</span><span class="lines">@@ -1195,9 +1195,9 @@
</span><span class="cx"> pushLayoutStateForCurrentFlowThread(root);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderView::shouldDisableLayoutStateForSubtree(const RenderElement& renderer) const
</del><ins>+bool RenderView::shouldDisableLayoutStateForSubtree(RenderObject* renderer) const
</ins><span class="cx"> {
</span><del>- const RenderElement* o = &renderer;
</del><ins>+ RenderObject* o = renderer;
</ins><span class="cx"> while (o) {
</span><span class="cx"> if (o->hasTransform() || o->hasReflection())
</span><span class="cx"> return true;
</span><span class="lines">@@ -1300,18 +1300,18 @@
</span><span class="cx"> return *m_flowThreadController;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderView::pushLayoutStateForCurrentFlowThread(const RenderElement& renderer)
</del><ins>+void RenderView::pushLayoutStateForCurrentFlowThread(const RenderObject& object)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_flowThreadController)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- RenderFlowThread* currentFlowThread = renderer.flowThreadContainingBlock();
</del><ins>+ RenderFlowThread* currentFlowThread = object.flowThreadContainingBlock();
</ins><span class="cx"> if (!currentFlowThread)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> m_layoutState->setCurrentRenderFlowThread(currentFlowThread);
</span><span class="cx">
</span><del>- currentFlowThread->pushFlowThreadLayoutState(renderer);
</del><ins>+ currentFlowThread->pushFlowThreadLayoutState(object);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderView::popLayoutStateForCurrentFlowThread()
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderView.h (178688 => 178689)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderView.h 2015-01-20 03:38:56 UTC (rev 178688)
+++ trunk/Source/WebCore/rendering/RenderView.h 2015-01-20 03:43:00 UTC (rev 178689)
</span><span class="lines">@@ -137,10 +137,10 @@
</span><span class="cx"> bool doingFullRepaint() const { return frameView().needsFullRepaint(); }
</span><span class="cx">
</span><span class="cx"> // Subtree push/pop
</span><del>- void pushLayoutState(RenderElement&);
- void popLayoutState(RenderElement&) { return popLayoutState(); } // Just doing this to keep popLayoutState() private and to make the subtree calls symmetrical.
</del><ins>+ void pushLayoutState(RenderObject&);
+ void popLayoutState(RenderObject&) { return popLayoutState(); } // Just doing this to keep popLayoutState() private and to make the subtree calls symmetrical.
</ins><span class="cx">
</span><del>- bool shouldDisableLayoutStateForSubtree(const RenderElement&) const;
</del><ins>+ bool shouldDisableLayoutStateForSubtree(RenderObject*) const;
</ins><span class="cx">
</span><span class="cx"> // Returns true if layoutState should be used for its cached offset and clip.
</span><span class="cx"> bool layoutStateEnabled() const { return m_layoutStateDisableCount == 0 && m_layoutState; }
</span><span class="lines">@@ -290,7 +290,7 @@
</span><span class="cx"> void checkLayoutState(const LayoutState&);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- void pushLayoutStateForCurrentFlowThread(const RenderElement&);
</del><ins>+ void pushLayoutStateForCurrentFlowThread(const RenderObject&);
</ins><span class="cx"> void popLayoutStateForCurrentFlowThread();
</span><span class="cx">
</span><span class="cx"> friend class LayoutStateMaintainer;
</span></span></pre>
</div>
</div>
</body>
</html>