Move rendering/RenderBox to layout/LayoutBox.

Source/core/layout/LayoutListMarker.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
  * Copyright (C) 2006 Andrew Wellington (proton@wiretapped.net)
  * Copyright (C) 2010 Daniel Bates (dbates@intudata.com)
  *
  * 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 1030 matching lines @@
         return toGeorgian(value);
     case Hebrew:
         return toHebrew(value);
     }
 
     ASSERT_NOT_REACHED();
     return "";
 }
 
 LayoutListMarker::LayoutListMarker(LayoutListItem* item)
-    : RenderBox(0)
+    : LayoutBox(0)
     , m_listItem(item)
 {
     // init LayoutObject attributes
     setInline(true); // our object is Inline
     setReplaced(true); // pretend to be replaced
 }
 
 LayoutListMarker::~LayoutListMarker()
 {
 }
 
 void LayoutListMarker::destroy()
 {
     if (m_image)
         m_image->removeClient(this);
-    RenderBox::destroy();
+    LayoutBox::destroy();
 }
 
 LayoutListMarker* LayoutListMarker::createAnonymous(LayoutListItem* item)
 {
     Document& document = item->document();
     LayoutListMarker* renderer = new LayoutListMarker(item);
     renderer->setDocumentForAnonymous(&document);
     return renderer;
 }
 
 void LayoutListMarker::styleWillChange(StyleDifference diff, const LayoutStyle& newStyle)
 {
     if (style() && (newStyle.listStylePosition() != style()->listStylePosition() || newStyle.listStyleType() != style()->listStyleType()))
         setNeedsLayoutAndPrefWidthsRecalcAndFullPaintInvalidation();
 
-    RenderBox::styleWillChange(diff, newStyle);
+    LayoutBox::styleWillChange(diff, newStyle);
 }
 
 void LayoutListMarker::styleDidChange(StyleDifference diff, const LayoutStyle* oldStyle)
 {
-    RenderBox::styleDidChange(diff, oldStyle);
+    LayoutBox::styleDidChange(diff, oldStyle);
 
     if (m_image != style()->listStyleImage()) {
         if (m_image)
             m_image->removeClient(this);
         m_image = style()->listStyleImage();
         if (m_image)
             m_image->addClient(this);
     }
 }
 
 InlineBox* LayoutListMarker::createInlineBox()
 {
-    InlineBox* result = RenderBox::createInlineBox();
+    InlineBox* result = LayoutBox::createInlineBox();
     result->setIsText(isText());
     return result;
 }
 
 bool LayoutListMarker::isImage() const
 {
     return m_image && !m_image->errorOccurred();
 }
 
 LayoutRect LayoutListMarker::localSelectionRect()
@@ skipping 354 matching lines @@
     }
 
     style()->setMarginStart(Length(marginStart, Fixed));
     style()->setMarginEnd(Length(marginEnd, Fixed));
 }
 
 LayoutUnit LayoutListMarker::lineHeight(bool firstLine, LineDirectionMode direction, LinePositionMode linePositionMode) const
 {
     if (!isImage())
         return m_listItem->lineHeight(firstLine, direction, PositionOfInteriorLineBoxes);
-    return RenderBox::lineHeight(firstLine, direction, linePositionMode);
+    return LayoutBox::lineHeight(firstLine, direction, linePositionMode);
 }
 
 int LayoutListMarker::baselinePosition(FontBaseline baselineType, bool firstLine, LineDirectionMode direction, LinePositionMode linePositionMode) const
 {
     ASSERT(linePositionMode == PositionOnContainingLine);
     if (!isImage())
         return m_listItem->baselinePosition(baselineType, firstLine, direction, PositionOfInteriorLineBoxes);
-    return RenderBox::baselinePosition(baselineType, firstLine, direction, linePositionMode);
+    return LayoutBox::baselinePosition(baselineType, firstLine, direction, linePositionMode);
 }
 
 bool LayoutListMarker::isInside() const
 {
     return m_listItem->notInList() || style()->listStylePosition() == INSIDE;
 }
 
 IntRect LayoutListMarker::getRelativeMarkerRect()
 {
     if (isImage())
@@ skipping 108 matching lines @@
         relativeRect = relativeRect.transposedRect();
         relativeRect.setX(size().width() - relativeRect.x() - relativeRect.width());
     }
 
     return relativeRect;
 }
 
 void LayoutListMarker::setSelectionState(SelectionState state)
 {
     // The selection state for our containing block hierarchy is updated by the base class call.
-    RenderBox::setSelectionState(state);
+    LayoutBox::setSelectionState(state);
 
     if (inlineBoxWrapper() && canUpdateSelectionOnRootLineBoxes())
         inlineBoxWrapper()->root().setHasSelectedChildren(state != SelectionNone);
 }
 
 LayoutRect LayoutListMarker::selectionRectForPaintInvalidation(const LayoutBoxModelObject* paintInvalidationContainer) const
 {
     ASSERT(!needsLayout());
 
     if (selectionState() == SelectionNone || !inlineBoxWrapper())
@@ skipping 17 matching lines @@
     if (style()) {
         // Reuse the current margins. Otherwise resetting the margins to initial values
         // would trigger unnecessary layout.
         newStyle->setMarginStart(style()->marginStart());
         newStyle->setMarginEnd(style()->marginRight());
     }
     setStyle(newStyle.release());
 }
 
 } // namespace blink