Rename renderer() to layoutObject().

Source/core/html/shadow/SliderThumbElement.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ skipping 35 matching lines @@
 #include "core/layout/LayoutSliderThumb.h"
 #include "core/layout/LayoutTheme.h"
 #include "core/page/EventHandler.h"
 
 namespace blink {
 
 using namespace HTMLNames;
 
 inline static bool hasVerticalAppearance(HTMLInputElement* input)
 {
-    ASSERT(input->renderer());
-    LayoutStyle* sliderStyle = input->renderer()->style();
+    ASSERT(input->layoutObject());
+    LayoutStyle* sliderStyle = input->layoutObject()->style();
 
     return sliderStyle->appearance() == SliderVerticalPart;
 }
 
 inline SliderThumbElement::SliderThumbElement(Document& document)
     : HTMLDivElement(document)
     , m_inDragMode(false)
 {
 }
 
 PassRefPtrWillBeRawPtr<SliderThumbElement> SliderThumbElement::create(Document& document)
 {
     RefPtrWillBeRawPtr<SliderThumbElement> element = adoptRefWillBeNoop(new SliderThumbElement(document));
     element->setAttribute(idAttr, ShadowElementNames::sliderThumb());
     return element.release();
 }
 
 void SliderThumbElement::setPositionFromValue()
 {
     // Since the code to calculate position is in the LayoutSliderThumb layout
     // path, we don't actually update the value here. Instead, we poke at the
     // renderer directly to trigger layout.
-    if (renderer())
-        renderer()->setNeedsLayoutAndFullPaintInvalidation();
+    if (layoutObject())
+        layoutObject()->setNeedsLayoutAndFullPaintInvalidation();
 }
 
 LayoutObject* SliderThumbElement::createRenderer(const LayoutStyle&)
 {
     return new LayoutSliderThumb(this);
 }
 
 bool SliderThumbElement::isDisabledFormControl() const
 {
     return hostInput() && hostInput()->isDisabledFormControl();
@@ skipping 19 matching lines @@
     RefPtrWillBeRawPtr<SliderThumbElement> protector(this);
     startDragging();
     setPositionFromPoint(point);
 }
 
 void SliderThumbElement::setPositionFromPoint(const LayoutPoint& point)
 {
     RefPtrWillBeRawPtr<HTMLInputElement> input(hostInput());
     Element* trackElement = input->closedShadowRoot()->getElementById(ShadowElementNames::sliderTrack());
 
-    if (!input->renderer() || !layoutBox() || !trackElement->layoutBox())
+    if (!input->layoutObject() || !layoutBox() || !trackElement->layoutBox())
         return;
 
-    LayoutPoint offset = roundedLayoutPoint(input->renderer()->absoluteToLocal(FloatPoint(point), UseTransforms));
+    LayoutPoint offset = roundedLayoutPoint(input->layoutObject()->absoluteToLocal(FloatPoint(point), UseTransforms));
     bool isVertical = hasVerticalAppearance(input.get());
     bool isLeftToRightDirection = layoutBox()->style()->isLeftToRightDirection();
     LayoutUnit trackSize;
     LayoutUnit position;
     LayoutUnit currentPosition;
     // We need to calculate currentPosition from absolute points becaue the
     // renderer for this node is usually on a layer and layoutBox()->x() and
     // y() are unusable.
     // FIXME: This should probably respect transforms.
     LayoutPoint absoluteThumbOrigin = layoutBox()->absoluteBoundingBoxRectIgnoringTransforms().location();
-    LayoutPoint absoluteSliderContentOrigin = roundedLayoutPoint(input->renderer()->localToAbsolute());
-    IntRect trackBoundingBox = trackElement->renderer()->absoluteBoundingBoxRectIgnoringTransforms();
-    IntRect inputBoundingBox = input->renderer()->absoluteBoundingBoxRectIgnoringTransforms();
+    LayoutPoint absoluteSliderContentOrigin = roundedLayoutPoint(input->layoutObject()->localToAbsolute());
+    IntRect trackBoundingBox = trackElement->layoutObject()->absoluteBoundingBoxRectIgnoringTransforms();
+    IntRect inputBoundingBox = input->layoutObject()->absoluteBoundingBoxRectIgnoringTransforms();
     if (isVertical) {
         trackSize = trackElement->layoutBox()->contentHeight() - layoutBox()->size().height();
         position = offset.y() - layoutBox()->size().height() / 2 - trackBoundingBox.y() + inputBoundingBox.y() - layoutBox()->marginBottom();
         currentPosition = absoluteThumbOrigin.y() - absoluteSliderContentOrigin.y();
     } else {
         trackSize = trackElement->layoutBox()->contentWidth() - layoutBox()->size().width();
         position = offset.x() - layoutBox()->size().width() / 2 - trackBoundingBox.x() + inputBoundingBox.x();
         position -= isLeftToRightDirection ? layoutBox()->marginLeft() : layoutBox()->marginRight();
         currentPosition = absoluteThumbOrigin.x() - absoluteSliderContentOrigin.x();
     }
@@ skipping 12 matching lines @@
         if ((closestPosition - position).abs() <= snappingThreshold)
             value = closest;
     }
 
     String valueString = serializeForNumberType(value);
     if (valueString == input->value())
         return;
 
     // FIXME: This is no longer being set from renderer. Consider updating the method name.
     input->setValueFromRenderer(valueString);
-    if (renderer())
-        renderer()->setNeedsLayoutAndFullPaintInvalidation();
+    if (layoutObject())
+        layoutObject()->setNeedsLayoutAndFullPaintInvalidation();
 }
 
 void SliderThumbElement::startDragging()
 {
     if (LocalFrame* frame = document().frame()) {
         frame->eventHandler().setCapturingMouseEventsNode(this);
         m_inDragMode = true;
     }
 }
 
 void SliderThumbElement::stopDragging()
 {
     if (!m_inDragMode)
         return;
 
     if (LocalFrame* frame = document().frame())
         frame->eventHandler().setCapturingMouseEventsNode(nullptr);
     m_inDragMode = false;
-    if (renderer())
-        renderer()->setNeedsLayoutAndFullPaintInvalidation();
+    if (layoutObject())
+        layoutObject()->setNeedsLayoutAndFullPaintInvalidation();
     if (hostInput())
         hostInput()->dispatchFormControlChangeEvent();
 }
 
 void SliderThumbElement::defaultEventHandler(Event* event)
 {
     if (!event->isMouseEvent()) {
         HTMLDivElement::defaultEventHandler(event);
         return;
     }
@@ skipping 71 matching lines @@
 
 static const AtomicString& mediaSliderThumbShadowPartId()
 {
     DEFINE_STATIC_LOCAL(const AtomicString, mediaSliderThumb, ("-webkit-media-slider-thumb", AtomicString::ConstructFromLiteral));
     return mediaSliderThumb;
 }
 
 const AtomicString& SliderThumbElement::shadowPseudoId() const
 {
     HTMLInputElement* input = hostInput();
-    if (!input || !input->renderer())
+    if (!input || !input->layoutObject())
         return sliderThumbShadowPartId();
 
-    LayoutStyle* sliderStyle = input->renderer()->style();
+    LayoutStyle* sliderStyle = input->layoutObject()->style();
     switch (sliderStyle->appearance()) {
     case MediaSliderPart:
     case MediaSliderThumbPart:
     case MediaVolumeSliderPart:
     case MediaVolumeSliderThumbPart:
     case MediaFullScreenVolumeSliderPart:
     case MediaFullScreenVolumeSliderThumbPart:
         return mediaSliderThumbShadowPartId();
     default:
         return sliderThumbShadowPartId();
@@ skipping 12 matching lines @@
 LayoutObject* SliderContainerElement::createRenderer(const LayoutStyle&)
 {
     return new LayoutSliderContainer(this);
 }
 
 const AtomicString& SliderContainerElement::shadowPseudoId() const
 {
     DEFINE_STATIC_LOCAL(const AtomicString, mediaSliderContainer, ("-webkit-media-slider-container", AtomicString::ConstructFromLiteral));
     DEFINE_STATIC_LOCAL(const AtomicString, sliderContainer, ("-webkit-slider-container", AtomicString::ConstructFromLiteral));
 
-    if (!shadowHost() || !shadowHost()->renderer())
+    if (!shadowHost() || !shadowHost()->layoutObject())
         return sliderContainer;
 
-    LayoutStyle* sliderStyle = shadowHost()->renderer()->style();
+    LayoutStyle* sliderStyle = shadowHost()->layoutObject()->style();
     switch (sliderStyle->appearance()) {
     case MediaSliderPart:
     case MediaSliderThumbPart:
     case MediaVolumeSliderPart:
     case MediaVolumeSliderThumbPart:
     case MediaFullScreenVolumeSliderPart:
     case MediaFullScreenVolumeSliderThumbPart:
         return mediaSliderContainer;
     default:
         return sliderContainer;
     }
 }
 
 }