Revert the merge. Mac build is mysteriously broken.

third_party/WebKit/WebCore/rendering/RenderSelectionInfo.h

 /*
  * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
  *           (C) 2000 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Dirk Mueller (mueller@kde.org)
  *           (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
  *
  * 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 29 matching lines @@
     }
 
     RenderSelectionInfoBase(RenderObject* o)
         : m_object(o)
         , m_repaintContainer(o->containerForRepaint())
         , m_state(o->selectionState())
     {
     }
     
     RenderObject* object() const { return m_object; }
-    RenderBoxModelObject* repaintContainer() const { return m_repaintContainer; }
+    RenderBox* repaintContainer() const { return m_repaintContainer; }
     RenderObject::SelectionState state() const { return m_state; }
 
 protected:
     RenderObject* m_object;
-    RenderBoxModelObject* m_repaintContainer;
+    RenderBox* m_repaintContainer;
     RenderObject::SelectionState m_state;
 };
 
 // This struct is used when the selection changes to cache the old and new state of the selection for each RenderObject.
 class RenderSelectionInfo : public RenderSelectionInfoBase {
 public:
     RenderSelectionInfo(RenderObject* o, bool clipToVisibleContent)
         : RenderSelectionInfoBase(o)
         , m_rect(o->needsLayout() ? IntRect() : o->selectionRectForRepaint(m_repaintContainer, clipToVisibleContent))
     {
@@ skipping 29 matching lines @@
     GapRects rects() const { return m_rects; }
 
 private:
     GapRects m_rects; // relative to repaint container
 };
 
 } // namespace WebCore
 
 
 #endif // SelectionInfo_h