Don't drop type information returned from locateRenderSVGTextAncestor

Source/core/layout/svg/LayoutSVGText.cpp

 /*
  * Copyright (C) 2006 Apple Computer, Inc.
  * Copyright (C) 2006 Alexander Kellett <lypanov@kde.org>
  * Copyright (C) 2006 Oliver Hunt <ojh16@student.canterbury.ac.nz>
  * Copyright (C) 2007 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2008 Rob Buis <buis@kde.org>
  * Copyright (C) 2009 Dirk Schulze <krit@webkit.org>
  * Copyright (C) Research In Motion Limited 2010-2012. All rights reserved.
  * Copyright (C) 2012 Google Inc.
  *
@@ skipping 58 matching lines @@
 }
 
 bool LayoutSVGText::isChildAllowed(LayoutObject* child, const ComputedStyle&) const
 {
     return child->isSVGInline() || (child->isText() && SVGLayoutSupport::isLayoutableTextNode(child));
 }
 
 LayoutSVGText* LayoutSVGText::locateLayoutSVGTextAncestor(LayoutObject* start)
 {
     ASSERT(start);
-    while (start && !start->isSVGText())
-        start = start->parent();
-    if (!start || !start->isSVGText())
-        return nullptr;
-    return toLayoutSVGText(start);
+    for (; start; start = start->parent()) {
+        if (start->isSVGText())
+            return toLayoutSVGText(start);
+    }
+    return nullptr;

[f(malita), 2015/08/26 19:00:57]

Nit: instead of duplicating the impl below, I'd vote for a wrapper + const_cast.

[fs, 2015/08/27 10:25:09]

Done.

 }
 
 const LayoutSVGText* LayoutSVGText::locateLayoutSVGTextAncestor(const LayoutObject* start)
 {
     ASSERT(start);
-    while (start && !start->isSVGText())
-        start = start->parent();
-    if (!start || !start->isSVGText())
-        return nullptr;
-    return toLayoutSVGText(start);
+    for (; start; start = start->parent()) {
+        if (start->isSVGText())
+            return toLayoutSVGText(start);
+    }
+    return nullptr;
 }
 
 static inline void collectLayoutAttributes(LayoutObject* text, Vector<SVGTextLayoutAttributes*>& attributes)
 {
     for (LayoutObject* descendant = text; descendant; descendant = descendant->nextInPreOrder(text)) {
         if (descendant->isSVGInlineText())
             attributes.append(toLayoutSVGInlineText(descendant)->layoutAttributes());
     }
 }
 
@@ skipping 402 matching lines @@
     SVGResourcesCache::clientWillBeRemovedFromTree(child);
 
     Vector<SVGTextLayoutAttributes*, 2> affectedAttributes;
     FontCachePurgePreventer fontCachePurgePreventer;
     subtreeChildWillBeRemoved(child, affectedAttributes);
     LayoutSVGBlock::removeChild(child);
     subtreeChildWasRemoved(affectedAttributes);
 }
 
 }