Remove redndunt variables 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 192 matching lines @@
   if ((start && !end) || (end && !start))
     return;
 
   // Just return if the selection hasn't changed.
   if (selection_start_ == start && selection_start_pos_ == start_pos &&
       selection_end_ == end && selection_end_pos_ == end_pos)
     return;
 
   DCHECK(frame_selection_->GetDocument().GetLayoutView()->GetFrameView());
 
-  // 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.
   for (auto layout_object : old_selected_map.object_map.Keys())
     layout_object->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) {
     start->SetSelectionStateIfNeeded(SelectionBoth);
   } else {
     if (start)
       start->SetSelectionStateIfNeeded(SelectionStart);
     if (end)
       end->SetSelectionStateIfNeeded(SelectionEnd);
   }
@@ skipping 14 matching lines @@
   // 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 (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 ||
-        (selection_start_ == obj && old_start_pos != selection_start_pos_) ||
-        (selection_end_ == obj && old_end_pos != selection_end_pos_)) {
+        (start == obj && start_pos != selection_start_pos_) ||
+        (end == obj && 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.
   for (auto layout_object : new_selected_map.object_map.Keys())
     layout_object->SetShouldInvalidateSelection();
 
   // Have any of the old blocks changed?
   for (const auto& pair : old_selected_map.block_map) {
     LayoutBlock* block = pair.key;
     SelectionState new_selection_state = block->GetSelectionState();
     SelectionState old_selection_state = pair.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.
   for (auto layout_object : new_selected_map.block_map.Keys())
     layout_object->SetShouldInvalidateSelection();
+
+  // set selection start and end
+  selection_start_ = start;
+  selection_start_pos_ = start_pos;
+  selection_end_ = end;
+  selection_end_pos_ = end_pos;
 }
 
 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