Rename renderer() to layoutObject().

Source/core/dom/DocumentMarkerController.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  *           (C) 2006 Alexey Proskuryakov (ap@webkit.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  * Copyright (C) Research In Motion Limited 2010. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 207 matching lines @@
         DocumentMarker toInsert(newMarker);
         if (toInsert.type() != DocumentMarker::TextMatch) {
             mergeOverlapping(list.get(), toInsert);
         } else {
             MarkerList::iterator pos = std::lower_bound(list->begin(), list->end(), &toInsert, startsFurther);
             list->insert(pos - list->begin(), RenderedDocumentMarker::create(toInsert));
         }
     }
 
     // repaint the affected node
-    if (node->renderer())
-        node->renderer()->setShouldDoFullPaintInvalidation();
+    if (node->layoutObject())
+        node->layoutObject()->setShouldDoFullPaintInvalidation();
 }
 
 void DocumentMarkerController::mergeOverlapping(MarkerList* list, DocumentMarker& toInsert)
 {
     MarkerList::iterator firstOverlapping = std::lower_bound(list->begin(), list->end(), &toInsert, doesNotOverlap);
     size_t index = firstOverlapping - list->begin();
     list->insert(index, RenderedDocumentMarker::create(toInsert));
     MarkerList::iterator inserted = list->begin() + index;
     firstOverlapping = inserted + 1;
     for (MarkerList::iterator i = firstOverlapping; i != list->end() && (*i)->startOffset() <= (*inserted)->endOffset(); ) {
@@ skipping 39 matching lines @@
                 marker->setStartOffset(startOffset);
             if (marker->endOffset() > endOffset)
                 marker->setEndOffset(endOffset);
             marker->shiftOffsets(delta);
 
             addMarker(dstNode, *marker);
         }
     }
 
     // repaint the affected node
-    if (docDirty && dstNode->renderer())
-        dstNode->renderer()->setShouldDoFullPaintInvalidation();
+    if (docDirty && dstNode->layoutObject())
+        dstNode->layoutObject()->setShouldDoFullPaintInvalidation();
 }
 
 void DocumentMarkerController::removeMarkers(Node* node, unsigned startOffset, int length, DocumentMarker::MarkerTypes markerTypes, RemovePartiallyOverlappingMarkerOrNot shouldRemovePartiallyOverlappingMarker)
 {
     if (length <= 0)
         return;
 
     if (!possiblyHasMarkers(markerTypes))
         return;
     ASSERT(!(m_markers.isEmpty()));
@@ skipping 59 matching lines @@
         }
     }
 
     if (emptyListsCount == DocumentMarker::MarkerTypeIndexesCount) {
         m_markers.remove(node);
         if (m_markers.isEmpty())
             m_possiblyExistingMarkerTypes = 0;
     }
 
     // repaint the affected node
-    if (docDirty && node->renderer())
-        node->renderer()->setShouldDoFullPaintInvalidation();
+    if (docDirty && node->layoutObject())
+        node->layoutObject()->setShouldDoFullPaintInvalidation();
 }
 
 DocumentMarker* DocumentMarkerController::markerContainingPoint(const LayoutPoint& point, DocumentMarker::MarkerType markerType)
 {
     if (!possiblyHasMarkers(markerType))
         return 0;
     ASSERT(!(m_markers.isEmpty()));
 
     // outer loop: process each node that contains any markers
     MarkerMap::iterator end = m_markers.end();
@@ skipping 184 matching lines @@
                 list.clear();
                 ++emptyListsCount;
                 needsRepainting = true;
             }
         }
 
         nodeCanBeRemoved = emptyListsCount == DocumentMarker::MarkerTypeIndexesCount;
     }
 
     if (needsRepainting) {
-        if (LayoutObject* renderer = iterator->key->renderer())
+        if (LayoutObject* renderer = iterator->key->layoutObject())

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

s/renderer/layoutObject/

             renderer->setShouldDoFullPaintInvalidation();
     }
 
     if (nodeCanBeRemoved) {
         m_markers.remove(iterator);
         if (m_markers.isEmpty())
             m_possiblyExistingMarkerTypes = 0;
     }
 }
 
 void DocumentMarkerController::repaintMarkers(DocumentMarker::MarkerTypes markerTypes)
 {
     if (!possiblyHasMarkers(markerTypes))
         return;
     ASSERT(!m_markers.isEmpty());
 
     // outer loop: process each markered node in the document
     MarkerMap::iterator end = m_markers.end();
     for (MarkerMap::iterator i = m_markers.begin(); i != end; ++i) {
         const Node* node = i->key;
 
         // inner loop: process each marker in the current node
         MarkerLists* markers = i->value.get();
         for (size_t markerListIndex = 0; markerListIndex < DocumentMarker::MarkerTypeIndexesCount; ++markerListIndex) {
             OwnPtrWillBeMember<MarkerList>& list = (*markers)[markerListIndex];
             if (!list || list->isEmpty() || !markerTypes.contains((*list->begin())->type()))
                 continue;
 
             // cause the node to be redrawn
-            if (LayoutObject* renderer = node->renderer()) {
+            if (LayoutObject* renderer = node->layoutObject()) {

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

Ditto.

                 renderer->setShouldDoFullPaintInvalidation();
                 break;
             }
         }
     }
 }
 
 void DocumentMarkerController::invalidateRenderedRectsForMarkersInRect(const LayoutRect& r)
 {
     // outer loop: process each markered node in the document
@@ skipping 33 matching lines @@
 #endif
             (*marker)->shiftOffsets(delta);
             docDirty = true;
 
             // Marker moved, so previously-computed rendered rectangle is now invalid
             (*marker)->invalidate();
         }
     }
 
     // repaint the affected node
-    if (docDirty && node->renderer())
-        node->renderer()->setShouldDoFullPaintInvalidation();
+    if (docDirty && node->layoutObject())
+        node->layoutObject()->setShouldDoFullPaintInvalidation();
 }
 
 void DocumentMarkerController::setMarkersActive(Range* range, bool active)
 {
     if (!possiblyHasMarkers(DocumentMarker::AllMarkers()))
         return;
     ASSERT(!m_markers.isEmpty());
 
     Node* startContainer = range->startContainer();
     Node* endContainer = range->endContainer();
@@ skipping 22 matching lines @@
 
         // Markers are returned in order, so stop if we are now past the specified range.
         if ((*marker)->startOffset() >= endOffset)
             break;
 
         (*marker)->setActiveMatch(active);
         docDirty = true;
     }
 
     // repaint the affected node
-    if (docDirty && node->renderer())
-        node->renderer()->setShouldDoFullPaintInvalidation();
+    if (docDirty && node->layoutObject())
+        node->layoutObject()->setShouldDoFullPaintInvalidation();
 }
 
 #ifndef NDEBUG
 void DocumentMarkerController::showMarkers() const
 {
     fprintf(stderr, "%d nodes have markers:\n", m_markers.size());
     MarkerMap::const_iterator end = m_markers.end();
     for (MarkerMap::const_iterator nodeIterator = m_markers.begin(); nodeIterator != end; ++nodeIterator) {
         const Node* node = nodeIterator->key;
         fprintf(stderr, "%p", node);
@@ skipping 13 matching lines @@
 
 } // namespace blink
 
 #ifndef NDEBUG
 void showDocumentMarkers(const blink::DocumentMarkerController* controller)
 {
     if (controller)
         controller->showMarkers();
 }
 #endif