Revert the merge. Mac build is mysteriously broken.

third_party/WebKit/WebCore/rendering/RenderSVGContainer.cpp

 /*
     Copyright (C) 2004, 2005, 2007 Nikolas Zimmermann <zimmermann@kde.org>
                   2004, 2005, 2007, 2008 Rob Buis <buis@kde.org>
                   2007 Eric Seidel <eric@webkit.org>
 
     This file is part of the KDE project
 
     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
@@ skipping 194 matching lines @@
     
     if ((paintInfo.phase == PaintPhaseOutline || paintInfo.phase == PaintPhaseSelfOutline) && style()->outlineWidth() && style()->visibility() == VISIBLE)
         paintOutline(paintInfo.context, m_absoluteBounds.x(), m_absoluteBounds.y(), m_absoluteBounds.width(), m_absoluteBounds.height(), style());
 }
 
 TransformationMatrix RenderSVGContainer::viewportTransform() const
 {
      return TransformationMatrix();
 }
 
-IntRect RenderSVGContainer::clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer)
+IntRect RenderSVGContainer::clippedOverflowRectForRepaint(RenderBox* repaintContainer)
 {
     FloatRect repaintRect;
 
     for (RenderObject* current = firstChild(); current != 0; current = current->nextSibling())
         repaintRect.unite(current->clippedOverflowRectForRepaint(repaintContainer));
 
 #if ENABLE(SVG_FILTERS)
     // Filters can expand the bounding box
     SVGResourceFilter* filter = getFilterById(document(), style()->svgStyle()->filter());
     if (filter)
@@ skipping 47 matching lines @@
             updateHitTestResult(result, IntPoint(_x - _tx, _y - _ty));
             return true;
         }
     }
 
     // Spec: Only graphical elements can be targeted by the mouse, period.
     // 16.4: "If there are no graphics elements whose relevant graphics content is under the pointer (i.e., there is no target element), the event is not dispatched."
     return false;
 }
 
-IntRect RenderSVGContainer::outlineBoundsForRepaint(RenderBoxModelObject* /*repaintContainer*/) const
+IntRect RenderSVGContainer::outlineBoundsForRepaint(RenderBox* /*repaintContainer*/) const
 {
     // FIXME: handle non-root repaintContainer
     IntRect result = m_absoluteBounds;
     adjustRectForOutlineAndShadow(result);
     return result;
 }
 
 }
 
 #endif // ENABLE(SVG)
 
 // vim:ts=4:noet