<!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>[161288] 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/161288">161288</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2014-01-03 15:19:40 -0800 (Fri, 03 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add lineageOfType renderer iterator and start using it.
<https://webkit.org/b/126456>
Add a convenient way to iterate over a renderers ancestry *including*
the starting point renderer (if it meets the type criteria.)
This works just like lineageOfType for Elements.
Reviewed by Geoffrey Garen.
* rendering/RenderAncestorIterator.h:
(WebCore::lineageOfType):
Added. Returns an adapter for walking a renderer's entire lineage
matching any renderer of the given type.
* rendering/RenderBoxModelObject.h:
* rendering/RenderLayerModelObject.h:
Add the requisite isRendererOfType<T> helpers.
* rendering/RenderBox.cpp:
(WebCore::RenderBox::enclosingFloatPaintingLayer):
* rendering/RenderObject.cpp:
(WebCore::RenderObject::enclosingLayer):
(WebCore::RenderObject::enclosingBox):
(WebCore::RenderObject::enclosingBoxModelObject):
Simplify with lineageOfType. Added some FIXMEs about functions
that should return references instead of pointers.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderAncestorIteratorh">trunk/Source/WebCore/rendering/RenderAncestorIterator.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBoxcpp">trunk/Source/WebCore/rendering/RenderBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBoxModelObjecth">trunk/Source/WebCore/rendering/RenderBoxModelObject.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerModelObjecth">trunk/Source/WebCore/rendering/RenderLayerModelObject.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderObjectcpp">trunk/Source/WebCore/rendering/RenderObject.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (161287 => 161288)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-03 23:05:38 UTC (rev 161287)
+++ trunk/Source/WebCore/ChangeLog 2014-01-03 23:19:40 UTC (rev 161288)
</span><span class="lines">@@ -1,3 +1,36 @@
</span><ins>+2014-01-03 Andreas Kling <akling@apple.com>
+
+ Add lineageOfType renderer iterator and start using it.
+ <https://webkit.org/b/126456>
+
+ Add a convenient way to iterate over a renderers ancestry *including*
+ the starting point renderer (if it meets the type criteria.)
+
+ This works just like lineageOfType for Elements.
+
+ Reviewed by Geoffrey Garen.
+
+ * rendering/RenderAncestorIterator.h:
+ (WebCore::lineageOfType):
+
+ Added. Returns an adapter for walking a renderer's entire lineage
+ matching any renderer of the given type.
+
+ * rendering/RenderBoxModelObject.h:
+ * rendering/RenderLayerModelObject.h:
+
+ Add the requisite isRendererOfType<T> helpers.
+
+ * rendering/RenderBox.cpp:
+ (WebCore::RenderBox::enclosingFloatPaintingLayer):
+ * rendering/RenderObject.cpp:
+ (WebCore::RenderObject::enclosingLayer):
+ (WebCore::RenderObject::enclosingBox):
+ (WebCore::RenderObject::enclosingBoxModelObject):
+
+ Simplify with lineageOfType. Added some FIXMEs about functions
+ that should return references instead of pointers.
+
</ins><span class="cx"> 2014-01-03 Martin Robinson <mrobinson@igalia.com>
</span><span class="cx">
</span><span class="cx"> Small build fix for the GTK+ CMake port
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderAncestorIteratorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderAncestorIterator.h (161287 => 161288)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderAncestorIterator.h 2014-01-03 23:05:38 UTC (rev 161287)
+++ trunk/Source/WebCore/rendering/RenderAncestorIterator.h 2014-01-03 23:19:40 UTC (rev 161288)
</span><span class="lines">@@ -72,6 +72,8 @@
</span><span class="cx">
</span><span class="cx"> template <typename T> RenderAncestorIteratorAdapter<T> ancestorsOfType(RenderObject&);
</span><span class="cx"> template <typename T> RenderAncestorConstIteratorAdapter<T> ancestorsOfType(const RenderObject&);
</span><ins>+template <typename T> RenderAncestorIteratorAdapter<T> lineageOfType(RenderObject&);
+template <typename T> RenderAncestorConstIteratorAdapter<T> lineageOfType(const RenderObject&);
</ins><span class="cx">
</span><span class="cx"> // RenderAncestorIterator
</span><span class="cx">
</span><span class="lines">@@ -181,6 +183,22 @@
</span><span class="cx"> return RenderAncestorConstIteratorAdapter<T>(first);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+template <typename T>
+inline RenderAncestorIteratorAdapter<T> lineageOfType(RenderObject& first)
+{
+ if (isRendererOfType<const T>(first))
+ return RenderAncestorIteratorAdapter<T>(static_cast<T*>(&first));
+ return ancestorsOfType<T>(first);
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+template <typename T>
+inline RenderAncestorConstIteratorAdapter<T> lineageOfType(const RenderObject& first)
+{
+ if (isRendererOfType<const T>(first))
+ return RenderAncestorConstIteratorAdapter<T>(static_cast<const T*>(&first));
+ return ancestorsOfType<T>(first);
+}
+
+}
+
</ins><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBox.cpp (161287 => 161288)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBox.cpp 2014-01-03 23:05:38 UTC (rev 161287)
+++ trunk/Source/WebCore/rendering/RenderBox.cpp 2014-01-03 23:19:40 UTC (rev 161288)
</span><span class="lines">@@ -4485,14 +4485,11 @@
</span><span class="cx">
</span><span class="cx"> RenderLayer* RenderBox::enclosingFloatPaintingLayer() const
</span><span class="cx"> {
</span><del>- const RenderElement* curr = this;
- while (curr) {
- RenderLayer* layer = curr->hasLayer() && curr->isBox() ? toRenderBox(curr)->layer() : 0;
- if (layer && layer->isSelfPaintingLayer())
- return layer;
- curr = curr->parent();
</del><ins>+ for (auto& box : lineageOfType<RenderBox>(*this)) {
+ if (box.layer() && box.layer()->isSelfPaintingLayer())
+ return box.layer();
</ins><span class="cx"> }
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> LayoutRect RenderBox::logicalVisualOverflowRectForPropagation(RenderStyle* parentStyle) const
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxModelObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBoxModelObject.h (161287 => 161288)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBoxModelObject.h 2014-01-03 23:05:38 UTC (rev 161287)
+++ trunk/Source/WebCore/rendering/RenderBoxModelObject.h 2014-01-03 23:19:40 UTC (rev 161288)
</span><span class="lines">@@ -345,6 +345,8 @@
</span><span class="cx"> void paintMaskForTextFillBox(ImageBuffer*, const IntRect&, InlineFlowBox*, const LayoutRect&, RenderRegion*);
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+template <> inline bool isRendererOfType<const RenderBoxModelObject>(const RenderObject& renderer) { return renderer.isBoxModelObject(); }
+
</ins><span class="cx"> RENDER_OBJECT_TYPE_CASTS(RenderBoxModelObject, isBoxModelObject())
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerModelObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerModelObject.h (161287 => 161288)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerModelObject.h 2014-01-03 23:05:38 UTC (rev 161287)
+++ trunk/Source/WebCore/rendering/RenderLayerModelObject.h 2014-01-03 23:19:40 UTC (rev 161288)
</span><span class="lines">@@ -67,6 +67,8 @@
</span><span class="cx"> static bool s_layerWasSelfPainting;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+template <> inline bool isRendererOfType<const RenderLayerModelObject>(const RenderObject& renderer) { return renderer.isRenderLayerModelObject(); }
+
</ins><span class="cx"> RENDER_OBJECT_TYPE_CASTS(RenderLayerModelObject, isRenderLayerModelObject())
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderObject.cpp (161287 => 161288)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderObject.cpp 2014-01-03 23:05:38 UTC (rev 161287)
+++ trunk/Source/WebCore/rendering/RenderObject.cpp 2014-01-03 23:19:40 UTC (rev 161288)
</span><span class="lines">@@ -49,6 +49,7 @@
</span><span class="cx"> #include "RenderFlowThread.h"
</span><span class="cx"> #include "RenderGeometryMap.h"
</span><span class="cx"> #include "RenderInline.h"
</span><ins>+#include "RenderIterator.h"
</ins><span class="cx"> #include "RenderLayer.h"
</span><span class="cx"> #include "RenderLayerBacking.h"
</span><span class="cx"> #include "RenderNamedFlowThread.h"
</span><span class="lines">@@ -472,14 +473,11 @@
</span><span class="cx">
</span><span class="cx"> RenderLayer* RenderObject::enclosingLayer() const
</span><span class="cx"> {
</span><del>- const RenderObject* curr = this;
- while (curr) {
- RenderLayer* layer = curr->hasLayer() ? toRenderLayerModelObject(curr)->layer() : 0;
- if (layer)
- return layer;
- curr = curr->parent();
</del><ins>+ for (auto& renderer : lineageOfType<RenderLayerModelObject>(*this)) {
+ if (renderer.layer())
+ return renderer.layer();
</ins><span class="cx"> }
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool RenderObject::scrollRectToVisible(const LayoutRect& rect, const ScrollAlignment& alignX, const ScrollAlignment& alignY)
</span><span class="lines">@@ -494,28 +492,14 @@
</span><span class="cx">
</span><span class="cx"> RenderBox* RenderObject::enclosingBox() const
</span><span class="cx"> {
</span><del>- RenderObject* curr = const_cast<RenderObject*>(this);
- while (curr) {
- if (curr->isBox())
- return toRenderBox(curr);
- curr = curr->parent();
- }
-
- ASSERT_NOT_REACHED();
- return 0;
</del><ins>+ // FIXME: This should return a reference; it can always find the root RenderView.
+ return lineageOfType<RenderBox>(const_cast<RenderObject&>(*this)).first();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RenderBoxModelObject* RenderObject::enclosingBoxModelObject() const
</span><span class="cx"> {
</span><del>- RenderObject* curr = const_cast<RenderObject*>(this);
- while (curr) {
- if (curr->isBoxModelObject())
- return toRenderBoxModelObject(curr);
- curr = curr->parent();
- }
-
- ASSERT_NOT_REACHED();
- return 0;
</del><ins>+ // FIXME: This should return a reference; it can always find the root RenderView.
+ return lineageOfType<RenderBoxModelObject>(const_cast<RenderObject&>(*this)).first();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool RenderObject::fixedPositionedWithNamedFlowContainingBlock() const
</span></span></pre>
</div>
</div>
</body>
</html>