Move rendering/RenderBox to layout/LayoutBox.

Source/core/layout/LayoutTextControlSingleLine.cpp

 /**
  * Copyright (C) 2006, 2007, 2010 Apple Inc. All rights reserved.
  *           (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  * Copyright (C) 2010 Google Inc. All rights reserved.
  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
  *
  * 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.
@@ skipping 87 matching lines @@
     // styleDidChange(). We need them because
     // - Center the inner elements vertically if the input height is taller than
     //   the intrinsic height of the inner elements.
     // - Shrink the inner elment heights if the input height is samller than the
     //   intrinsic heights of the inner elements.
 
     // We don't honor paddings and borders for textfields without decorations
     // and type=search if the text height is taller than the contentHeight()
     // because of compability.
 
-    RenderBox* innerEditorRenderer = innerEditorElement()->renderBox();
-    RenderBox* viewPortRenderer = editingViewPortElement() ? editingViewPortElement()->renderBox() : 0;
+    LayoutBox* innerEditorRenderer = innerEditorElement()->layoutBox();
+    LayoutBox* viewPortRenderer = editingViewPortElement() ? editingViewPortElement()->layoutBox() : 0;
 
     // To ensure consistency between layouts, we need to reset any conditionally overriden height.
     if (innerEditorRenderer && !innerEditorRenderer->style()->logicalHeight().isAuto()) {
         innerEditorRenderer->style()->setLogicalHeight(Length(Auto));
         layoutScope.setNeedsLayout(innerEditorRenderer);
         HTMLElement* placeholderElement = inputElement()->placeholderElement();
-        if (RenderBox* placeholderBox = placeholderElement ? placeholderElement->renderBox() : 0)
+        if (LayoutBox* placeholderBox = placeholderElement ? placeholderElement->layoutBox() : 0)
             layoutScope.setNeedsLayout(placeholderBox);
     }
     if (viewPortRenderer && !viewPortRenderer->style()->logicalHeight().isAuto()) {
         viewPortRenderer->style()->setLogicalHeight(Length(Auto));
         layoutScope.setNeedsLayout(viewPortRenderer);
     }
 
     RenderBlockFlow::layoutBlock(false);
 
     Element* container = containerElement();
-    RenderBox* containerRenderer = container ? container->renderBox() : 0;
+    LayoutBox* containerRenderer = container ? container->layoutBox() : 0;
 
     // Set the text block height
     LayoutUnit desiredLogicalHeight = textBlockLogicalHeight();
     LayoutUnit logicalHeightLimit = computeLogicalHeightLimit();
     if (innerEditorRenderer && innerEditorRenderer->logicalHeight() > logicalHeightLimit) {
         if (desiredLogicalHeight != innerEditorRenderer->logicalHeight())
             layoutScope.setNeedsLayout(this);
 
         m_desiredInnerEditorLogicalHeight = desiredLogicalHeight;
 
@@ skipping 25 matching lines @@
 
     // Center the child block in the block progression direction (vertical centering for horizontal text fields).
     if (!container && innerEditorRenderer && innerEditorRenderer->size().height() != contentLogicalHeight()) {
         LayoutUnit logicalHeightDiff = innerEditorRenderer->logicalHeight() - contentLogicalHeight();
         innerEditorRenderer->setLogicalTop(innerEditorRenderer->logicalTop() - (logicalHeightDiff / 2 + layoutMod(logicalHeightDiff, 2)));
     } else {
         centerContainerIfNeeded(containerRenderer);
     }
 
     HTMLElement* placeholderElement = inputElement()->placeholderElement();
-    if (RenderBox* placeholderBox = placeholderElement ? placeholderElement->renderBox() : 0) {
+    if (LayoutBox* placeholderBox = placeholderElement ? placeholderElement->layoutBox() : 0) {
         LayoutSize innerEditorSize;
 
         if (innerEditorRenderer)
             innerEditorSize = innerEditorRenderer->size();
         placeholderBox->style()->setWidth(Length(innerEditorSize.width() - placeholderBox->borderAndPaddingWidth(), Fixed));
         placeholderBox->style()->setHeight(Length(innerEditorSize.height() - placeholderBox->borderAndPaddingHeight(), Fixed));
         bool neededLayout = placeholderBox->needsLayout();
         placeholderBox->layoutIfNeeded();
         LayoutPoint textOffset;
         if (innerEditorRenderer)
             textOffset = innerEditorRenderer->location();
-        if (editingViewPortElement() && editingViewPortElement()->renderBox())
-            textOffset += toLayoutSize(editingViewPortElement()->renderBox()->location());
+        if (editingViewPortElement() && editingViewPortElement()->layoutBox())
+            textOffset += toLayoutSize(editingViewPortElement()->layoutBox()->location());
         if (containerRenderer)
             textOffset += toLayoutSize(containerRenderer->location());
         placeholderBox->setLocation(textOffset);
 
         // The placeholder gets layout last, after the parent text control and its other children,
         // so in order to get the correct overflow from the placeholder we need to recompute it now.
         if (neededLayout)
             computeOverflow(clientLogicalBottom());
     }
 }
 
 bool LayoutTextControlSingleLine::nodeAtPoint(const HitTestRequest& request, HitTestResult& result, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction hitTestAction)
 {
     if (!LayoutTextControl::nodeAtPoint(request, result, locationInContainer, accumulatedOffset, hitTestAction))
         return false;
 
     // Say that we hit the inner text element if
     //  - we hit a node inside the inner text element,
     //  - we hit the <input> element (e.g. we're over the border or padding), or
     //  - we hit regions not in any decoration buttons.
     Element* container = containerElement();
     if (result.innerNode()->isDescendantOf(innerEditorElement()) || result.innerNode() == node() || (container && container == result.innerNode())) {
         LayoutPoint pointInParent = locationInContainer.point();
         if (container && editingViewPortElement()) {
-            if (editingViewPortElement()->renderBox())
-                pointInParent -= toLayoutSize(editingViewPortElement()->renderBox()->location());
-            if (container->renderBox())
-                pointInParent -= toLayoutSize(container->renderBox()->location());
+            if (editingViewPortElement()->layoutBox())
+                pointInParent -= toLayoutSize(editingViewPortElement()->layoutBox()->location());
+            if (container->layoutBox())
+                pointInParent -= toLayoutSize(container->layoutBox()->location());
         }
         hitInnerEditorElement(result, pointInParent, accumulatedOffset);
     }
     return true;
 }
 
 void LayoutTextControlSingleLine::styleDidChange(StyleDifference diff, const LayoutStyle* oldStyle)
 {
     m_desiredInnerEditorLogicalHeight = -1;
     LayoutTextControl::styleDidChange(diff, oldStyle);
@@ skipping 42 matching lines @@
 bool LayoutTextControlSingleLine::hasControlClip() const
 {
     // Apply control clip for text fields with decorations.
     return !!containerElement();
 }
 
 LayoutRect LayoutTextControlSingleLine::controlClipRect(const LayoutPoint& additionalOffset) const
 {
     ASSERT(hasControlClip());
     LayoutRect clipRect = contentBoxRect();
-    if (containerElement()->renderBox())
-        clipRect = unionRect(clipRect, containerElement()->renderBox()->frameRect());
+    if (containerElement()->layoutBox())
+        clipRect = unionRect(clipRect, containerElement()->layoutBox()->frameRect());
     clipRect.moveBy(additionalOffset);
     return clipRect;
 }
 
 float LayoutTextControlSingleLine::getAvgCharWidth(AtomicString family)
 {
     // Since Lucida Grande is the default font, we want this to match the width
     // of MS Shell Dlg, the default font for textareas in Firefox, Safari Win and
     // IE for some encodings (in IE, the default font is encoding specific).
     // 901 is the avgCharWidth value in the OS/2 table for MS Shell Dlg.
@@ skipping 22 matching lines @@
         maxCharWidth = scaleEmToUnits(4027);
     else if (hasValidAvgCharWidth(family))
         maxCharWidth = roundf(style()->font().primaryFont()->maxCharWidth());
 
     // For text inputs, IE adds some extra width.
     if (maxCharWidth > 0.f)
         result += maxCharWidth - charWidth;
 
     if (includesDecoration) {
         HTMLElement* spinButton = innerSpinButtonElement();
-        if (RenderBox* spinRenderer = spinButton ? spinButton->renderBox() : 0) {
+        if (LayoutBox* spinRenderer = spinButton ? spinButton->layoutBox() : 0) {
             result += spinRenderer->borderAndPaddingLogicalWidth();
             // Since the width of spinRenderer is not calculated yet, spinRenderer->logicalWidth() returns 0.
             // So computedStyle()->logicalWidth() is used instead.
             result += spinButton->computedStyle()->logicalWidth().value();
         }
     }
 
     return result;
 }
 
@@ skipping 29 matching lines @@
     return textBlockStyle.release();
 }
 
 bool LayoutTextControlSingleLine::textShouldBeTruncated() const
 {
     return document().focusedElement() != node() && style()->textOverflow() == TextOverflowEllipsis;
 }
 
 void LayoutTextControlSingleLine::autoscroll(const IntPoint& position)
 {
-    RenderBox* renderer = innerEditorElement()->renderBox();
+    LayoutBox* renderer = innerEditorElement()->layoutBox();
     if (!renderer)
         return;
 
     renderer->autoscroll(position);
 }
 
 LayoutUnit LayoutTextControlSingleLine::scrollWidth() const
 {
-    if (RenderBox* inner = innerEditorElement() ? innerEditorElement()->renderBox() : 0) {
+    if (LayoutBox* inner = innerEditorElement() ? innerEditorElement()->layoutBox() : 0) {
         // Adjust scrollWidth to inculde input element horizontal paddings and
         // decoration width
         LayoutUnit adjustment = clientWidth() - inner->clientWidth();
         return innerEditorElement()->scrollWidth() + adjustment;
     }
     return RenderBlockFlow::scrollWidth();
 }
 
 LayoutUnit LayoutTextControlSingleLine::scrollHeight() const
 {
-    if (RenderBox* inner = innerEditorElement() ? innerEditorElement()->renderBox() : 0) {
+    if (LayoutBox* inner = innerEditorElement() ? innerEditorElement()->layoutBox() : 0) {
         // Adjust scrollHeight to include input element vertical paddings and
         // decoration height
         LayoutUnit adjustment = clientHeight() - inner->clientHeight();
         return innerEditorElement()->scrollHeight() + adjustment;
     }
     return RenderBlockFlow::scrollHeight();
 }
 
 LayoutUnit LayoutTextControlSingleLine::scrollLeft() const
 {
@@ skipping 20 matching lines @@
     if (innerEditorElement())
         innerEditorElement()->setScrollTop(newTop);
 }
 
 HTMLInputElement* LayoutTextControlSingleLine::inputElement() const
 {
     return toHTMLInputElement(node());
 }
 
 }