<!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>[188163] 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/188163">188163</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2015-08-07 14:25:34 -0700 (Fri, 07 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Subtree layout code should use RenderElement.
https://bugs.webkit.org/show_bug.cgi?id=147694
Reviewed by Simon Fraser.
Subtree layout will never begin at a RenderText, so tighten up
the code to operate on RenderElements instead of RenderObjects.
(This patch is based on webkit.org/b/126878)
No change in functionality.
* inspector/InspectorTimelineAgent.cpp:
(WebCore::InspectorTimelineAgent::willLayout):
* page/FrameView.cpp:
(WebCore::FrameView::FrameView): Deleted.
(WebCore::FrameView::layoutRoot): Deleted.
* page/FrameView.h:
* rendering/RenderBox.cpp:
(WebCore::RenderBox::computeLogicalWidthInRegion):
* rendering/RenderElement.cpp:
(WebCore::RenderElement::clearLayoutRootIfNeeded):
(WebCore::RenderElement::willBeDestroyed):
* rendering/RenderElement.h:
* rendering/RenderObject.cpp:
(WebCore::RenderObject::clearLayoutRootIfNeeded): Deleted.
(WebCore::RenderObject::willBeDestroyed): Deleted.
* rendering/RenderObject.h:</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="#trunkSourceWebCorerenderingRenderBoxcpp">trunk/Source/WebCore/rendering/RenderBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderElementcpp">trunk/Source/WebCore/rendering/RenderElement.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderElementh">trunk/Source/WebCore/rendering/RenderElement.h</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 (188162 => 188163)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-08-07 21:12:47 UTC (rev 188162)
+++ trunk/Source/WebCore/ChangeLog 2015-08-07 21:25:34 UTC (rev 188163)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+2015-08-07 Zalan Bujtas <zalan@apple.com>
+
+ Subtree layout code should use RenderElement.
+ https://bugs.webkit.org/show_bug.cgi?id=147694
+
+ Reviewed by Simon Fraser.
+
+ Subtree layout will never begin at a RenderText, so tighten up
+ the code to operate on RenderElements instead of RenderObjects.
+ (This patch is based on webkit.org/b/126878)
+
+ No change in functionality.
+
+ * inspector/InspectorTimelineAgent.cpp:
+ (WebCore::InspectorTimelineAgent::willLayout):
+ * page/FrameView.cpp:
+ (WebCore::FrameView::FrameView): Deleted.
+ (WebCore::FrameView::layoutRoot): Deleted.
+ * page/FrameView.h:
+ * rendering/RenderBox.cpp:
+ (WebCore::RenderBox::computeLogicalWidthInRegion):
+ * rendering/RenderElement.cpp:
+ (WebCore::RenderElement::clearLayoutRootIfNeeded):
+ (WebCore::RenderElement::willBeDestroyed):
+ * rendering/RenderElement.h:
+ * rendering/RenderObject.cpp:
+ (WebCore::RenderObject::clearLayoutRootIfNeeded): Deleted.
+ (WebCore::RenderObject::willBeDestroyed): Deleted.
+ * rendering/RenderObject.h:
+
</ins><span class="cx"> 2015-08-07 Wenson Hsieh <wenson_hsieh@apple.com>
</span><span class="cx">
</span><span class="cx"> Temporarily allow programmatic input assistance for adding Gmail account
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorTimelineAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp (188162 => 188163)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp 2015-08-07 21:12:47 UTC (rev 188162)
+++ trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp 2015-08-07 21:25:34 UTC (rev 188163)
</span><span class="lines">@@ -349,7 +349,7 @@
</span><span class="cx">
</span><span class="cx"> void InspectorTimelineAgent::willLayout(Frame& frame)
</span><span class="cx"> {
</span><del>- RenderObject* root = frame.view()->layoutRoot();
</del><ins>+ auto* 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 (188162 => 188163)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.cpp 2015-08-07 21:12:47 UTC (rev 188162)
+++ trunk/Source/WebCore/page/FrameView.cpp 2015-08-07 21:25:34 UTC (rev 188163)
</span><span class="lines">@@ -164,7 +164,6 @@
</span><span class="cx"> : m_frame(frame)
</span><span class="cx"> , m_canHaveScrollbars(true)
</span><span class="cx"> , m_layoutTimer(*this, &FrameView::layoutTimerFired)
</span><del>- , m_layoutRoot(nullptr)
</del><span class="cx"> , m_layoutPhase(OutsideLayout)
</span><span class="cx"> , m_inSynchronousPostLayout(false)
</span><span class="cx"> , m_postLayoutTasksTimer(*this, &FrameView::performPostLayoutTasks)
</span><span class="lines">@@ -1129,11 +1128,6 @@
</span><span class="cx"> renderView->setIsInWindow(isInWindow);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RenderObject* FrameView::layoutRoot(bool onlyDuringLayout) const
-{
- return onlyDuringLayout && layoutPending() ? nullptr : m_layoutRoot;
-}
-
</del><span class="cx"> inline void FrameView::forceLayoutParentViewIfNeeded()
</span><span class="cx"> {
</span><span class="cx"> RenderWidget* ownerRenderer = frame().ownerRenderer();
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.h (188162 => 188163)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.h 2015-08-07 21:12:47 UTC (rev 188162)
+++ trunk/Source/WebCore/page/FrameView.h 2015-08-07 21:25:34 UTC (rev 188163)
</span><span class="lines">@@ -117,7 +117,7 @@
</span><span class="cx"> bool isInLayout() const { return m_layoutPhase == InLayout; }
</span><span class="cx"> WEBCORE_EXPORT bool inPaintableState() { return m_layoutPhase != InLayout && m_layoutPhase != InViewSizeAdjust && m_layoutPhase != InPostLayout; }
</span><span class="cx">
</span><del>- RenderObject* layoutRoot(bool onlyDuringLayout = false) const;
</del><ins>+ RenderElement* layoutRoot() const { return m_layoutRoot; }
</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 class="lines">@@ -696,7 +696,7 @@
</span><span class="cx">
</span><span class="cx"> Timer m_layoutTimer;
</span><span class="cx"> bool m_delayedLayout;
</span><del>- RenderElement* m_layoutRoot;
</del><ins>+ RenderElement* m_layoutRoot { nullptr };
</ins><span class="cx">
</span><span class="cx"> LayoutPhase m_layoutPhase;
</span><span class="cx"> bool m_layoutSchedulingEnabled;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBox.cpp (188162 => 188163)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBox.cpp 2015-08-07 21:12:47 UTC (rev 188162)
+++ trunk/Source/WebCore/rendering/RenderBox.cpp 2015-08-07 21:25:34 UTC (rev 188163)
</span><span class="lines">@@ -2347,7 +2347,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // If layout is limited to a subtree, the subtree root's logical width does not change.
</span><del>- if (element() && view().frameView().layoutRoot(true) == this)
</del><ins>+ if (element() && !view().frameView().layoutPending() && view().frameView().layoutRoot() == this)
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // The parent box is flexing us, so it has increased or decreased our
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderElement.cpp (188162 => 188163)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderElement.cpp 2015-08-07 21:12:47 UTC (rev 188162)
+++ trunk/Source/WebCore/rendering/RenderElement.cpp 2015-08-07 21:25:34 UTC (rev 188163)
</span><span class="lines">@@ -1073,6 +1073,24 @@
</span><span class="cx"> RenderObject::willBeRemovedFromTree();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+inline void RenderElement::clearLayoutRootIfNeeded() const
+{
+ if (documentBeingDestroyed())
+ return;
+
+ if (view().frameView().layoutRoot() != this)
+ return;
+
+ // Normally when a renderer is detached from the tree, the appropriate dirty bits get set
+ // which ensures that this renderer is no longer the layout root.
+ 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 RenderElement::willBeDestroyed()
</span><span class="cx"> {
</span><span class="cx"> animation().cancelAnimations(*this);
</span><span class="lines">@@ -1093,6 +1111,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><ins>+ clearLayoutRootIfNeeded();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderElement::setNeedsPositionedMovementLayout(const RenderStyle* oldStyle)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderElement.h (188162 => 188163)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderElement.h 2015-08-07 21:12:47 UTC (rev 188162)
+++ trunk/Source/WebCore/rendering/RenderElement.h 2015-08-07 21:25:34 UTC (rev 188163)
</span><span class="lines">@@ -298,6 +298,8 @@
</span><span class="cx"> bool getLeadingCorner(FloatPoint& output) const;
</span><span class="cx"> bool getTrailingCorner(FloatPoint& output) const;
</span><span class="cx">
</span><ins>+ void clearLayoutRootIfNeeded() const;
+
</ins><span class="cx"> unsigned m_baseTypeFlags : 6;
</span><span class="cx"> unsigned m_ancestorLineBoxDirty : 1;
</span><span class="cx"> unsigned m_hasInitializedStyle : 1;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderObject.cpp (188162 => 188163)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderObject.cpp 2015-08-07 21:12:47 UTC (rev 188162)
+++ trunk/Source/WebCore/rendering/RenderObject.cpp 2015-08-07 21:25:34 UTC (rev 188163)
</span><span class="lines">@@ -1876,20 +1876,6 @@
</span><span class="cx"> || view().selectionUnsplitEnd() == this;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-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();
- }
-}
-
</del><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">@@ -1913,7 +1899,6 @@
</span><span class="cx"> downcast<RenderLayerModelObject>(*this).destroyLayer();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- clearLayoutRootIfNeeded();
</del><span class="cx"> removeRareData();
</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 (188162 => 188163)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderObject.h 2015-08-07 21:12:47 UTC (rev 188162)
+++ trunk/Source/WebCore/rendering/RenderObject.h 2015-08-07 21:25:34 UTC (rev 188163)
</span><span class="lines">@@ -866,7 +866,6 @@
</span><span class="cx">
</span><span class="cx"> void adjustRectForOutlineAndShadow(LayoutRect&) const;
</span><span class="cx">
</span><del>- void clearLayoutRootIfNeeded() const;
</del><span class="cx"> virtual void willBeDestroyed();
</span><span class="cx">
</span><span class="cx"> virtual void insertedIntoTree();
</span></span></pre>
</div>
</div>
</body>
</html>