Refactor LayoutSelection::SelectionBounds() with CollectSelectedMap().

third_party/WebKit/Source/core/editing/LayoutSelection.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 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.
  *
@@ skipping 388 matching lines @@
   if (!object->IsRooted())
     return LayoutRect();
 
   if (!object->CanUpdateSelectionOnRootLineBoxes())
     return LayoutRect();
 
   return object->SelectionRectInViewCoordinates();
 }
 
 IntRect LayoutSelection::SelectionBounds() {
-  // Now create a single bounding box rect that encloses the whole selection.
-  LayoutRect sel_rect;
-
-  typedef HashSet<const LayoutBlock*> VisitedContainingBlockSet;
-  VisitedContainingBlockSet visited_containing_blocks;
-
   Commit();
   if (paint_range_.IsNull())
     return IntRect();
 
-  // TODO(yoichio): Use CollectSelectedMap.
-  for (LayoutObject* runner : paint_range_) {
-    if (runner->GetSelectionState() == SelectionState::kNone)
-      continue;
+  // Create a single bounding box rect that encloses the whole selection.
+  LayoutRect selected_rect;
+  const SelectedMap& current_map = CollectSelectedMap(paint_range_);
+  for (auto layout_object : current_map.object_map.Keys())
+    selected_rect.Unite(SelectionRectForLayoutObject(layout_object));
+  for (auto layout_block : current_map.block_map.Keys())
+    selected_rect.Unite(SelectionRectForLayoutObject(layout_block));
 
-    // Blocks are responsible for painting line gaps and margin gaps. They
-    // must be examined as well.
-    sel_rect.Unite(SelectionRectForLayoutObject(runner));
-    const LayoutBlock* cb = runner->ContainingBlock();
-    while (cb && !cb->IsLayoutView()) {
-      sel_rect.Unite(SelectionRectForLayoutObject(cb));
-      VisitedContainingBlockSet::AddResult add_result =
-          visited_containing_blocks.insert(cb);
-      if (!add_result.is_new_entry)
-        break;
-      cb = cb->ContainingBlock();
-    }
-  }
-
-  return PixelSnappedIntRect(sel_rect);
+  return PixelSnappedIntRect(selected_rect);
 }
 
 void LayoutSelection::InvalidatePaintForSelection() {
   if (paint_range_.IsNull())
     return;
 
   for (LayoutObject* runner : paint_range_) {
     if (runner->GetSelectionState() == SelectionState::kNone)
       continue;
 
     runner->SetShouldInvalidateSelection();
   }
 }
 
 DEFINE_TRACE(LayoutSelection) {
   visitor->Trace(frame_selection_);
 }
 
 }  // namespace blink