Simplify SVGTextContentElement::elementFromRenderer()

Source/core/svg/SVGTextContentElement.cpp

 /*
  * Copyright (C) 2004, 2005, 2007, 2008 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007, 2008 Rob Buis <buis@kde.org>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
@@ skipping 283 matching lines @@
 }
 
 SVGTextContentElement* SVGTextContentElement::elementFromRenderer(RenderObject* renderer)
 {
     if (!renderer)
         return 0;
 
     if (!renderer->isSVGText() && !renderer->isSVGInline())
         return 0;
 
-    Node* node = renderer->node();
-    ASSERT(node);

[Stephen Chennney, 2013/07/01 13:55:16]

Leave these 2 lines. We still want to catch cases where the node does not exist
(unlikely as it may seem).

[do-not-use, 2013/07/01 13:58:59]

ASSERT(element) would cover that case in the new patch.

ASSERT(node->isSVGElement()); is covered by toSVGElement() in the new patch as
it has the following assertion:
ASSERT_WITH_SECURITY_IMPLICATION(!node || node->isSVGElement());

[Stephen Chennney, 2013/07/01 14:09:54]

You're right. That's what I get for reviewing before breakfast.

On 2013/07/01 13:58:59, cdumez wrote:

-    ASSERT(node->isSVGElement());
+    SVGElement* element = toSVGElement(renderer->node());
+    ASSERT(element);
 
-    if (!node->hasTagName(SVGNames::textTag)
-        && !node->hasTagName(SVGNames::tspanTag)
-#if ENABLE(SVG_FONTS)
-        && !node->hasTagName(SVGNames::altGlyphTag)
-#endif
-        && !node->hasTagName(SVGNames::trefTag)
-        && !node->hasTagName(SVGNames::textPathTag))
+    if (!element->isTextContent())
         return 0;
 
-    return static_cast<SVGTextContentElement*>(node);
+    return toSVGTextContentElement(element);
 }
 
 }