[DMC #12] Move some method impls from DocumentMarkerController.cpp to final place

third_party/WebKit/Source/core/editing/markers/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.
@@ skipping 13 matching lines @@
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  *
  */
 
 #include "core/editing/markers/DocumentMarkerController.h"
 
 #include <algorithm>
 #include "core/dom/Node.h"
 #include "core/dom/NodeTraversal.h"
-#include "core/dom/Range.h"
 #include "core/dom/Text.h"
 #include "core/editing/VisibleUnits.h"
 #include "core/editing/iterators/TextIterator.h"
 #include "core/editing/markers/CompositionMarkerListImpl.h"
 #include "core/editing/markers/DocumentMarkerListEditor.h"
 #include "core/editing/markers/GrammarMarkerListImpl.h"
 #include "core/editing/markers/RenderedDocumentMarker.h"
 #include "core/editing/markers/SpellingMarkerListImpl.h"
 #include "core/editing/markers/TextMatchMarkerListImpl.h"
 #include "core/frame/FrameView.h"
@@ skipping 148 matching lines @@
 
 void DocumentMarkerController::RemoveMarkersInRange(
     const EphemeralRange& range,
     DocumentMarker::MarkerTypes marker_types) {
   DCHECK(!document_->NeedsLayoutTreeUpdate());
 
   TextIterator marked_text(range.StartPosition(), range.EndPosition());
   DocumentMarkerController::RemoveMarkers(marked_text, marker_types);
 }
 
-static void UpdateMarkerRenderedRect(const Node& node,
-                                     RenderedDocumentMarker& marker) {
-  const Position startPosition(&const_cast<Node&>(node), marker.StartOffset());
-  const Position endPostion(&const_cast<Node&>(node), marker.EndOffset());
-  EphemeralRange range(startPosition, endPostion);
-  marker.SetRenderedRect(LayoutRect(ComputeTextRect(range)));
-}
-
 // Markers are stored in order sorted by their start offset.
 // Markers of the same type do not overlap each other.
 
 void DocumentMarkerController::AddMarker(Node* node,
                                          DocumentMarker* new_marker) {
   DCHECK_GE(new_marker->EndOffset(), new_marker->StartOffset());
   if (new_marker->EndOffset() == new_marker->StartOffset())
     return;
 
   possibly_existing_marker_types_.Add(new_marker->GetType());
@@ skipping 196 matching lines @@
     DocumentMarkerList* const list =
         ListForType(markers, DocumentMarker::kTextMatch);
     if (!list)
       continue;
     result.AppendVector(ToTextMatchMarkerListImpl(list)->RenderedRects(node));
   }
 
   return result;
 }
 
-// TODO(rlanday): move this to TextMatchMarkerListImpl.cpp
-Vector<IntRect> TextMatchMarkerListImpl::RenderedRects(const Node& node) const {
-  Vector<IntRect> result;
-
-  for (DocumentMarker* marker : markers_) {
-    RenderedDocumentMarker* const rendered_marker =
-        ToRenderedDocumentMarker(marker);
-    if (!rendered_marker->IsValid())
-      UpdateMarkerRenderedRect(node, *rendered_marker);
-    if (!rendered_marker->IsRendered())
-      continue;
-    result.push_back(rendered_marker->RenderedRect());
-  }
-
-  return result;
-}
-
 static void InvalidatePaintForTickmarks(const Node& node) {
   if (FrameView* frame_view = node.GetDocument().View())
     frame_view->InvalidatePaintForTickmarks();
 }
 
 void DocumentMarkerController::InvalidateRectsForTextMatchMarkersInNode(
     const Node& node) {
   MarkerLists* markers = markers_.at(&node);
 
   const DocumentMarkerList* const marker_list =
@@ skipping 282 matching lines @@
 }
 
 }  // namespace blink
 
 #ifndef NDEBUG
 void showDocumentMarkers(const blink::DocumentMarkerController* controller) {
   if (controller)
     controller->ShowMarkers();
 }
 #endif