Revert the merge. Mac build is mysteriously broken.

third_party/WebKit/WebCore/rendering/RenderInline.cpp

Index: third_party/WebKit/WebCore/rendering/RenderInline.cpp
===================================================================
--- third_party/WebKit/WebCore/rendering/RenderInline.cpp	(revision 9383)
+++ third_party/WebKit/WebCore/rendering/RenderInline.cpp	(working copy)
@@ -95,21 +95,13 @@
     return toRenderBlock(m_continuation)->inlineContinuation();
 }
 
-void RenderInline::updateBoxModelInfoFromStyle()
-{
-    RenderBoxModelObject::updateBoxModelInfoFromStyle();
-
-    setInline(true); // Needed for run-ins, since run-in is considered a block display type.
-
-    // FIXME: Support transforms and reflections on inline flows someday.
-    setHasTransform(false);
-    setHasReflection(false);    
-}
-
 void RenderInline::styleDidChange(StyleDifference diff, const RenderStyle* oldStyle)
 {
     RenderBox::styleDidChange(diff, oldStyle);
 
+    setInline(true);
+    setHasReflection(false);
+
     // Ensure that all of the split inlines pick up the new style. We
     // only do this if we're an inline, since we don't want to propagate
     // a block's style to the other inlines.
@@ -527,7 +519,7 @@
     return result;
 }
 
-IntRect RenderInline::clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer)
+IntRect RenderInline::clippedOverflowRectForRepaint(RenderBox* repaintContainer)
 {
     // Only run-ins are allowed in here during layout.
     ASSERT(!view() || !view()->layoutStateEnabled() || isRunIn());
@@ -590,7 +582,7 @@
     return r;
 }
 
-IntRect RenderInline::rectWithOutlineForRepaint(RenderBoxModelObject* repaintContainer, int outlineWidth)
+IntRect RenderInline::rectWithOutlineForRepaint(RenderBox* repaintContainer, int outlineWidth)
 {
     IntRect r(RenderBox::rectWithOutlineForRepaint(repaintContainer, outlineWidth));
     for (RenderObject* curr = firstChild(); curr; curr = curr->nextSibling()) {
@@ -675,7 +667,7 @@
     return m_lineHeight;
 }
 
-IntSize RenderInline::relativePositionedInlineOffset(const RenderBox* child) const
+IntSize RenderInline::relativePositionedInlineOffset(const RenderObject* child) const
 {
     ASSERT(isRelPositioned());
     if (!isRelPositioned())
@@ -692,11 +684,11 @@
         sx = firstLineBox()->xPos();
         sy = firstLineBox()->yPos();
     } else {
-        sx = layer()->staticX();
-        sy = layer()->staticY();
+        sx = staticX();
+        sy = staticY();
     }
 
-    if (!child->style()->hasStaticX())
+    if (!child->hasStaticX())
         offset.setWidth(sx);
     // This is not terribly intuitive, but we have to match other browsers.  Despite being a block display type inside
     // an inline, we still keep our x locked to the left of the relative positioned inline.  Arguably the correct
@@ -706,7 +698,7 @@
         // Avoid adding in the left border/padding of the containing block twice.  Subtract it out.
         offset.setWidth(sx - (child->containingBlock()->borderLeft() + child->containingBlock()->paddingLeft()));
 
-    if (!child->style()->hasStaticY())
+    if (!child->hasStaticY())
         offset.setHeight(sy);
 
     return offset;