Revert the merge. Mac build is mysteriously broken.

third_party/WebKit/WebCore/rendering/RenderObject.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Dirk Mueller (mueller@kde.org)
  *           (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008 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 540 matching lines @@
     
     ASSERT_NOT_REACHED();
     return 0;
 }
 
 RenderBlock* RenderObject::firstLineBlock() const
 {
     return 0;
 }
 
+bool RenderObject::hasStaticX() const
+{
+    return (style()->left().isAuto() && style()->right().isAuto()) || style()->left().isStatic() || style()->right().isStatic();
+}
+
+bool RenderObject::hasStaticY() const
+{
+    return (style()->top().isAuto() && style()->bottom().isAuto()) || style()->top().isStatic();
+}
+
 void RenderObject::setPrefWidthsDirty(bool b, bool markParents)
 {
     bool alreadyDirty = m_prefWidthsDirty;
     m_prefWidthsDirty = b;
     if (b && !alreadyDirty && markParents && (isText() || (style()->position() != FixedPosition && style()->position() != AbsolutePosition)))
         invalidateContainerPrefWidths();
 }
 
 void RenderObject::invalidateContainerPrefWidths()
 {
@@ skipping 18 matching lines @@
 RenderBlock* RenderObject::containingBlock() const
 {
     if (isTableCell()) {
         const RenderTableCell* cell = static_cast<const RenderTableCell*>(this);
         if (parent() && cell->section())
             return cell->table();
         return 0;
     }
 
     if (isRenderView())
-        return const_cast<RenderView*>(toRenderView(this));
+        return const_cast<RenderBlock*>(static_cast<const RenderBlock*>(this));
 
     RenderObject* o = parent();
     if (!isText() && m_style->position() == FixedPosition) {
         while (o && !o->isRenderView() && !(o->hasTransform() && o->isRenderBlock()))
             o = o->parent();
     } else if (!isText() && m_style->position() == AbsolutePosition) {
         while (o && (o->style()->position() == StaticPosition || (o->isInline() && !o->isReplaced())) && !o->isRenderView() && !(o->hasTransform() && o->isRenderBlock())) {
             // For relpositioned inlines, we return the nearest enclosing block.  We don't try
             // to return the inline itself.  This allows us to avoid having a positioned objects
             // list in all RenderInlines and lets us return a strongly-typed RenderBlock* result
@@ skipping 1015 matching lines @@
     topLevelRect = result;
     for (RenderObject* current = firstChild(); current; current = current->nextSibling())
         current->addAbsoluteRectForLayer(result);
     return result;
 }
 
 void RenderObject::paint(PaintInfo& /*paintInfo*/, int /*tx*/, int /*ty*/)
 {
 }
 
-RenderBoxModelObject* RenderObject::containerForRepaint() const
+RenderBox* RenderObject::containerForRepaint() const
 {
 #if USE(ACCELERATED_COMPOSITING)
     if (RenderView* v = view()) {
         if (v->usesCompositing()) {
             RenderLayer* compLayer = enclosingCompositingLayer();
             return compLayer ? compLayer->renderer() : 0;
         }
     }
 #endif
     // Do root-relative repaint.
     return 0;
 }
 
-void RenderObject::repaintUsingContainer(RenderBoxModelObject* repaintContainer, const IntRect& r, bool immediate)
+void RenderObject::repaintUsingContainer(RenderBox* repaintContainer, const IntRect& r, bool immediate)
 {
     if (!repaintContainer || repaintContainer->isRenderView()) {
         RenderView* v = repaintContainer ? toRenderView(repaintContainer) : view();
         v->repaintViewRectangle(r, immediate);
     } else {
 #if USE(ACCELERATED_COMPOSITING)
         RenderView* v = view();
         if (v->usesCompositing()) {
             ASSERT(repaintContainer->hasLayer() && repaintContainer->layer()->isComposited());
             repaintContainer->layer()->setBackingNeedsRepaintInRect(r);
@@ skipping 10 matching lines @@
     RenderObject* o = this;
     while (o->parent())
         o = o->parent();
     if (!o->isRenderView())
         return;
 
     RenderView* view = toRenderView(o);
     if (view->printing())
         return; // Don't repaint if we're printing.
 
-    RenderBoxModelObject* repaintContainer = containerForRepaint();
+    RenderBox* repaintContainer = containerForRepaint();
     repaintUsingContainer(repaintContainer ? repaintContainer : view, clippedOverflowRectForRepaint(repaintContainer), immediate);
 }
 
 void RenderObject::repaintRectangle(const IntRect& r, bool immediate)
 {
     // Can't use view(), since we might be unrooted.
     RenderObject* o = this;
     while (o->parent())
         o = o->parent();
     if (!o->isRenderView())
         return;
 
     RenderView* view = toRenderView(o);
     if (view->printing())
         return; // Don't repaint if we're printing.
 
     IntRect dirtyRect(r);
 
     // FIXME: layoutDelta needs to be applied in parts before/after transforms and
     // repaint containers. https://bugs.webkit.org/show_bug.cgi?id=23308
     dirtyRect.move(view->layoutDelta());
 
-    RenderBoxModelObject* repaintContainer = containerForRepaint();
+    RenderBox* repaintContainer = containerForRepaint();
     computeRectForRepaint(repaintContainer, dirtyRect);
     repaintUsingContainer(repaintContainer ? repaintContainer : view, dirtyRect, immediate);
 }
 
-bool RenderObject::repaintAfterLayoutIfNeeded(RenderBoxModelObject* repaintContainer, const IntRect& oldBounds, const IntRect& oldOutlineBox)
+bool RenderObject::repaintAfterLayoutIfNeeded(RenderBox* repaintContainer, const IntRect& oldBounds, const IntRect& oldOutlineBox)
 {
     RenderView* v = view();
     if (v->printing())
         return false; // Don't repaint if we're printing.
 
     IntRect newBounds = clippedOverflowRectForRepaint(repaintContainer);
     IntRect newOutlineBox;
 
     bool fullRepaint = selfNeedsLayout();
     // Presumably a background or a border exists if border-fit:lines was specified.
@@ skipping 98 matching lines @@
 }
 
 bool RenderObject::checkForRepaintDuringLayout() const
 {
     // FIXME: <https://bugs.webkit.org/show_bug.cgi?id=20885> It is probably safe to also require
     // m_everHadLayout. Currently, only RenderBlock::layoutBlock() adds this condition. See also
     // <https://bugs.webkit.org/show_bug.cgi?id=15129>.
     return !document()->view()->needsFullRepaint() && !hasLayer();
 }
 
-IntRect RenderObject::rectWithOutlineForRepaint(RenderBoxModelObject* repaintContainer, int outlineWidth)
+IntRect RenderObject::rectWithOutlineForRepaint(RenderBox* repaintContainer, int outlineWidth)
 {
     IntRect r(clippedOverflowRectForRepaint(repaintContainer));
     r.inflate(outlineWidth);
     return r;
 }
 
-IntRect RenderObject::clippedOverflowRectForRepaint(RenderBoxModelObject*)
-{
-    ASSERT_NOT_REACHED();
+IntRect RenderObject::clippedOverflowRectForRepaint(RenderBox* repaintContainer)
+{
+    if (parent())
+        return parent()->clippedOverflowRectForRepaint(repaintContainer);
     return IntRect();
 }
 
-void RenderObject::computeRectForRepaint(RenderBoxModelObject* repaintContainer, IntRect& rect, bool fixed)
+void RenderObject::computeRectForRepaint(RenderBox* repaintContainer, IntRect& rect, bool fixed)
 {
     if (repaintContainer == this)
         return;
 
     if (RenderObject* o = parent()) {
         if (o->isBlockFlow()) {
             RenderBlock* cb = toRenderBlock(o);
             if (cb->hasColumns())
                 cb->adjustRectForColumns(rect);
         }
@@ skipping 161 matching lines @@
     
     RefPtr<RenderStyle> oldStyle = m_style.release();
     m_style = style;
 
     updateFillImages(oldStyle ? oldStyle->backgroundLayers() : 0, m_style ? m_style->backgroundLayers() : 0);
     updateFillImages(oldStyle ? oldStyle->maskLayers() : 0, m_style ? m_style->maskLayers() : 0);
 
     updateImage(oldStyle ? oldStyle->borderImage().image() : 0, m_style ? m_style->borderImage().image() : 0);
     updateImage(oldStyle ? oldStyle->maskBoxImage().image() : 0, m_style ? m_style->maskBoxImage().image() : 0);
 
-    // We need to ensure that view->maximalOutlineSize() is valid for any repaints that happen
-    // during styleDidChange (it's used by clippedOverflowRectForRepaint()).
-    if (m_style->outlineWidth() > 0 && m_style->outlineSize() > maximalOutlineSize(PaintPhaseOutline))
-        toRenderView(document()->renderer())->setMaximalOutlineSize(m_style->outlineSize());
-
     styleDidChange(diff, oldStyle.get());
 }
 
 void RenderObject::setStyleInternal(PassRefPtr<RenderStyle> style)
 {
     m_style = style;
 }
 
 void RenderObject::styleWillChange(StyleDifference diff, const RenderStyle* newStyle)
 {
@@ skipping 59 matching lines @@
             if (oldStyleSlowScroll)
                 view()->frameView()->removeSlowRepaintObject();
             if (newStyleSlowScroll)
                 view()->frameView()->addSlowRepaintObject();
         }
     }
 }
 
 void RenderObject::styleDidChange(StyleDifference diff, const RenderStyle*)
 {
+    setHasBoxDecorations(m_style->hasBorder() || m_style->hasBackground() || m_style->hasAppearance() || m_style->boxShadow());
+
     if (s_affectsParentBlock)
         handleDynamicFloatPositionChange();
 
     if (!m_parent)
         return;
     
     if (diff == StyleDifferenceLayout)
         setNeedsLayoutAndPrefWidthsRecalc();
     else if (diff == StyleDifferenceLayoutPositionedMovementOnly)
         setNeedsPositionedMovementLayout();
@@ skipping 48 matching lines @@
     RenderObject* o = parent();
     if (o) {
         FloatPoint localPoint = o->absoluteToLocal(containerPoint, fixed, useTransforms);
         if (o->hasOverflowClip())
             localPoint += toRenderBox(o)->layer()->scrolledContentOffset();
         return localPoint;
     }
     return FloatPoint();
 }
 
-FloatQuad RenderObject::localToContainerQuad(const FloatQuad& localQuad, RenderBoxModelObject* repaintContainer, bool fixed) const
+FloatQuad RenderObject::localToContainerQuad(const FloatQuad& localQuad, RenderBox* repaintContainer, bool fixed) const
 {
     if (repaintContainer == this)
         return localQuad;
 
     RenderObject* o = parent();
     if (o) {
         FloatQuad quad = localQuad;
         if (o->hasOverflowClip())
             quad -= toRenderBox(o)->layer()->scrolledContentOffset();
         return o->localToContainerQuad(quad, repaintContainer, fixed);
@@ skipping 552 matching lines @@
 unsigned RenderObject::caretMaxRenderedOffset() const
 {
     return 0;
 }
 
 int RenderObject::previousOffset(int current) const
 {
     return current - 1;
 }
 
-int RenderObject::previousOffsetForBackwardDeletion(int current) const
-{
-    return current - 1;
-}
-
 int RenderObject::nextOffset(int current) const
 {
     return current + 1;
 }
 
 void RenderObject::adjustRectForOutlineAndShadow(IntRect& rect) const
 {
     int outlineSize = outlineStyleForRepaint()->outlineSize();
     if (ShadowData* boxShadow = style()->boxShadow()) {
         int shadowLeft = 0;
@@ skipping 53 matching lines @@
 #ifndef NDEBUG
 
 void showTree(const WebCore::RenderObject* ro)
 {
     if (ro)
         ro->showTreeForThis();
 }
 
 #endif