Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(125)

Unified Diff: Source/WebCore/rendering/svg/RenderSVGInline.cpp

Issue 10456022: Merge 117975 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1132/
Patch Set: Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « LayoutTests/svg/custom/bug86781-expected.txt ('k') | Source/WebCore/rendering/svg/RenderSVGText.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/rendering/svg/RenderSVGInline.cpp
===================================================================
--- Source/WebCore/rendering/svg/RenderSVGInline.cpp (revision 118875)
+++ Source/WebCore/rendering/svg/RenderSVGInline.cpp (working copy)
@@ -129,15 +129,13 @@
void RenderSVGInline::removeChild(RenderObject* child)
{
- RenderSVGText* textRenderer = child->isSVGInlineText() ? RenderSVGText::locateRenderSVGTextAncestor(this) : 0;
+ RenderSVGText* textRenderer = RenderSVGText::locateRenderSVGTextAncestor(this);
if (!textRenderer) {
RenderInline::removeChild(child);
return;
}
-
- RenderSVGInlineText* text = toRenderSVGInlineText(child);
Vector<SVGTextLayoutAttributes*, 2> affectedAttributes;
- textRenderer->subtreeChildWillBeRemoved(text, affectedAttributes);
+ textRenderer->subtreeChildWillBeRemoved(child, affectedAttributes);
RenderInline::removeChild(child);
textRenderer->subtreeChildWasRemoved(affectedAttributes);
}
« no previous file with comments | « LayoutTests/svg/custom/bug86781-expected.txt ('k') | Source/WebCore/rendering/svg/RenderSVGText.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698