Rename renderer() to layoutObject().

Source/core/layout/LayoutCounter.cpp

 /**
  * Copyright (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com)
  * Copyright (C) 2006, 2007 Apple 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
  * 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 41 matching lines @@
     return staticCounterMaps;
 }
 
 // This function processes the renderer tree in the order of the DOM tree
 // including pseudo elements as defined in CSS 2.1.
 static LayoutObject* previousInPreOrder(const LayoutObject& object)
 {
     Element* self = toElement(object.node());
     ASSERT(self);
     Element* previous = ElementTraversal::previousIncludingPseudo(*self);
-    while (previous && !previous->renderer())
+    while (previous && !previous->layoutObject())
         previous = ElementTraversal::previousIncludingPseudo(*previous);
-    return previous ? previous->renderer() : 0;
+    return previous ? previous->layoutObject() : 0;
 }
 
 // This function processes the renderer tree in the order of the DOM tree
 // including pseudo elements as defined in CSS 2.1.
 static LayoutObject* previousSiblingOrParent(const LayoutObject& object)
 {
     Element* self = toElement(object.node());
     ASSERT(self);
     Element* previous = ElementTraversal::pseudoAwarePreviousSibling(*self);
-    while (previous && !previous->renderer())
+    while (previous && !previous->layoutObject())
         previous = ElementTraversal::pseudoAwarePreviousSibling(*previous);
     if (previous)
-        return previous->renderer();
+        return previous->layoutObject();
     previous = self->parentElement();
-    return previous ? previous->renderer() : 0;
+    return previous ? previous->layoutObject() : 0;
 }
 
 static inline Element* parentElement(LayoutObject& object)
 {
     return toElement(object.node())->parentElement();
 }
 
 static inline bool areRenderersElementsSiblings(LayoutObject& first, LayoutObject& second)
 {
     return parentElement(first) == parentElement(second);
 }
 
 // This function processes the renderer tree in the order of the DOM tree
 // including pseudo elements as defined in CSS 2.1.
 static LayoutObject* nextInPreOrder(const LayoutObject& object, const Element* stayWithin, bool skipDescendants = false)
 {
     Element* self = toElement(object.node());
     ASSERT(self);
     Element* next = skipDescendants ? ElementTraversal::nextIncludingPseudoSkippingChildren(*self, stayWithin) : ElementTraversal::nextIncludingPseudo(*self, stayWithin);
-    while (next && !next->renderer())
+    while (next && !next->layoutObject())
         next = skipDescendants ? ElementTraversal::nextIncludingPseudoSkippingChildren(*next, stayWithin) : ElementTraversal::nextIncludingPseudo(*next, stayWithin);
-    return next ? next->renderer() : 0;
+    return next ? next->layoutObject() : 0;
 }
 
 static bool planCounter(LayoutObject& object, const AtomicString& identifier, bool& isReset, int& value)
 {
     // Real text nodes don't have their own style so they can't have counters.
     // We can't even look at their styles or we'll see extra resets and increments!
     if (object.isText() && !object.isBR())
         return false;
     Node* generatingNode = object.generatingNode();
     // We must have a generating node or else we cannot have a counter.
     if (!generatingNode)
         return false;
     const LayoutStyle& style = object.styleRef();
 
     switch (style.styleType()) {
     case NOPSEUDO:
         // Sometimes nodes have more then one renderer. Only the first one gets the counter
         // LayoutTests/http/tests/css/counter-crash.html
-        if (generatingNode->renderer() != &object)
+        if (generatingNode->layoutObject() != &object)
             return false;
         break;
     case BEFORE:
     case AFTER:
         break;
     default:
         return false; // Counters are forbidden from all other pseudo elements.
     }
 
     const CounterDirectives directives = style.getCounterDirectives(identifier);
@@ skipping 132 matching lines @@
             // counter being placed is attached to.
             if (currentCounter) {
                 // We found a suitable counter.
                 if (previousSiblingProtector) {
                     // Since we had a suitable previous counter before, we should only consider this one as our
                     // previousSibling if it is a reset counter and hence the current previousSibling is its child.
                     if (currentCounter->actsAsReset()) {
                         previousSiblingProtector = currentCounter;
                         // We are no longer interested in previous siblings of the currentRenderer or their children
                         // as counters they may have attached cannot be the previous sibling of the counter we are placing.
-                        currentRenderer = parentElement(*currentRenderer)->renderer();
+                        currentRenderer = parentElement(*currentRenderer)->layoutObject();
                         continue;
                     }
                 } else {
                     previousSiblingProtector = currentCounter;
                 }
                 currentRenderer = previousSiblingOrParent(*currentRenderer);
                 continue;
             }
         }
         // This function is designed so that the same test is not done twice in an iteration, except for this one
@@ skipping 319 matching lines @@
             fprintf(stderr, "    ");
         fprintf(stderr, "%p N:%p P:%p PS:%p NS:%p C:%p\n",
             current, current->node(), current->parent(), current->previousSibling(),
             current->nextSibling(), current->hasCounterNodeMap() ?
             counterName ? blink::counterMaps().get(current)->get(identifier) : (blink::CounterNode*)1 : (blink::CounterNode*)0);
     }
     fflush(stderr);
 }
 
 #endif // NDEBUG