Merge 117225

Source/WebCore/rendering/svg/RenderSVGInline.cpp

 /*
  * Copyright (C) 2006 Oliver Hunt <ojh16@student.canterbury.ac.nz>
  * Copyright (C) 2006 Apple Inc. All rights reserved.
  * Copyright (C) Research In Motion Limited 2010. All rights reserved.
  *
  * 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.
  *
@@ skipping 106 matching lines @@
 void RenderSVGInline::updateFromElement()
 {
     RenderInline::updateFromElement();
     SVGResourcesCache::clientUpdatedFromElement(this, style());
 }
 
 void RenderSVGInline::addChild(RenderObject* child, RenderObject* beforeChild)
 {
     RenderInline::addChild(child, beforeChild);
     if (RenderSVGText* textRenderer = RenderSVGText::locateRenderSVGTextAncestor(this))
-        textRenderer->layoutAttributesChanged(child);
+        textRenderer->subtreeChildWasAdded(child);
+}
+
+void RenderSVGInline::removeChild(RenderObject* child)
+{
+    RenderSVGText* textRenderer = child->isSVGInlineText() ? RenderSVGText::locateRenderSVGTextAncestor(this) : 0;
+    if (!textRenderer) {
+        RenderInline::removeChild(child);
+        return;
+    }
+
+    RenderSVGInlineText* text = toRenderSVGInlineText(child);
+    Vector<SVGTextLayoutAttributes*, 2> affectedAttributes;
+    textRenderer->subtreeChildWillBeRemoved(text, affectedAttributes);
+    RenderInline::removeChild(child);
+    textRenderer->subtreeChildWasRemoved(affectedAttributes);
 }
 
 }
 
 #endif // ENABLE(SVG)