Rename renderer() to layoutObject().

Source/core/dom/FirstLetterPseudoElement.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2007 David Smith (catfish.man@gmail.com)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
  * Copyright (C) Research In Motion Limited 2010. 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
  * License as published by the Free Software Foundation; either
@@ skipping 83 matching lines @@
     return (obj->isBR() || (obj->isText() && toLayoutText(obj)->isWordBreak()));
 }
 
 LayoutObject* FirstLetterPseudoElement::firstLetterTextRenderer(const Element& element)
 {
     LayoutObject* parentRenderer = 0;
 
     // If we are looking at a first letter element then we need to find the
     // first letter text renderer from the parent node, and not ourselves.
     if (element.isFirstLetterPseudoElement())
-        parentRenderer = element.parentOrShadowHostElement()->renderer();
+        parentRenderer = element.parentOrShadowHostElement()->layoutObject();

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

s/parentRenderer/parentLayoutObject/

     else
-        parentRenderer = element.renderer();
+        parentRenderer = element.layoutObject();
 
     if (!parentRenderer
         || !parentRenderer->style()->hasPseudoStyle(FIRST_LETTER)
         || !parentRenderer->canHaveGeneratedChildren()
         || !(parentRenderer->isLayoutBlockFlow() || parentRenderer->isLayoutButton()))
         return nullptr;
 
     // Drill down into our children and look for our first text child.
     LayoutObject* firstLetterTextRenderer = parentRenderer->slowFirstChild();
     while (firstLetterTextRenderer) {
@@ skipping 55 matching lines @@
 
 void FirstLetterPseudoElement::updateTextFragments()
 {
     String oldText =  m_remainingTextRenderer->completeText();
     ASSERT(oldText.impl());
 
     unsigned length = FirstLetterPseudoElement::firstLetterLength(oldText);
     m_remainingTextRenderer->setTextFragment(oldText.impl()->substring(length, oldText.length()), length, oldText.length() - length);
     m_remainingTextRenderer->dirtyLineBoxes();
 
-    for (auto child = renderer()->slowFirstChild(); child; child = child->nextSibling()) {
+    for (auto child = layoutObject()->slowFirstChild(); child; child = child->nextSibling()) {
         if (!child->isText() || !toLayoutText(child)->isTextFragment())
             continue;
         LayoutTextFragment* childFragment = toLayoutTextFragment(child);
         if (childFragment->firstLetterPseudoElement() != this)
             continue;
 
         childFragment->setTextFragment(oldText.impl()->substring(0, length), 0, length);
         childFragment->dirtyLineBoxes();
         break;
     }
@@ skipping 28 matching lines @@
     }
     m_remainingTextRenderer = nullptr;
 
     PseudoElement::detach(context);
 }
 
 LayoutStyle* FirstLetterPseudoElement::styleForFirstLetter(LayoutObject* rendererContainer)
 {
     ASSERT(rendererContainer);
 
-    LayoutObject* styleContainer = parentOrShadowHostElement()->renderer();
+    LayoutObject* styleContainer = parentOrShadowHostElement()->layoutObject();
     ASSERT(styleContainer);
 
     // We always force the pseudo style to recompute as the first-letter style
     // computed by the style container may not have taken the renderers styles
     // into account.
     styleContainer->style()->removeCachedPseudoStyle(FIRST_LETTER);
 
     LayoutStyle* pseudoStyle = styleContainer->getCachedPseudoStyle(FIRST_LETTER, rendererContainer->firstLineStyle());
     ASSERT(pseudoStyle);
 
     return pseudoStyle;
 }
 
 void FirstLetterPseudoElement::attachFirstLetterTextRenderers()
 {
     LayoutObject* nextRenderer = FirstLetterPseudoElement::firstLetterTextRenderer(*this);
     ASSERT(nextRenderer);
     ASSERT(nextRenderer->isText());
 
     // The original string is going to be either a generated content string or a DOM node's
     // string. We want the original string before it got transformed in case first-letter has
     // no text-transform or a different text-transform applied to it.
     String oldText = toLayoutText(nextRenderer)->isTextFragment() ? toLayoutTextFragment(nextRenderer)->completeText() : toLayoutText(nextRenderer)->originalText();
     ASSERT(oldText.impl());
 
     LayoutStyle* pseudoStyle = styleForFirstLetter(nextRenderer->parent());
-    renderer()->setStyle(pseudoStyle);
+    layoutObject()->setStyle(pseudoStyle);
 
     // FIXME: This would already have been calculated in firstLetterRenderer. Can we pass the length through?
     unsigned length = FirstLetterPseudoElement::firstLetterLength(oldText);
 
     // Construct a text fragment for the text after the first letter.
     // This text fragment might be empty.
     LayoutTextFragment* remainingText =
         new LayoutTextFragment(nextRenderer->node() ? nextRenderer->node() : &nextRenderer->document(), oldText.impl(), length, oldText.length() - length);
     remainingText->setFirstLetterPseudoElement(this);
     remainingText->setIsRemainingTextRenderer(true);
     remainingText->setStyle(nextRenderer->style());
 
     if (remainingText->node())
         remainingText->node()->setRenderer(remainingText);
 
     m_remainingTextRenderer = remainingText;
 
-    LayoutObject* nextSibling = renderer()->nextSibling();
-    renderer()->parent()->addChild(remainingText, nextSibling);
+    LayoutObject* nextSibling = layoutObject()->nextSibling();
+    layoutObject()->parent()->addChild(remainingText, nextSibling);
 
     // Construct text fragment for the first letter.
     LayoutTextFragment* letter = new LayoutTextFragment(&nextRenderer->document(), oldText.impl(), 0, length);
     letter->setFirstLetterPseudoElement(this);
     letter->setStyle(pseudoStyle);
-    renderer()->addChild(letter);
+    layoutObject()->addChild(letter);
 
     nextRenderer->destroy();
 }
 
 void FirstLetterPseudoElement::didRecalcStyle(StyleRecalcChange)
 {
-    if (!renderer())
+    if (!layoutObject())
         return;
 
     // The renderers inside pseudo elements are anonymous so they don't get notified of recalcStyle and must have
     // the style propagated downward manually similar to LayoutObject::propagateStyleToAnonymousChildren.
-    LayoutObject* renderer = this->renderer();
+    LayoutObject* renderer = this->layoutObject();

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

s/renderer/layoutObject/

     for (LayoutObject* child = renderer->nextInPreOrder(renderer); child; child = child->nextInPreOrder(renderer)) {
         // We need to re-calculate the correct style for the first letter element
         // and then apply that to the container and the text fragment inside.
         if (child->style()->styleType() == FIRST_LETTER && m_remainingTextRenderer) {
             if (LayoutStyle* pseudoStyle = styleForFirstLetter(m_remainingTextRenderer->parent()))
                 child->setPseudoStyle(pseudoStyle);
             continue;
         }
 
         // We only manage the style for the generated content items.
         if (!child->isText() && !child->isQuote() && !child->isImage())
             continue;
 
         child->setPseudoStyle(renderer->style());
     }
 }
 
 } // namespace blink