Move rendering/RenderBox to layout/LayoutBox.

Source/core/layout/LayoutTextControl.cpp

 /**
  * Copyright (C) 2006, 2007 Apple Inc. All rights reserved.
  *           (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.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
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
@@ skipping 89 matching lines @@
     return logicalHeight() - borderAndPaddingLogicalHeight();
 }
 
 int LayoutTextControl::textBlockLogicalWidth() const
 {
     Element* innerEditor = innerEditorElement();
     ASSERT(innerEditor);
 
     LayoutUnit unitWidth = logicalWidth() - borderAndPaddingLogicalWidth();
     if (innerEditor->renderer())
-        unitWidth -= innerEditor->renderBox()->paddingStart() + innerEditor->renderBox()->paddingEnd();
+        unitWidth -= innerEditor->layoutBox()->paddingStart() + innerEditor->layoutBox()->paddingEnd();
 
     return unitWidth;
 }
 
 void LayoutTextControl::updateFromElement()
 {
     Element* innerEditor = innerEditorElement();
     if (innerEditor && innerEditor->renderer())
         updateUserModifyProperty(*textFormControlElement(), innerEditor->renderer()->mutableStyleRef());
 }
 
 int LayoutTextControl::scrollbarThickness() const
 {
     // FIXME: We should get the size of the scrollbar from the LayoutTheme instead.
     return ScrollbarTheme::theme()->scrollbarThickness();
 }
 
 void LayoutTextControl::computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop, LogicalExtentComputedValues& computedValues) const
 {
     HTMLElement* innerEditor = innerEditorElement();
     ASSERT(innerEditor);
-    if (RenderBox* innerEditorBox = innerEditor->renderBox()) {
+    if (LayoutBox* innerEditorBox = innerEditor->layoutBox()) {
         LayoutUnit nonContentHeight = innerEditorBox->borderAndPaddingHeight() + innerEditorBox->marginHeight();
         logicalHeight = computeControlLogicalHeight(innerEditorBox->lineHeight(true, HorizontalLine, PositionOfInteriorLineBoxes), nonContentHeight);
 
         // We are able to have a horizontal scrollbar if the overflow style is scroll, or if its auto and there's no word wrap.
         if ((isHorizontalWritingMode() && (style()->overflowX() == OSCROLL ||  (style()->overflowX() == OAUTO && innerEditor->renderer()->style()->overflowWrap() == NormalOverflowWrap)))
             || (!isHorizontalWritingMode() && (style()->overflowY() == OSCROLL ||  (style()->overflowY() == OAUTO && innerEditor->renderer()->style()->overflowWrap() == NormalOverflowWrap))))
             logicalHeight += scrollbarThickness();
 
         // FIXME: The logical height of the inner text box should have been added before calling computeLogicalHeight to
         // avoid this hack.
         setIntrinsicContentLogicalHeight(logicalHeight);
 
         logicalHeight += borderAndPaddingHeight();
     }
 
-    RenderBox::computeLogicalHeight(logicalHeight, logicalTop, computedValues);
+    LayoutBox::computeLogicalHeight(logicalHeight, logicalTop, computedValues);
 }
 
 void LayoutTextControl::hitInnerEditorElement(HitTestResult& result, const LayoutPoint& pointInContainer, const LayoutPoint& accumulatedOffset)
 {
     HTMLElement* innerEditor = innerEditorElement();
     if (!innerEditor->renderer())
         return;
 
     LayoutPoint adjustedLocation = accumulatedOffset + location();
-    LayoutPoint localPoint = pointInContainer - toLayoutSize(adjustedLocation + innerEditor->renderBox()->location());
+    LayoutPoint localPoint = pointInContainer - toLayoutSize(adjustedLocation + innerEditor->layoutBox()->location());
     if (hasOverflowClip())
         localPoint += scrolledContentOffset();
     result.setInnerNode(innerEditor);
     result.setInnerNonSharedNode(innerEditor);
     result.setLocalPoint(localPoint);
 }
 
 static const char* const fontFamiliesWithInvalidCharWidth[] = {
     "American Typewriter",
     "Arial Hebrew",
@@ skipping 70 matching lines @@
     // This matches the unitsPerEm value for MS Shell Dlg and Courier New from the "head" font table.
     float unitsPerEm = 2048.0f;
     return roundf(style()->font().fontDescription().computedSize() * x / unitsPerEm);
 }
 
 void LayoutTextControl::computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, LayoutUnit& maxLogicalWidth) const
 {
     // Use average character width. Matches IE.
     AtomicString family = style()->font().fontDescription().family().family();
     maxLogicalWidth = preferredContentLogicalWidth(const_cast<LayoutTextControl*>(this)->getAvgCharWidth(family));
-    if (RenderBox* innerEditorRenderBox = innerEditorElement()->renderBox())
-        maxLogicalWidth += innerEditorRenderBox->paddingStart() + innerEditorRenderBox->paddingEnd();
+    if (LayoutBox* innerEditorLayoutBox = innerEditorElement()->layoutBox())
+        maxLogicalWidth += innerEditorLayoutBox->paddingStart() + innerEditorLayoutBox->paddingEnd();
     if (!style()->logicalWidth().isPercent())
         minLogicalWidth = maxLogicalWidth;
 }
 
 void LayoutTextControl::computePreferredLogicalWidths()
 {
     ASSERT(preferredLogicalWidthsDirty());
 
     m_minPreferredLogicalWidth = 0;
     m_maxPreferredLogicalWidth = 0;
@@ skipping 33 matching lines @@
     HTMLElement* placeholder = toHTMLTextFormControlElement(node())->placeholderElement();
     LayoutObject* placeholderRenderer = placeholder ? placeholder->renderer() : 0;
     if (!placeholderRenderer)
         return 0;
     if (relayoutChildren)
         layoutScope.setChildNeedsLayout(placeholderRenderer);
     return placeholderRenderer;
 }
 
 } // namespace blink