Rename renderer() to layoutObject().

Source/core/layout/HitTestResult.cpp

 /*
  * Copyright (C) 2006, 2008, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2012 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.
  *
  * This library is distributed in the hope that it will be useful,
@@ skipping 107 matching lines @@
     visitor->trace(m_scrollbar);
 #if ENABLE(OILPAN)
     visitor->trace(m_listBasedTestResult);
 #endif
 }
 
 PositionWithAffinity HitTestResult::position() const
 {
     if (!m_innerPossiblyPseudoNode)
         return PositionWithAffinity();
-    LayoutObject* renderer = this->renderer();
+    LayoutObject* renderer = this->layoutObject();
     if (!renderer)
         return PositionWithAffinity();
     if (m_innerPossiblyPseudoNode->isPseudoElement() && m_innerPossiblyPseudoNode->pseudoId() == BEFORE)
         return Position(m_innerNode, Position::PositionIsBeforeChildren).downstream();
     return renderer->positionForPoint(localPoint());
 }
 
-LayoutObject* HitTestResult::renderer() const
+LayoutObject* HitTestResult::layoutObject() const
 {
-    return m_innerNode ? m_innerNode->renderer() : 0;
+    return m_innerNode ? m_innerNode->layoutObject() : 0;
 }
 
 void HitTestResult::setToShadowHostIfInClosedShadowRoot()
 {
     if (Node* node = innerNode()) {
         if (ShadowRoot* containingShadowRoot = node->containingShadowRoot()) {
             if (containingShadowRoot->type() == ShadowRoot::ClosedShadowRoot)
                 setInnerNode(node->shadowHost());
         }
     }
@@ skipping 55 matching lines @@
     dir = LTR;
     // Return the tool tip string associated with this point, if any. Only markers associated with bad grammar
     // currently supply strings, but maybe someday markers associated with misspelled words will also.
     if (!m_innerNonSharedNode)
         return String();
 
     DocumentMarker* marker = m_innerNonSharedNode->document().markers().markerContainingPoint(m_hitTestLocation.point(), DocumentMarker::Grammar);
     if (!marker)
         return String();
 
-    if (LayoutObject* renderer = m_innerNonSharedNode->renderer())
+    if (LayoutObject* renderer = m_innerNonSharedNode->layoutObject())
         dir = renderer->style()->direction();
     return marker->description();
 }
 
 String HitTestResult::title(TextDirection& dir) const
 {
     dir = LTR;
     // Find the title in the nearest enclosing DOM node.
     // For <area> tags in image maps, walk the tree for the <area>, not the <img> using it.
     for (Node* titleNode = m_innerNode.get(); titleNode; titleNode = ComposedTreeTraversal::parent(*titleNode)) {
         if (titleNode->isElementNode()) {
             String title = toElement(titleNode)->title();
             if (!title.isNull()) {
-                if (LayoutObject* renderer = titleNode->renderer())
+                if (LayoutObject* renderer = titleNode->layoutObject())
                     dir = renderer->style()->direction();
                 return title;
             }
         }
     }
     return String();
 }
 
 const AtomicString& HitTestResult::altDisplayString() const
 {
@@ skipping 11 matching lines @@
     }
 
     return nullAtom;
 }
 
 Image* HitTestResult::image() const
 {
     if (!m_innerNonSharedNode)
         return 0;
 
-    LayoutObject* renderer = m_innerNonSharedNode->renderer();
+    LayoutObject* renderer = m_innerNonSharedNode->layoutObject();
     if (renderer && renderer->isImage()) {
         LayoutImage* image = toLayoutImage(renderer);
         if (image->cachedImage() && !image->cachedImage()->errorOccurred())
             return image->cachedImage()->imageForRenderer(image);
     }
 
     return 0;
 }
 
 IntRect HitTestResult::imageRect() const
 {
     if (!image())
         return IntRect();
     return m_innerNonSharedNode->layoutBox()->absoluteContentQuad().enclosingBoundingBox();
 }
 
 KURL HitTestResult::absoluteImageURL() const
 {
     if (!m_innerNonSharedNode)
         return KURL();
 
-    LayoutObject* renderer = m_innerNonSharedNode->renderer();
+    LayoutObject* renderer = m_innerNonSharedNode->layoutObject();
     if (!(renderer && renderer->isImage()))
         return KURL();
 
     AtomicString urlString;
     if (isHTMLEmbedElement(*m_innerNonSharedNode)
         || isHTMLImageElement(*m_innerNonSharedNode)
         || isHTMLInputElement(*m_innerNonSharedNode)
         || isHTMLObjectElement(*m_innerNonSharedNode)
         || isSVGImageElement(*m_innerNonSharedNode)) {
         urlString = toElement(*m_innerNonSharedNode).imageSourceURL();
     } else {
         return KURL();
     }
 
     return m_innerNonSharedNode->document().completeURL(stripLeadingAndTrailingHTMLSpaces(urlString));
 }
 
 KURL HitTestResult::absoluteMediaURL() const
 {
     if (HTMLMediaElement* mediaElt = mediaElement())
         return mediaElt->currentSrc();
     return KURL();
 }
 
 HTMLMediaElement* HitTestResult::mediaElement() const
 {
     if (!m_innerNonSharedNode)
         return 0;
 
-    if (!(m_innerNonSharedNode->renderer() && m_innerNonSharedNode->renderer()->isMedia()))
+    if (!(m_innerNonSharedNode->layoutObject() && m_innerNonSharedNode->layoutObject()->isMedia()))
         return 0;
 
     if (isHTMLMediaElement(*m_innerNonSharedNode))
         return toHTMLMediaElement(m_innerNonSharedNode);
     return 0;
 }
 
 KURL HitTestResult::absoluteLinkURL() const
 {
     if (!m_innerURLElement)
         return KURL();
     return m_innerURLElement->hrefURL();
 }
 
 bool HitTestResult::isLiveLink() const
 {
     return m_innerURLElement && m_innerURLElement->isLiveLink();
 }
 
 bool HitTestResult::isMisspelled() const
 {
-    if (!innerNode() || !innerNode()->renderer())
+    if (!innerNode() || !innerNode()->layoutObject())
         return false;
-    VisiblePosition pos(innerNode()->renderer()->positionForPoint(localPoint()));
+    VisiblePosition pos(innerNode()->layoutObject()->positionForPoint(localPoint()));
     if (pos.isNull())
         return false;
     return m_innerNonSharedNode->document().markers().markersInRange(
         makeRange(pos, pos).get(), DocumentMarker::MisspellingMarkers()).size() > 0;
 }
 
 bool HitTestResult::isOverLink() const
 {
     return m_innerURLElement && m_innerURLElement->isLink();
 }
@@ skipping 113 matching lines @@
     m_hitTestLocation = HitTestLocation(resolvedPointInMainFrame);
     m_pointInInnerNodeFrame = resolvedPointInMainFrame;
     m_innerNode = nullptr;
     m_innerNonSharedNode = nullptr;
     m_innerPossiblyPseudoNode = nullptr;
     m_listBasedTestResult = nullptr;
 
     // Update the HitTestResult as if the supplied node had been hit in normal point-based hit-test.
     // Note that we don't know the local point after a rect-based hit-test, but we never use
     // it so shouldn't bother with the cost of computing it.
-    resolvedInnerNode->renderer()->updateHitTestResult(*this, LayoutPoint());
+    resolvedInnerNode->layoutObject()->updateHitTestResult(*this, LayoutPoint());
     ASSERT(!isRectBasedTest());
 }
 
 Element* HitTestResult::innerElement() const
 {
     for (Node* node = m_innerNode.get(); node; node = NodeRenderingTraversal::parent(*node)) {
         if (node->isElementNode())
             return toElement(node);
     }
 
     return 0;
 }
 
 } // namespace blink