[DMC #7] Only create RenderedDocumentMarkers for TextMatchMarkerListImpl

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 377 matching lines @@
   std::sort(result.begin(), result.end(),
             [](const Member<DocumentMarker>& marker1,
                const Member<DocumentMarker>& marker2) {
               return marker1->StartOffset() < marker2->StartOffset();
             });
   return result;
 }
 
 Vector<IntRect> DocumentMarkerController::RenderedRectsForMarkers(
     DocumentMarker::MarkerType marker_type) {
+  // Only TextMatch markers can have rendered rects
+  // TODO(rlanday): remove marker_type parameter
+  DCHECK_EQ(marker_type, DocumentMarker::kTextMatch);
+
   Vector<IntRect> result;
 
   if (!PossiblyHasMarkers(marker_type))
     return result;
   DCHECK(!(markers_.IsEmpty()));
 
   // outer loop: process each node
   MarkerMap::iterator end = markers_.end();
   for (MarkerMap::iterator node_iterator = markers_.begin();
        node_iterator != end; ++node_iterator) {
     // inner loop; process each marker in this node
     const Node& node = *node_iterator->key;
     if (!node.isConnected())
       continue;
     MarkerLists* markers = node_iterator->value.Get();
-    for (DocumentMarker::MarkerType type : DocumentMarker::AllMarkers()) {
-      DocumentMarkerList* const list = ListForType(markers, type);
-      if (!list || list->IsEmpty() || type != marker_type)
+    DocumentMarkerList* const list =
+        ListForType(markers, DocumentMarker::kTextMatch);
+    if (!list || list->IsEmpty())
+      continue;
+
+    for (DocumentMarker* marker : list->GetMarkers()) {
+      RenderedDocumentMarker* const rendered_marker =
+          ToRenderedDocumentMarker(marker);
+      UpdateMarkerRenderedRectIfNeeded(node, *rendered_marker);
+      if (!rendered_marker->IsRendered())
         continue;
-
-      for (RenderedDocumentMarker* rendered_marker : list->GetMarkers()) {
-        UpdateMarkerRenderedRectIfNeeded(node, *rendered_marker);
-        if (!rendered_marker->IsRendered())
-          continue;
-        result.push_back(rendered_marker->RenderedRect());
-      }
+      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::UpdateMarkerRenderedRectIfNeeded(
     const Node& node,
     RenderedDocumentMarker& marker) {
   DCHECK(!document_->View() || !document_->View()->NeedsLayout());
   DCHECK(!document_->NeedsLayoutTreeUpdate());
   if (!marker.IsValid())
     UpdateMarkerRenderedRect(node, marker);
 }
 
 void DocumentMarkerController::InvalidateRectsForMarkersInNode(
     const Node& node) {
   MarkerLists* markers = markers_.at(&node);
 
-  for (auto& marker_list : *markers) {
-    if (!marker_list || marker_list->IsEmpty())
-      continue;
+  const DocumentMarkerList* const marker_list =
+      ListForType(markers, DocumentMarker::kTextMatch);
+  if (!marker_list || marker_list->IsEmpty())
+    return;
 
-    const HeapVector<Member<RenderedDocumentMarker>>& markers_in_list =
-        marker_list->GetMarkers();
-    for (auto& marker : markers_in_list)
-      marker->Invalidate();
+  const HeapVector<Member<DocumentMarker>>& markers_in_list =
+      marker_list->GetMarkers();
+  for (auto& marker : markers_in_list)
+    ToRenderedDocumentMarker(marker)->Invalidate();
 
-    if (markers_in_list.front()->GetType() == DocumentMarker::kTextMatch)
-      InvalidatePaintForTickmarks(node);
-  }
+  InvalidatePaintForTickmarks(node);
 }
 
 void DocumentMarkerController::InvalidateRectsForAllMarkers() {

[Xiaocheng, 2017/05/18 19:15:09]

This function should modify only TextMatch marker lists.

   for (auto& node_markers : markers_) {
     const Node& node = *node_markers.key;
     for (auto& marker_list : *node_markers.value) {
       if (!marker_list || marker_list->IsEmpty())
         continue;
 
-      const HeapVector<Member<RenderedDocumentMarker>>& markers_in_list =
+      const HeapVector<Member<DocumentMarker>>& markers_in_list =
           marker_list->GetMarkers();
       for (DocumentMarker* marker : markers_in_list)
         ToRenderedDocumentMarker(marker)->Invalidate();

[Xiaocheng, 2017/05/18 19:15:09]

Otherwise this is a bad cast

 
       if (markers_in_list.front()->GetType() == DocumentMarker::kTextMatch)
         InvalidatePaintForTickmarks(node);
     }
   }
 }
 
 DEFINE_TRACE(DocumentMarkerController) {
   visitor->Trace(markers_);
   visitor->Trace(document_);
@@ skipping 159 matching lines @@
   if (!markers)
     return false;
 
   bool doc_dirty = false;
   DocumentMarkerList* const list =
       ListForType(markers, DocumentMarker::kTextMatch);
 
   if (!list)
     return false;
 
-  const HeapVector<Member<RenderedDocumentMarker>>& markers_in_list =
+  const HeapVector<Member<DocumentMarker>>& markers_in_list =
       list->GetMarkers();
   // TODO(rlanday): this assumes that the markers are stored in sorted order.
   // This method should probably eventually be implemented by a
   // TextMatch-specific marker list
   const auto start_pos = std::upper_bound(
       markers_in_list.begin(), markers_in_list.end(), start_offset,
       [](size_t start_offset, const Member<DocumentMarker>& marker) {
         return start_offset < marker->EndOffset();
       });
   for (auto marker = start_pos; marker != markers_in_list.end(); ++marker) {
@@ skipping 18 matching lines @@
 void DocumentMarkerController::ShowMarkers() const {
   StringBuilder builder;
   MarkerMap::const_iterator end = markers_.end();
   for (MarkerMap::const_iterator node_iterator = markers_.begin();
        node_iterator != end; ++node_iterator) {
     const Node* node = node_iterator->key;
     builder.Append(String::Format("%p", node));
     MarkerLists* markers = markers_.at(node);
     for (DocumentMarker::MarkerType type : DocumentMarker::AllMarkers()) {
       DocumentMarkerList* const list = ListForType(markers, type);
-      const HeapVector<Member<RenderedDocumentMarker>>& markers_in_list =
+      const HeapVector<Member<DocumentMarker>>& markers_in_list =
           list->GetMarkers();
       for (const DocumentMarker* marker : markers_in_list) {
         builder.Append(" ");
         builder.AppendNumber(marker->GetType());
         builder.Append(":[");
         builder.AppendNumber(marker->StartOffset());
         builder.Append(":");
         builder.AppendNumber(marker->EndOffset());
         builder.Append("](");
         builder.AppendNumber(marker->IsActiveMatch());
@@ skipping 39 matching lines @@
 }
 
 }  // namespace blink
 
 #ifndef NDEBUG
 void showDocumentMarkers(const blink::DocumentMarkerController* controller) {
   if (controller)
     controller->ShowMarkers();
 }
 #endif