Revert the merge. Mac build is mysteriously broken.

third_party/WebKit/WebCore/rendering/RenderForeignObject.h

 /*
  * This file is part of the WebKit project.
  *
  * Copyright (C) 2006 Apple Computer, Inc.
  *
  * 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 24 matching lines @@
 public:
     RenderForeignObject(SVGForeignObjectElement*);
 
     virtual const char* renderName() const { return "RenderForeignObject"; }
 
     virtual void paint(PaintInfo&, int parentX, int parentY);
 
     virtual TransformationMatrix localTransform() const { return m_localTransform; }
     virtual bool calculateLocalTransform();
 
-    virtual void computeRectForRepaint(RenderBoxModelObject* repaintContainer, IntRect&, bool fixed = false);
+    virtual void computeRectForRepaint(RenderBox* repaintContainer, IntRect&, bool fixed = false);
     virtual bool requiresLayer() const { return false; }
     virtual void layout();
 
     virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, int x, int y, int tx, int ty, HitTestAction);
 
  private:
     TransformationMatrix translationForAttributes();
 
     TransformationMatrix m_localTransform;
     IntRect m_absoluteBounds;
 };
 
 } // namespace WebCore
 
 #endif // ENABLE(SVG) && ENABLE(SVG_FOREIGN_OBJECT)
 #endif // RenderForeignObject_h