Rename renderer() to layoutObject().

Source/core/dom/LayoutTreeBuilder.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ skipping 31 matching lines @@
 #include "platform/RuntimeEnabledFeatures.h"
 
 namespace blink {
 
 LayoutTreeBuilderForElement::LayoutTreeBuilderForElement(Element& element, LayoutStyle* style)
     : LayoutTreeBuilder(element, nullptr)
     , m_style(style)
 {
     if (element.isFirstLetterPseudoElement()) {
         if (LayoutObject* nextRenderer = FirstLetterPseudoElement::firstLetterTextRenderer(element))
-            m_renderingParent = nextRenderer->parent();
+            m_layoutObjectParent = nextRenderer->parent();
     } else if (ContainerNode* containerNode = NodeRenderingTraversal::parent(element)) {
-        m_renderingParent = containerNode->renderer();
+        m_layoutObjectParent = containerNode->layoutObject();
     }
 }
 
 LayoutObject* LayoutTreeBuilderForElement::nextRenderer() const
 {
-    ASSERT(m_renderingParent);
+    ASSERT(m_layoutObjectParent);
 
     if (m_node->isInTopLayer())
         return NodeRenderingTraversal::nextInTopLayer(*m_node);
 
     if (m_node->isFirstLetterPseudoElement())
         return FirstLetterPseudoElement::firstLetterTextRenderer(*m_node);
 
     return LayoutTreeBuilder::nextRenderer();
 }
 
 LayoutObject* LayoutTreeBuilderForElement::parentRenderer() const
 {
     LayoutObject* parentRenderer = LayoutTreeBuilder::parentRenderer();
 
     if (parentRenderer) {
         // FIXME: Guarding this by parentRenderer isn't quite right as the spec for
         // top layer only talks about display: none ancestors so putting a <dialog> inside an
         // <optgroup> seems like it should still work even though this check will prevent it.
         if (m_node->isInTopLayer())
             return m_node->document().layoutView();
     }
 
     return parentRenderer;
 }
 
 bool LayoutTreeBuilderForElement::shouldCreateRenderer() const
 {
-    if (!m_renderingParent)
+    if (!m_layoutObjectParent)
         return false;
 
     // FIXME: Should the following be in SVGElement::layoutObjectIsNeeded()?
     if (m_node->isSVGElement()) {
         // SVG elements only render when inside <svg>, or if the element is an <svg> itself.
-        if (!isSVGSVGElement(*m_node) && (!m_renderingParent->node() || !m_renderingParent->node()->isSVGElement()))
+        if (!isSVGSVGElement(*m_node) && (!m_layoutObjectParent->node() || !m_layoutObjectParent->node()->isSVGElement()))
             return false;
         if (!toSVGElement(m_node)->isValid())
             return false;
     }
 
     LayoutObject* parentRenderer = this->parentRenderer();
     if (!parentRenderer)
         return false;
     if (!parentRenderer->canHaveChildren())
         return false;
@@ skipping 22 matching lines @@
         newLayoutObject->destroy();
         return;
     }
 
     // Make sure the LayoutObject already knows it is going to be added to a LayoutFlowThread before we set the style
     // for the first time. Otherwise code using inLayoutFlowThread() in the styleWillChange and styleDidChange will fail.
     newLayoutObject->setFlowThreadState(parentRenderer->flowThreadState());
 
     LayoutObject* nextRenderer = this->nextRenderer();
     m_node->setLayoutObject(newLayoutObject);
-    newLayoutObject->setStyle(&style); // setStyle() can depend on renderer() already being set.
+    newLayoutObject->setStyle(&style); // setStyle() can depend on layoutObject() already being set.
 
     if (Fullscreen::isActiveFullScreenElement(*m_node)) {
         newLayoutObject = LayoutFullScreen::wrapRenderer(newLayoutObject, parentRenderer, &m_node->document());
         if (!newLayoutObject)
             return;
     }
 
-    // Note: Adding newLayoutObject instead of renderer(). renderer() may be a child of newLayoutObject.
+    // Note: Adding newLayoutObject instead of layoutObject(). layoutObject() may be a child of newLayoutObject.
     parentRenderer->addChild(newLayoutObject, nextRenderer);
 }
 
 void LayoutTreeBuilderForText::createLayoutObject()
 {
     LayoutObject* parentRenderer = this->parentRenderer();
     LayoutStyle* style = parentRenderer->style();
 
     ASSERT(m_node->textRendererIsNeeded(*style, *parentRenderer));
 
     LayoutText* newLayoutObject = m_node->createTextRenderer(style);
     if (!parentRenderer->isChildAllowed(newLayoutObject, *style)) {
         newLayoutObject->destroy();
         return;
     }
 
     // Make sure the LayoutObject already knows it is going to be added to a LayoutFlowThread before we set the style
     // for the first time. Otherwise code using inLayoutFlowThread() in the styleWillChange and styleDidChange will fail.
     newLayoutObject->setFlowThreadState(parentRenderer->flowThreadState());
 
     LayoutObject* nextRenderer = this->nextRenderer();
     m_node->setLayoutObject(newLayoutObject);
     // Parent takes care of the animations, no need to call setAnimatableStyle.
     newLayoutObject->setStyle(style);
     parentRenderer->addChild(newLayoutObject, nextRenderer);
 }
 
 }