Revert the merge. Mac build is mysteriously broken.

third_party/WebKit/WebCore/rendering/RenderBR.h

 /*
  * This file is part of the DOM implementation for KDE.
  *
  * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
  *
  * 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 22 matching lines @@
 
 class Position;
 
 class RenderBR : public RenderText {
 public:
     RenderBR(Node*);
     virtual ~RenderBR();
 
     virtual const char* renderName() const { return "RenderBR"; }
  
-    virtual IntRect selectionRectForRepaint(RenderBoxModelObject* /*repaintContainer*/, bool /*clipToVisibleContent*/) { return IntRect(); }
+    virtual IntRect selectionRectForRepaint(RenderBox* /*repaintContainer*/, bool /*clipToVisibleContent*/) { return IntRect(); }
 
     virtual unsigned width(unsigned /*from*/, unsigned /*len*/, const Font&, int /*xpos*/) const { return 0; }
     virtual unsigned width(unsigned /*from*/, unsigned /*len*/, int /*xpos*/, bool /*firstLine = false*/) const { return 0; }
 
     virtual int lineHeight(bool firstLine, bool isRootLineBox = false) const;
     virtual int baselinePosition(bool firstLine, bool isRootLineBox = false) const;
 
     // overrides
     virtual InlineBox* createInlineBox(bool, bool, bool isOnlyRun = false);
 
     virtual bool isBR() const { return true; }
 
     virtual int caretMinOffset() const;
     virtual int caretMaxOffset() const;
     virtual unsigned caretMaxRenderedOffset() const;
 
     virtual VisiblePosition positionForCoordinates(int x, int y);
 
 protected:
     virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle);
 
 private:
     mutable int m_lineHeight;
 };
 
 } // namespace WebCore
 
 #endif // RenderBR_h