Revert the merge. Mac build is mysteriously broken.

third_party/WebKit/WebCore/rendering/RenderInline.h

 /*
  * This file is part of the render object implementation for KHTML.
  *
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2003 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
@@ skipping 55 matching lines @@
     virtual bool requiresLayer() const { return isRelPositioned() || isTransparent() || hasMask(); }
 
     virtual int offsetLeft() const;
     virtual int offsetTop() const;
     virtual int offsetWidth() const { return linesBoundingBox().width(); }
     virtual int offsetHeight() const { return linesBoundingBox().height(); }
 
     virtual void absoluteRects(Vector<IntRect>&, int tx, int ty, bool topLevel = true);
     virtual void absoluteQuads(Vector<FloatQuad>&, bool topLevel = true);
 
-    virtual IntRect clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer);
-    virtual IntRect rectWithOutlineForRepaint(RenderBoxModelObject* repaintContainer, int outlineWidth);
+    virtual IntRect clippedOverflowRectForRepaint(RenderBox* repaintContainer);
+    virtual IntRect rectWithOutlineForRepaint(RenderBox* repaintContainer, int outlineWidth);
 
     virtual VisiblePosition positionForCoordinates(int x, int y);
 
     IntRect linesBoundingBox() const;
     
     virtual IntRect borderBoundingBox() const
     {
         IntRect boundingBox = linesBoundingBox();
         return IntRect(0, 0, boundingBox.width(), boundingBox.height());
     }
@@ skipping 13 matching lines @@
     RenderBox* continuation() const { return m_continuation; }
     RenderInline* inlineContinuation() const;
     void setContinuation(RenderBox* c) { m_continuation = c; }
     
     virtual void updateDragState(bool dragOn);
     
     virtual void childBecameNonInline(RenderObject* child);
 
     virtual void updateHitTestResult(HitTestResult&, const IntPoint&);
 
-    IntSize relativePositionedInlineOffset(const RenderBox* child) const;
+    IntSize relativePositionedInlineOffset(const RenderObject* child) const;
 
     virtual void addFocusRingRects(GraphicsContext*, int tx, int ty);
     void paintOutline(GraphicsContext*, int tx, int ty);
 
     void calcMargins(int containerWidth)
     {
         m_marginLeft = style()->marginLeft().calcMinValue(containerWidth);
         m_marginRight = style()->marginRight().calcMinValue(containerWidth);
     }
     
 #if ENABLE(DASHBOARD_SUPPORT)
     virtual void addDashboardRegions(Vector<DashboardRegionValue>&);
 #endif
     
 protected:
     virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle);
-    virtual void updateBoxModelInfoFromStyle();
 
     static RenderInline* cloneInline(RenderInline* src);
 
 private:
     void paintOutlineForLine(GraphicsContext*, int tx, int ty, const IntRect& prevLine, const IntRect& thisLine, const IntRect& nextLine);
     RenderBox* continuationBefore(RenderObject* beforeChild);
 
 protected:
     RenderObjectChildList m_children;
     RenderLineBoxList m_lineBoxes;   // All of the line boxes created for this inline flow.  For example, <i>Hello<br>world.</i> will have two <i> line boxes.
@@ skipping 15 matching lines @@
     ASSERT(!o || o->isRenderInline());
     return static_cast<const RenderInline*>(o);
 }
 
 // This will catch anyone doing an unnecessary cast.
 void toRenderInline(const RenderInline*);
 
 } // namespace WebCore
 
 #endif // RenderInline_h