Rename renderer() to layoutObject().

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 50 matching lines @@
     else
         LayoutBlockFlow::addChild(newChild, beforeChild);
 }
 
 void LayoutTextControl::styleDidChange(StyleDifference diff, const LayoutStyle* oldStyle)
 {
     LayoutBlockFlow::styleDidChange(diff, oldStyle);
     Element* innerEditor = innerEditorElement();
     if (!innerEditor)
         return;
-    LayoutBlock* innerEditorRenderer = toLayoutBlock(innerEditor->renderer());
+    LayoutBlock* innerEditorRenderer = toLayoutBlock(innerEditor->layoutObject());
     if (innerEditorRenderer) {
         // We may have set the width and the height in the old style in layout().
         // Reset them now to avoid getting a spurious layout hint.
         innerEditorRenderer->style()->setHeight(Length());
         innerEditorRenderer->style()->setWidth(Length());
         innerEditorRenderer->setStyle(createInnerEditorStyle(styleRef()));
         innerEditor->setNeedsStyleRecalc(SubtreeStyleChange, StyleChangeReasonForTracing::create(StyleChangeReason::Control));
     }
     textFormControlElement()->updatePlaceholderVisibility(false);
 }
@@ skipping 17 matching lines @@
 {
     return logicalHeight() - borderAndPaddingLogicalHeight();
 }
 
 int LayoutTextControl::textBlockLogicalWidth() const
 {
     Element* innerEditor = innerEditorElement();
     ASSERT(innerEditor);
 
     LayoutUnit unitWidth = logicalWidth() - borderAndPaddingLogicalWidth();
-    if (innerEditor->renderer())
+    if (innerEditor->layoutObject())
         unitWidth -= innerEditor->layoutBox()->paddingStart() + innerEditor->layoutBox()->paddingEnd();
 
     return unitWidth;
 }
 
 void LayoutTextControl::updateFromElement()
 {
     Element* innerEditor = innerEditorElement();
-    if (innerEditor && innerEditor->renderer())
-        updateUserModifyProperty(*textFormControlElement(), innerEditor->renderer()->mutableStyleRef());
+    if (innerEditor && innerEditor->layoutObject())
+        updateUserModifyProperty(*textFormControlElement(), innerEditor->layoutObject()->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 (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))))
+        if ((isHorizontalWritingMode() && (style()->overflowX() == OSCROLL ||  (style()->overflowX() == OAUTO && innerEditor->layoutObject()->style()->overflowWrap() == NormalOverflowWrap)))
+            || (!isHorizontalWritingMode() && (style()->overflowY() == OSCROLL ||  (style()->overflowY() == OAUTO && innerEditor->layoutObject()->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();
     }
 
     LayoutBox::computeLogicalHeight(logicalHeight, logicalTop, computedValues);
 }
 
 void LayoutTextControl::hitInnerEditorElement(HitTestResult& result, const LayoutPoint& pointInContainer, const LayoutPoint& accumulatedOffset)
 {
     HTMLElement* innerEditor = innerEditorElement();
-    if (!innerEditor->renderer())
+    if (!innerEditor->layoutObject())
         return;
 
     LayoutPoint adjustedLocation = accumulatedOffset + location();
     LayoutPoint localPoint = pointInContainer - toLayoutSize(adjustedLocation + innerEditor->layoutBox()->location());
     if (hasOverflowClip())
         localPoint += scrolledContentOffset();
     result.setInnerNode(innerEditor);
     result.setInnerNonSharedNode(innerEditor);
     result.setLocalPoint(localPoint);
 }
@@ skipping 120 matching lines @@
 
 void LayoutTextControl::addFocusRingRects(Vector<LayoutRect>& rects, const LayoutPoint& additionalOffset) const
 {
     if (!size().isEmpty())
         rects.append(LayoutRect(additionalOffset, size()));
 }
 
 LayoutObject* LayoutTextControl::layoutSpecialExcludedChild(bool relayoutChildren, SubtreeLayoutScope& layoutScope)
 {
     HTMLElement* placeholder = toHTMLTextFormControlElement(node())->placeholderElement();
-    LayoutObject* placeholderRenderer = placeholder ? placeholder->renderer() : 0;
+    LayoutObject* placeholderRenderer = placeholder ? placeholder->layoutObject() : 0;
     if (!placeholderRenderer)
         return 0;
     if (relayoutChildren)
         layoutScope.setChildNeedsLayout(placeholderRenderer);
     return placeholderRenderer;
 }
 
 } // namespace blink