Rename renderer() to layoutObject().

Source/core/layout/LayerStackingNode.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
  *
  * Portions are Copyright (C) 1998 Netscape Communications Corporation.
  *
  * Other contributors:
  *   Robert O'Callahan <roc+@cs.cmu.edu>
  *   David Baron <dbaron@fas.harvard.edu>
  *   Christian Biesinger <cbiesinger@web.de>
  *   Randall Jesup <rjesup@wgate.com>
@@ skipping 54 matching lines @@
     m_isNormalFlowOnly = shouldBeNormalFlowOnly();
 
     // Non-stacking contexts should have empty z-order lists. As this is already the case,
     // there is no need to dirty / recompute these lists.
     m_zOrderListsDirty = isStackingContext();
 }
 
 LayerStackingNode::~LayerStackingNode()
 {
 #if ENABLE(ASSERT)
-    if (!renderer()->documentBeingDestroyed()) {
+    if (!layoutObject()->documentBeingDestroyed()) {
         ASSERT(!isInStackingParentZOrderLists());
         ASSERT(!isInStackingParentNormalFlowList());
 
         updateStackingParentForZOrderLists(0);
         updateStackingParentForNormalFlowList(0);
     }
 #endif
 }
 
 // Helper for the sorting of layers by z-index.
 static inline bool compareZIndex(LayerStackingNode* first, LayerStackingNode* second)
 {
     return first->zIndex() < second->zIndex();
 }
 
 LayerCompositor* LayerStackingNode::compositor() const
 {
-    ASSERT(renderer()->view());
-    return renderer()->view()->compositor();
+    ASSERT(layoutObject()->view());
+    return layoutObject()->view()->compositor();
 }
 
 void LayerStackingNode::dirtyZOrderLists()
 {
     ASSERT(m_layerListMutationAllowed);
     ASSERT(isStackingContext());
 
 #if ENABLE(ASSERT)
     updateStackingParentForZOrderLists(0);
 #endif
 
     if (m_posZOrderList)
         m_posZOrderList->clear();
     if (m_negZOrderList)
         m_negZOrderList->clear();
     m_zOrderListsDirty = true;
 
-    if (!renderer()->documentBeingDestroyed())
+    if (!layoutObject()->documentBeingDestroyed())
         compositor()->setNeedsCompositingUpdate(CompositingUpdateRebuildTree);
 }
 
 void LayerStackingNode::dirtyStackingContextZOrderLists()
 {
     if (LayerStackingNode* stackingNode = ancestorStackingContextNode())
         stackingNode->dirtyZOrderLists();
 }
 
 void LayerStackingNode::dirtyNormalFlowList()
 {
     ASSERT(m_layerListMutationAllowed);
 
 #if ENABLE(ASSERT)
     updateStackingParentForNormalFlowList(0);
 #endif
 
     if (m_normalFlowList)
         m_normalFlowList->clear();
     m_normalFlowListDirty = true;
 
-    if (!renderer()->documentBeingDestroyed())
+    if (!layoutObject()->documentBeingDestroyed())
         compositor()->setNeedsCompositingUpdate(CompositingUpdateRebuildTree);
 }
 
 void LayerStackingNode::rebuildZOrderLists()
 {
     ASSERT(m_layerListMutationAllowed);
     ASSERT(isDirtyStackingContext());
 
     for (Layer* child = layer()->firstChild(); child; child = child->nextSibling()) {
         if (!layer()->reflectionInfo() || layer()->reflectionInfo()->reflectionLayer() != child)
             child->stackingNode()->collectLayers(m_posZOrderList, m_negZOrderList);
     }
 
     // Sort the two lists.
     if (m_posZOrderList)
         std::stable_sort(m_posZOrderList->begin(), m_posZOrderList->end(), compareZIndex);
 
     if (m_negZOrderList)
         std::stable_sort(m_negZOrderList->begin(), m_negZOrderList->end(), compareZIndex);
 
     // Append layers for top layer elements after normal layer collection, to ensure they are on top regardless of z-indexes.
     // The renderers of top layer elements are children of the view, sorted in top layer stacking order.
     if (layer()->isRootLayer()) {
-        LayoutView* view = renderer()->view();
+        LayoutView* view = layoutObject()->view();
         for (LayoutObject* child = view->firstChild(); child; child = child->nextSibling()) {
             Element* childElement = (child->node() && child->node()->isElementNode()) ? toElement(child->node()) : 0;
             if (childElement && childElement->isInTopLayer()) {
                 Layer* layer = toLayoutBoxModelObject(child)->layer();
                 // Create the buffer if it doesn't exist yet.
                 if (!m_posZOrderList)
                     m_posZOrderList = adoptPtr(new Vector<LayerStackingNode*>);
                 m_posZOrderList->append(layer->stackingNode());
             }
         }
@@ skipping 120 matching lines @@
     if (isStackingContext)
         dirtyZOrderLists();
     else
         clearZOrderLists();
 }
 
 // FIXME: Rename shouldBeNormalFlowOnly to something more accurate now that CSS
 // 2.1 defines the term "normal flow".
 bool LayerStackingNode::shouldBeNormalFlowOnly() const
 {
-    return !isStackingContext() && !renderer()->isPositioned();
+    return !isStackingContext() && !layoutObject()->isPositioned();
 }
 
 void LayerStackingNode::updateIsNormalFlowOnly()
 {
     bool isNormalFlowOnly = shouldBeNormalFlowOnly();
     if (isNormalFlowOnly == this->isNormalFlowOnly())
         return;
 
     m_isNormalFlowOnly = isNormalFlowOnly;
     if (Layer* p = layer()->parent())
         p->stackingNode()->dirtyNormalFlowList();
     dirtyStackingContextZOrderLists();
 }
 
 LayerStackingNode* LayerStackingNode::ancestorStackingContextNode() const
 {
     for (Layer* ancestor = layer()->parent(); ancestor; ancestor = ancestor->parent()) {
         LayerStackingNode* stackingNode = ancestor->stackingNode();
         if (stackingNode->isStackingContext())
             return stackingNode;
     }
     return 0;
 }
 
-LayoutBoxModelObject* LayerStackingNode::renderer() const
+LayoutBoxModelObject* LayerStackingNode::layoutObject() const
 {
-    return m_layer->renderer();
+    return m_layer->layoutObject();
 }
 
 } // namespace blink