Make for statements using C++11 foreach in LayoutSelection::SetSelection()

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 202 matching lines @@
   // Record the old selected objects. These will be used later when we compare
   // against the new selected objects.
   int old_start_pos = selection_start_pos_;
   int old_end_pos = selection_end_pos_;
 
   SelectedMap old_selected_map =
       CollectSelectedMap(selection_start_, selection_end_, selection_end_pos_,
                          block_paint_invalidation_mode);
 
   // Now clear the selection.
-  SelectedObjectMap::iterator old_objects_end =
-      old_selected_map.object_map.end();
-  for (SelectedObjectMap::iterator i = old_selected_map.object_map.begin();
-       i != old_objects_end; ++i)
-    i->key->SetSelectionStateIfNeeded(SelectionNone);
+  for (const auto& it : old_selected_map.object_map)

[yosin_UTC9, 2017/05/15 07:05:09]

nit: s/it/key_value/ or s/it/layout_object_and_selection_state/

Using |it| is confusing, since |it| is used for iterator.

range-for is short-form of

for (auto it = map.begin(); it != map.end(); ++it) {
  const auto& key_value = *it;
  ...
}

[yoichio, 2017/05/15 07:59:43]

Done.

+    it.key->SetSelectionStateIfNeeded(SelectionNone);
 
   // set selection start and end
   selection_start_ = start;
   selection_start_pos_ = start_pos;
   selection_end_ = end;
   selection_end_pos_ = end_pos;
 
   // Update the selection status of all objects between m_selectionStart and
   // m_selectionEnd
   if (start && start == end) {
@@ skipping 16 matching lines @@
 
   // 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(start, end, end_pos, kPaintInvalidationNewXOROld);
 
   // Have any of the old selected objects changed compared to the new selection?
-  for (SelectedObjectMap::iterator i = old_selected_map.object_map.begin();
-       i != old_objects_end; ++i) {
-    LayoutObject* obj = i->key;
+  for (const auto& it : old_selected_map.object_map) {
+    LayoutObject* obj = it.key;
     SelectionState new_selection_state = obj->GetSelectionState();
-    SelectionState old_selection_state = i->value;
+    SelectionState old_selection_state = it.value;
     if (new_selection_state != old_selection_state ||
         (selection_start_ == obj && old_start_pos != selection_start_pos_) ||
         (selection_end_ == obj && old_end_pos != selection_end_pos_)) {
       obj->SetShouldInvalidateSelection();
       new_selected_map.object_map.erase(obj);
     }
   }
 
   // Any new objects that remain were not found in the old objects dict, and so
   // they need to be updated.
-  SelectedObjectMap::iterator new_objects_end =
-      new_selected_map.object_map.end();
-  for (SelectedObjectMap::iterator i = new_selected_map.object_map.begin();
-       i != new_objects_end; ++i)
-    i->key->SetShouldInvalidateSelection();
+  for (const auto& it : new_selected_map.object_map)
+    it.key->SetShouldInvalidateSelection();
 
   // Have any of the old blocks changed?
-  SelectedBlockMap::iterator old_blocks_end = old_selected_map.block_map.end();
-  for (SelectedBlockMap::iterator i = old_selected_map.block_map.begin();
-       i != old_blocks_end; ++i) {
-    LayoutBlock* block = i->key;
+  for (const auto& it : old_selected_map.block_map) {
+    LayoutBlock* block = it.key;
     SelectionState new_selection_state = block->GetSelectionState();
-    SelectionState old_selection_state = i->value;
+    SelectionState old_selection_state = it.value;
     if (new_selection_state != old_selection_state) {
       block->SetShouldInvalidateSelection();
       new_selected_map.block_map.erase(block);
     }
   }
 
   // Any new blocks that remain were not found in the old blocks dict, and so
   // they need to be updated.
-  SelectedBlockMap::iterator new_blocks_end = new_selected_map.block_map.end();
-  for (SelectedBlockMap::iterator i = new_selected_map.block_map.begin();
-       i != new_blocks_end; ++i)
-    i->key->SetShouldInvalidateSelection();
+  for (const auto& it : new_selected_map.block_map)
+    it.key->SetShouldInvalidateSelection();
 }
 
 std::pair<int, int> LayoutSelection::SelectionStartEnd() {
   Commit();
   return std::make_pair(selection_start_pos_, selection_end_pos_);
 }
 
 void LayoutSelection::ClearSelection() {
   // For querying Layer::compositingState()
   // This is correct, since destroying layout objects needs to cause eager paint
@@ skipping 120 matching lines @@
 
     o->SetShouldInvalidateSelection();
   }
 }
 
 DEFINE_TRACE(LayoutSelection) {
   visitor->Trace(frame_selection_);
 }
 
 }  // namespace blink