<!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>[163969] 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/163969">163969</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2014-02-12 12:15:05 -0800 (Wed, 12 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>RenderNamedFlowThread should only support RenderElement children.
<https://webkit.org/b/128675>
Tighten up flow-thread rendering so that it only supports element
children directly. This means we don't have to worry about text
renderers on this code path.
Reviewed by Antti Koivisto.
* rendering/RenderElement.cpp:
(WebCore::RenderElement::insertedIntoTree):
(WebCore::RenderElement::willBeRemovedFromTree):
(WebCore::RenderElement::willBeDestroyed):
* rendering/RenderNamedFlowThread.cpp:
(WebCore::RenderNamedFlowThread::nextRendererForElement):
(WebCore::RenderNamedFlowThread::addFlowChild):
(WebCore::RenderNamedFlowThread::removeFlowChild):
* rendering/RenderNamedFlowThread.h:
* rendering/RenderObject.cpp:
(WebCore::RenderObject::willBeDestroyed):
(WebCore::RenderObject::insertedIntoTree):
(WebCore::RenderObject::willBeRemovedFromTree):
* style/StyleResolveTree.cpp:
(WebCore::Style::createRendererIfNeeded):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderElementcpp">trunk/Source/WebCore/rendering/RenderElement.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderNamedFlowThreadcpp">trunk/Source/WebCore/rendering/RenderNamedFlowThread.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderNamedFlowThreadh">trunk/Source/WebCore/rendering/RenderNamedFlowThread.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderObjectcpp">trunk/Source/WebCore/rendering/RenderObject.cpp</a></li>
<li><a href="#trunkSourceWebCorestyleStyleResolveTreecpp">trunk/Source/WebCore/style/StyleResolveTree.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (163968 => 163969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-12 19:29:39 UTC (rev 163968)
+++ trunk/Source/WebCore/ChangeLog 2014-02-12 20:15:05 UTC (rev 163969)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2014-02-12 Andreas Kling <akling@apple.com>
+
+ RenderNamedFlowThread should only support RenderElement children.
+ <https://webkit.org/b/128675>
+
+ Tighten up flow-thread rendering so that it only supports element
+ children directly. This means we don't have to worry about text
+ renderers on this code path.
+
+ Reviewed by Antti Koivisto.
+
+ * rendering/RenderElement.cpp:
+ (WebCore::RenderElement::insertedIntoTree):
+ (WebCore::RenderElement::willBeRemovedFromTree):
+ (WebCore::RenderElement::willBeDestroyed):
+ * rendering/RenderNamedFlowThread.cpp:
+ (WebCore::RenderNamedFlowThread::nextRendererForElement):
+ (WebCore::RenderNamedFlowThread::addFlowChild):
+ (WebCore::RenderNamedFlowThread::removeFlowChild):
+ * rendering/RenderNamedFlowThread.h:
+ * rendering/RenderObject.cpp:
+ (WebCore::RenderObject::willBeDestroyed):
+ (WebCore::RenderObject::insertedIntoTree):
+ (WebCore::RenderObject::willBeRemovedFromTree):
+ * style/StyleResolveTree.cpp:
+ (WebCore::Style::createRendererIfNeeded):
+
</ins><span class="cx"> 2014-02-12 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Modernize missed inspector files
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderElement.cpp (163968 => 163969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderElement.cpp 2014-02-12 19:29:39 UTC (rev 163968)
+++ trunk/Source/WebCore/rendering/RenderElement.cpp 2014-02-12 20:15:05 UTC (rev 163969)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx"> #include "Frame.h"
</span><span class="cx"> #include "HTMLElement.h"
</span><span class="cx"> #include "HTMLNames.h"
</span><ins>+#include "FlowThreadController.h"
</ins><span class="cx"> #include "RenderCounter.h"
</span><span class="cx"> #include "RenderDeprecatedFlexibleBox.h"
</span><span class="cx"> #include "RenderFlexibleBox.h"
</span><span class="lines">@@ -967,6 +968,9 @@
</span><span class="cx"> {
</span><span class="cx"> RenderObject::insertedIntoTree();
</span><span class="cx">
</span><ins>+ if (auto* containerFlowThread = parent()->renderNamedFlowThreadWrapper())
+ containerFlowThread->addFlowChild(*this);
+
</ins><span class="cx"> // Keep our layer hierarchy updated. Optimize for the common case where we don't have any children
</span><span class="cx"> // and don't have a layer attached to ourselves.
</span><span class="cx"> RenderLayer* layer = nullptr;
</span><span class="lines">@@ -1007,6 +1011,9 @@
</span><span class="cx"> if (isOutOfFlowPositioned() && parent()->childrenInline())
</span><span class="cx"> parent()->dirtyLinesFromChangedChild(this);
</span><span class="cx">
</span><ins>+ if (auto* containerFlowThread = parent()->renderNamedFlowThreadWrapper())
+ containerFlowThread->removeFlowChild(*this);
+
</ins><span class="cx"> RenderObject::willBeRemovedFromTree();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1017,6 +1024,16 @@
</span><span class="cx"> destroyLeftoverChildren();
</span><span class="cx">
</span><span class="cx"> RenderObject::willBeDestroyed();
</span><ins>+
+#if !ASSERT_DISABLED
+ if (!documentBeingDestroyed() && view().hasRenderNamedFlowThreads()) {
+ // After remove, the object and the associated information should not be in any flow thread.
+ for (auto& flowThread : *view().flowThreadController().renderNamedFlowThreadList()) {
+ ASSERT(!flowThread->hasChild(*this));
+ ASSERT(!flowThread->hasChildInfo(this));
+ }
+ }
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderElement::setNeedsPositionedMovementLayout(const RenderStyle* oldStyle)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderNamedFlowThreadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderNamedFlowThread.cpp (163968 => 163969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderNamedFlowThread.cpp 2014-02-12 19:29:39 UTC (rev 163968)
+++ trunk/Source/WebCore/rendering/RenderNamedFlowThread.cpp 2014-02-12 20:15:05 UTC (rev 163969)
</span><span class="lines">@@ -97,11 +97,11 @@
</span><span class="cx"> setStyle(std::move(newStyle));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RenderObject* RenderNamedFlowThread::nextRendererForNode(Node* node) const
</del><ins>+RenderElement* RenderNamedFlowThread::nextRendererForElement(Element& element) const
</ins><span class="cx"> {
</span><span class="cx"> for (auto& child : m_flowThreadChildList) {
</span><del>- ASSERT(child->node());
- unsigned short position = node->compareDocumentPosition(child->node());
</del><ins>+ ASSERT(!child->isAnonymous());
+ unsigned short position = element.compareDocumentPosition(child->element());
</ins><span class="cx"> if (position & Node::DOCUMENT_POSITION_FOLLOWING)
</span><span class="cx"> return child;
</span><span class="cx"> }
</span><span class="lines">@@ -109,29 +109,24 @@
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderNamedFlowThread::addFlowChild(RenderObject* newChild)
</del><ins>+void RenderNamedFlowThread::addFlowChild(RenderElement& newChild)
</ins><span class="cx"> {
</span><span class="cx"> // The child list is used to sort the flow thread's children render objects
</span><span class="cx"> // based on their corresponding nodes DOM order. The list is needed to avoid searching the whole DOM.
</span><span class="cx">
</span><del>- Node* childNode = newChild->node();
-
- // Do not add anonymous objects.
- if (!childNode)
</del><ins>+ if (newChild.isAnonymous())
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- ASSERT(childNode->isElementNode());
-
- RenderObject* beforeChild = nextRendererForNode(childNode);
</del><ins>+ auto* beforeChild = nextRendererForElement(*newChild.element());
</ins><span class="cx"> if (beforeChild)
</span><del>- m_flowThreadChildList.insertBefore(beforeChild, newChild);
</del><ins>+ m_flowThreadChildList.insertBefore(beforeChild, &newChild);
</ins><span class="cx"> else
</span><del>- m_flowThreadChildList.add(newChild);
</del><ins>+ m_flowThreadChildList.add(&newChild);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderNamedFlowThread::removeFlowChild(RenderObject* child)
</del><ins>+void RenderNamedFlowThread::removeFlowChild(RenderElement& child)
</ins><span class="cx"> {
</span><del>- m_flowThreadChildList.remove(child);
</del><ins>+ m_flowThreadChildList.remove(&child);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool RenderNamedFlowThread::dependsOn(RenderNamedFlowThread* otherRenderFlowThread) const
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderNamedFlowThreadh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderNamedFlowThread.h (163968 => 163969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderNamedFlowThread.h 2014-02-12 19:29:39 UTC (rev 163968)
+++ trunk/Source/WebCore/rendering/RenderNamedFlowThread.h 2014-02-12 20:15:05 UTC (rev 163969)
</span><span class="lines">@@ -52,13 +52,13 @@
</span><span class="cx">
</span><span class="cx"> const RenderRegionList& invalidRenderRegionList() const { return m_invalidRegionList; }
</span><span class="cx">
</span><del>- RenderObject* nextRendererForNode(Node*) const;
</del><ins>+ RenderElement* nextRendererForElement(Element&) const;
</ins><span class="cx">
</span><del>- void addFlowChild(RenderObject* newChild);
- void removeFlowChild(RenderObject*);
</del><ins>+ void addFlowChild(RenderElement&);
+ void removeFlowChild(RenderElement&);
</ins><span class="cx"> bool hasChildren() const { return !m_flowThreadChildList.isEmpty(); }
</span><span class="cx"> #ifndef NDEBUG
</span><del>- bool hasChild(RenderObject* child) const { return m_flowThreadChildList.contains(child); }
</del><ins>+ bool hasChild(RenderElement& child) const { return m_flowThreadChildList.contains(&child); }
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> void pushDependencies(RenderNamedFlowThreadList&);
</span><span class="lines">@@ -129,7 +129,7 @@
</span><span class="cx"> RenderNamedFlowThreadCountedSet m_layoutBeforeThreadsSet;
</span><span class="cx">
</span><span class="cx"> // Holds the sorted children of a named flow. This is the only way we can get the ordering right.
</span><del>- ListHashSet<RenderObject*> m_flowThreadChildList;
</del><ins>+ ListHashSet<RenderElement*> m_flowThreadChildList;
</ins><span class="cx">
</span><span class="cx"> NamedFlowContentElements m_contentElements;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderObject.cpp (163968 => 163969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderObject.cpp 2014-02-12 19:29:39 UTC (rev 163968)
+++ trunk/Source/WebCore/rendering/RenderObject.cpp 2014-02-12 20:15:05 UTC (rev 163969)
</span><span class="lines">@@ -1855,18 +1855,6 @@
</span><span class="cx"> if (AXObjectCache* cache = document().existingAXObjectCache())
</span><span class="cx"> cache->remove(this);
</span><span class="cx">
</span><del>-#ifndef NDEBUG
- if (!documentBeingDestroyed() && view().hasRenderNamedFlowThreads()) {
- // After remove, the object and the associated information should not be in any flow thread.
- const RenderNamedFlowThreadList* flowThreadList = view().flowThreadController().renderNamedFlowThreadList();
- for (RenderNamedFlowThreadList::const_iterator iter = flowThreadList->begin(); iter != flowThreadList->end(); ++iter) {
- const RenderNamedFlowThread* renderFlowThread = *iter;
- ASSERT(!renderFlowThread->hasChild(this));
- ASSERT(!renderFlowThread->hasChildInfo(this));
- }
- }
-#endif
-
</del><span class="cx"> // If this renderer had a parent, remove should have destroyed any counters
</span><span class="cx"> // attached to this renderer and marked the affected other counters for
</span><span class="cx"> // reevaluation. This apparently redundant check is here for the case when
</span><span class="lines">@@ -1891,9 +1879,6 @@
</span><span class="cx">
</span><span class="cx"> if (!isFloating() && parent()->childrenInline())
</span><span class="cx"> parent()->dirtyLinesFromChangedChild(this);
</span><del>-
- if (RenderNamedFlowThread* containerFlowThread = parent()->renderNamedFlowThreadWrapper())
- containerFlowThread->addFlowChild(this);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderObject::willBeRemovedFromTree()
</span><span class="lines">@@ -1902,9 +1887,6 @@
</span><span class="cx">
</span><span class="cx"> removeFromRenderFlowThread();
</span><span class="cx">
</span><del>- if (RenderNamedFlowThread* containerFlowThread = parent()->renderNamedFlowThreadWrapper())
- containerFlowThread->removeFlowChild(this);
-
</del><span class="cx"> // Update cached boundaries in SVG renderers, if a child is removed.
</span><span class="cx"> parent()->setNeedsBoundariesUpdate();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorestyleStyleResolveTreecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/style/StyleResolveTree.cpp (163968 => 163969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/style/StyleResolveTree.cpp 2014-02-12 19:29:39 UTC (rev 163968)
+++ trunk/Source/WebCore/style/StyleResolveTree.cpp 2014-02-12 20:15:05 UTC (rev 163969)
</span><span class="lines">@@ -226,7 +226,7 @@
</span><span class="cx"> RenderObject* nextRenderer;
</span><span class="cx"> if (parentFlowRenderer) {
</span><span class="cx"> parentRenderer = parentFlowRenderer;
</span><del>- nextRenderer = parentFlowRenderer->nextRendererForNode(&element);
</del><ins>+ nextRenderer = parentFlowRenderer->nextRendererForElement(element);
</ins><span class="cx"> } else {
</span><span class="cx"> // FIXME: Make this path Element only, handle the root special case separately.
</span><span class="cx"> parentRenderer = renderingParentNode->renderer();
</span></span></pre>
</div>
</div>
</body>
</html>