Changeset 161323 in webkit

Timestamp:

Jan 5, 2014, 3:45:54 AM (12 years ago)

Author:

akling@apple.com

Message:

Use lineageOfType to simplify two rendering helpers.
<​https://webkit.org/b/126498>

Reviewed by Antti Koivisto.

• rendering/RenderRuby.cpp:

(WebCore::findRubyRunParent):

• rendering/svg/SVGRenderSupport.cpp:

(WebCore::SVGRenderSupport::findTreeRootObject):

Simplify two functions that walk their parent chain to find the
closest ancestor of a certain type.

• rendering/RenderRubyRun.h:

Add requisite isRendererOfType<RenderRubyRun>().

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderRuby.cpp (modified) (2 diffs)
• rendering/RenderRubyRun.h (modified) (1 diff)
• rendering/svg/SVGRenderSupport.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-01-05  Andreas Kling  <akling@apple.com>
+
+        Use lineageOfType to simplify two rendering helpers.
+        <https://webkit.org/b/126498>
+
+        Reviewed by Antti Koivisto.
+
+        * rendering/RenderRuby.cpp:
+        (WebCore::findRubyRunParent):
+        * rendering/svg/SVGRenderSupport.cpp:
+        (WebCore::SVGRenderSupport::findTreeRootObject):
+
+            Simplify two functions that walk their parent chain to find the
+            closest ancestor of a certain type.
+
+        * rendering/RenderRubyRun.h:
+
+            Add requisite isRendererOfType<RenderRubyRun>().
+
 2014-01-05  Csaba Osztrogonác  <ossy@webkit.org>
 

trunk/Source/WebCore/rendering/RenderRuby.cpp

@@ -33 +33 @@
 #include "RenderRuby.h"
 
+#include "RenderIterator.h"
 #include "RenderRubyRun.h"
 #include "RenderStyle.h"
@@ -102 +103 @@
 static inline RenderRubyRun& findRubyRunParent(RenderObject& child)
 {
-    RenderObject* ancestor = &child;
-    while (ancestor && !ancestor->isRubyRun())
-        ancestor = ancestor->parent();
-    ASSERT(ancestor);
-    return toRenderRubyRun(*ancestor);
+    return *lineageOfType<RenderRubyRun>(child).first();
 }
 

trunk/Source/WebCore/rendering/RenderRubyRun.h

@@ -78 +78 @@
 };
 
+template<> inline bool isRendererOfType<const RenderRubyRun>(const RenderObject& renderer) { return renderer.isRubyRun(); }
+
 RENDER_OBJECT_TYPE_CASTS(RenderRubyRun, isRubyRun())
 

trunk/Source/WebCore/rendering/svg/SVGRenderSupport.cpp

@@ -29 +29 @@
 
 #include "NodeRenderStyle.h"
+#include "RenderElement.h"
 #include "RenderGeometryMap.h"
+#include "RenderIterator.h"
 #include "RenderLayer.h"
 #include "RenderSVGResource.h"
@@ -183 +185 @@
 const RenderSVGRoot& SVGRenderSupport::findTreeRootObject(const RenderElement& start)
 {
-    auto renderer = &start;
-    while (renderer && !renderer->isSVGRoot())
-        renderer = renderer->parent();
-
-    ASSERT(renderer);
-    return toRenderSVGRoot(*renderer);
+    return *lineageOfType<RenderSVGRoot>(start).first();
 }