Revert the merge. Mac build is mysteriously broken.

third_party/WebKit/WebCore/rendering/RenderSVGImage.cpp

 /*
     Copyright (C) 2006 Alexander Kellett <lypanov@kde.org>
     Copyright (C) 2006 Apple Computer, Inc.
     Copyright (C) 2007 Nikolas Zimmermann <zimmermann@kde.org>
     Copyright (C) 2007, 2008 Rob Buis <buis@kde.org>
 
     This file is part of the WebKit project
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
@@ skipping 224 matching lines @@
     if (filter)
         absoluteRect.unite(filter->filterBBoxForItemBBox(absoluteRect));
 #endif
 
     if (!absoluteRect.isEmpty())
         absoluteRect.inflate(1); // inflate 1 pixel for antialiasing
 
     m_absoluteBounds = enclosingIntRect(absoluteRect);
 }
 
-IntRect RenderSVGImage::clippedOverflowRectForRepaint(RenderBoxModelObject* /*repaintContainer*/)
+IntRect RenderSVGImage::clippedOverflowRectForRepaint(RenderBox* /*repaintContainer*/)
 {
     // FIXME: handle non-root repaintContainer
     return m_absoluteBounds;
 }
 
 void RenderSVGImage::addFocusRingRects(GraphicsContext* graphicsContext, int, int)
 {
     // this is called from paint() after the localTransform has already been applied
     IntRect contentRect = enclosingIntRect(relativeBBox());
     graphicsContext->addFocusRingRect(contentRect);
 }
 
 void RenderSVGImage::absoluteRects(Vector<IntRect>& rects, int, int, bool)
 {
     rects.append(absoluteClippedOverflowRect());
 }
 
 void RenderSVGImage::absoluteQuads(Vector<FloatQuad>& quads, bool)
 {
     quads.append(FloatRect(absoluteClippedOverflowRect()));
 }
 
 }
 
 #endif // ENABLE(SVG)