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 33 matching lines @@
 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();
     } else if (ContainerNode* containerNode = NodeRenderingTraversal::parent(element)) {
-        m_renderingParent = containerNode->renderer();
+        m_renderingParent = containerNode->layoutObject();

[Julien - ping for review, 2015/03/05 16:19:15]

We should probably renaming this one too: m_layoutObjectParent?

[dsinclair, 2015/03/05 16:40:01]

Done.

     }
 }
 
 LayoutObject* LayoutTreeBuilderForElement::nextRenderer() const
 {
     ASSERT(m_renderingParent);
 
     if (m_node->isInTopLayer())
         return NodeRenderingTraversal::nextInTopLayer(*m_node);
 
@@ skipping 60 matching lines @@
 
     if (!parentRenderer->isChildAllowed(newRenderer, style)) {
         newRenderer->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.
     newRenderer->setFlowThreadState(parentRenderer->flowThreadState());
 
     LayoutObject* nextRenderer = this->nextRenderer();

[Julien - ping for review, 2015/03/05 16:19:15]

We need to rename nextRenderer et al., I didn't catch this when we renamed
LayoutTreeBuilderForElement.

[dsinclair, 2015/03/05 16:40:01]

Yes, they're on my list to cleanup (along with about 20 other methods we have
that have Renderer in them.)

     m_node->setRenderer(newRenderer);
-    newRenderer->setStyle(&style); // setStyle() can depend on renderer() already being set.
+    newRenderer->setStyle(&style); // setStyle() can depend on layoutObject() already being set.

[Julien - ping for review, 2015/03/05 16:19:15]

s/newRenderer/newLayoutObject/

 
     if (Fullscreen::isActiveFullScreenElement(*m_node)) {
         newRenderer = LayoutFullScreen::wrapRenderer(newRenderer, parentRenderer, &m_node->document());
         if (!newRenderer)
             return;
     }
 
-    // Note: Adding newRenderer instead of renderer(). renderer() may be a child of newRenderer.
+    // Note: Adding newRenderer instead of layoutObject(). layoutObject() may be a child of newRenderer.
     parentRenderer->addChild(newRenderer, nextRenderer);
 }
 
 void LayoutTreeBuilderForText::createRenderer()
 {
     LayoutObject* parentRenderer = this->parentRenderer();
     LayoutStyle* style = parentRenderer->style();
 
     ASSERT(m_node->textRendererIsNeeded(*style, *parentRenderer));
 
     LayoutText* newRenderer = m_node->createTextRenderer(style);
     if (!parentRenderer->isChildAllowed(newRenderer, *style)) {
         newRenderer->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.
     newRenderer->setFlowThreadState(parentRenderer->flowThreadState());
 
     LayoutObject* nextRenderer = this->nextRenderer();
     m_node->setRenderer(newRenderer);
     // Parent takes care of the animations, no need to call setAnimatableStyle.
     newRenderer->setStyle(style);
     parentRenderer->addChild(newRenderer, nextRenderer);
 }
 
 }