Revert the merge. Mac build is mysteriously broken.

third_party/WebKit/WebCore/rendering/RenderPath.h

 /*
     Copyright (C) 2004, 2005, 2007 Nikolas Zimmermann <zimmermann@kde.org>
                   2004, 2005 Rob Buis <buis@kde.org>
                   2005 Eric Seidel <eric@webkit.org>
                   2006 Apple Computer, Inc
 
     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
@@ skipping 41 matching lines @@
     const Path& path() const;
     void setPath(const Path& newPath);
 
     virtual bool isRenderPath() const { return true; }
     virtual const char* renderName() const { return "RenderPath"; }
     
     bool calculateLocalTransform();
     virtual TransformationMatrix localTransform() const;
     
     virtual void layout();
-    virtual IntRect clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer);
+    virtual IntRect clippedOverflowRectForRepaint(RenderBox* repaintContainer);
     virtual bool requiresLayer() const { return false; }
     virtual int lineHeight(bool b, bool isRootLineBox = false) const;
     virtual int baselinePosition(bool b, bool isRootLineBox = false) const;
     virtual void paint(PaintInfo&, int parentX, int parentY);
 
     virtual void absoluteRects(Vector<IntRect>&, int tx, int ty, bool topLevel = true);
     virtual void absoluteQuads(Vector<FloatQuad>&, bool topLevel = true);
     virtual void addFocusRingRects(GraphicsContext*, int tx, int ty);
 
     virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, int x, int y, int tx, int ty, HitTestAction);
 
     FloatRect drawMarkersIfNeeded(GraphicsContext*, const FloatRect&, const Path&) const;
     
 private:
     FloatPoint mapAbsolutePointToLocal(const FloatPoint&) const;
-    virtual IntRect outlineBoundsForRepaint(RenderBoxModelObject* repaintContainer) const;
+    virtual IntRect outlineBoundsForRepaint(RenderBox* repaintContainer) const;
 
     mutable Path m_path;
     mutable FloatRect m_fillBBox;
     mutable FloatRect m_strokeBbox;
     FloatRect m_markerBounds;
     TransformationMatrix m_localTransform;
     IntRect m_absoluteBounds;
 };
 
 }
 
 #endif // ENABLE(SVG)
 #endif
 
 // vim:ts=4:noet