Use SelectionPaintRange::Iterator in LayoutSelection::ClearSelection().

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 168 matching lines @@
   SelectedMap() = default;
   SelectedMap(SelectedMap&& other) {
     object_map = std::move(other.object_map);
     block_map = std::move(other.block_map);
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(SelectedMap);
 };
 
-enum class CollectSelectedMapOption {
-  kCollectBlock,
-  kNotCollectBlock,
-};
-
-static SelectedMap CollectSelectedMap(const SelectionPaintRange& range,
-                                      CollectSelectedMapOption option) {
+static SelectedMap CollectSelectedMap(const SelectionPaintRange& range) {
   if (range.IsNull())
     return SelectedMap();
 
   SelectedMap selected_map;
 
   for (LayoutObject* runner : range) {
     if (runner->GetSelectionState() == SelectionState::kNone)
       continue;
 
     // Blocks are responsible for painting line gaps and margin gaps.  They
     // must be examined as well.
     selected_map.object_map.Set(runner, runner->GetSelectionState());
-    if (option == CollectSelectedMapOption::kCollectBlock) {
-      LayoutBlock* containing_block = runner->ContainingBlock();
-      while (containing_block && !containing_block->IsLayoutView()) {
-        SelectedBlockMap::AddResult result = selected_map.block_map.insert(
-            containing_block, containing_block->GetSelectionState());
-        if (!result.is_new_entry)
-          break;
-        containing_block = containing_block->ContainingBlock();
-      }
+
+    for (LayoutBlock* containing_block = runner->ContainingBlock();
+         containing_block && !containing_block->IsLayoutView();
+         containing_block = containing_block->ContainingBlock()) {
+      SelectedBlockMap::AddResult result = selected_map.block_map.insert(
+          containing_block, containing_block->GetSelectionState());
+      if (!result.is_new_entry)
+        break;
     }
   }
   return selected_map;
 }
 
 // Update the selection status of all LayoutObjects between |start| and |end|.
 static void SetSelectionState(const SelectionPaintRange& range) {
   if (range.IsNull())
     return;
 
@@ skipping 10 matching lines @@
     if (runner != range.StartLayoutObject() &&
         runner != range.EndLayoutObject() && runner->CanBeSelectionLeaf())
       runner->SetSelectionStateIfNeeded(SelectionState::kInside);
   }
 }
 
 // Set SetSelectionState and ShouldInvalidateSelection flag of LayoutObjects
 // comparing them in |new_range| and |old_range|.
 static void UpdateLayoutObjectState(const SelectionPaintRange& new_range,
                                     const SelectionPaintRange& old_range) {
-  SelectedMap old_selected_map =
-      CollectSelectedMap(old_range, CollectSelectedMapOption::kCollectBlock);
+  SelectedMap old_selected_map = CollectSelectedMap(old_range);

[yosin_UTC9, 2017/06/14 04:01:15]

nit: s/SelectedMap/const SelectedMap&/

 
   // Now clear the selection.
   for (auto layout_object : old_selected_map.object_map.Keys())
     layout_object->SetSelectionStateIfNeeded(SelectionState::kNone);
 
   SetSelectionState(new_range);
 
   // Now that the selection state has been updated for the new objects, walk
   // them again and put them in the new objects list.
   // TODO(editing-dev): |new_selected_map| doesn't really need to store the
   // SelectionState, it's just more convenient to have it use the same data
   // structure as |old_selected_map|.
-  SelectedMap new_selected_map =
-      CollectSelectedMap(new_range, CollectSelectedMapOption::kCollectBlock);
+  SelectedMap new_selected_map = CollectSelectedMap(new_range);

[yosin_UTC9, 2017/06/14 04:01:15]

nit: s/SelectedMap/const SelectedMap&/

 
   // Have any of the old selected objects changed compared to the new selection?
   for (const auto& pair : old_selected_map.object_map) {
     LayoutObject* obj = pair.key;
     SelectionState new_selection_state = obj->GetSelectionState();
     SelectionState old_selection_state = pair.value;
     if (new_selection_state != old_selection_state ||
         (new_range.StartLayoutObject() == obj &&
          new_range.StartOffset() != old_range.StartOffset()) ||
         (new_range.EndLayoutObject() == obj &&
@@ skipping 35 matching lines @@
 void LayoutSelection::ClearSelection() {
   // For querying Layer::compositingState()
   // This is correct, since destroying layout objects needs to cause eager paint
   // invalidations.
   DisableCompositingQueryAsserts disabler;
 
   // Just return if the selection is already empty.
   if (paint_range_.IsNull())
     return;
 
-  const SelectedMap& old_selected_map = CollectSelectedMap(
-      paint_range_, CollectSelectedMapOption::kNotCollectBlock);
-  // Clear SelectionState and invalidation.
-  // TODO(yoichio): Iterate with *this directrly.
-  for (auto layout_object : old_selected_map.object_map.Keys()) {
+  for (auto layout_object : paint_range_) {
     const SelectionState old_state = layout_object->GetSelectionState();
     layout_object->SetSelectionStateIfNeeded(SelectionState::kNone);
     if (layout_object->GetSelectionState() == old_state)
       continue;
     layout_object->SetShouldInvalidateSelection();
   }
 
   // Reset selection.
   paint_range_ = SelectionPaintRange();
 }
@@ skipping 129 matching lines @@
 
     runner->SetShouldInvalidateSelection();
   }
 }
 
 DEFINE_TRACE(LayoutSelection) {
   visitor->Trace(frame_selection_);
 }
 
 }  // namespace blink