Revert the merge. Mac build is mysteriously broken.

third_party/WebKit/WebCore/rendering/RenderSVGInlineText.cpp

 /*
  * This file is part of the WebKit project.
  *
  * Copyright (C) 2006 Oliver Hunt <ojh16@student.canterbury.ac.nz>
  *           (C) 2006 Apple Computer Inc.
  *           (C) 2007 Nikolas Zimmermann <zimmermann@kde.org>
  *           (C) 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
@@ skipping 58 matching lines @@
 void RenderSVGInlineText::absoluteRects(Vector<IntRect>& rects, int, int, bool)
 {
     rects.append(computeRepaintRectForRange(0, 0, textLength()));
 }
 
 void RenderSVGInlineText::absoluteQuads(Vector<FloatQuad>& quads, bool)
 {
     quads.append(FloatRect(computeRepaintRectForRange(0, 0, textLength())));
 }
 
-IntRect RenderSVGInlineText::selectionRectForRepaint(RenderBoxModelObject* repaintContainer, bool /*clipToVisibleContent*/)
+IntRect RenderSVGInlineText::selectionRectForRepaint(RenderBox* repaintContainer, bool /*clipToVisibleContent*/)
 {
     ASSERT(!needsLayout());
 
     if (selectionState() == SelectionNone)
         return IntRect();
 
     // Early exit if we're ie. a <text> within a <defs> section.
     if (isChildOfHiddenContainer(this))
         return IntRect();
 
@@ skipping 11 matching lines @@
         else if (selectionState() == SelectionEnd)
             startPos = 0;
     }
 
     if (startPos == endPos)
         return IntRect();
 
     return computeRepaintRectForRange(repaintContainer, startPos, endPos);
 }
 
-IntRect RenderSVGInlineText::computeRepaintRectForRange(RenderBoxModelObject* /*repaintContainer*/, int startPos, int endPos)
+IntRect RenderSVGInlineText::computeRepaintRectForRange(RenderBox* /*repaintContainer*/, int startPos, int endPos)
 {
     RenderBlock* cb = containingBlock();
     if (!cb || !cb->container())
         return IntRect();
 
     RenderSVGRoot* root = findSVGRootObject(parent());
     if (!root)
         return IntRect();
 
     IntRect rect;
@@ skipping 61 matching lines @@
     if (!documentBeingDestroyed()) {
         setNeedsLayoutAndPrefWidthsRecalc();
         repaint();
     }
     RenderText::destroy();
 }
 
 }
 
 #endif // ENABLE(SVG)