Get rid of VisibleSelection::firstRangeOf()

third_party/WebKit/Source/core/editing/commands/InsertListCommand.cpp

 /*
  * Copyright (C) 2006, 2010 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 166 matching lines @@
     VisiblePosition visibleStartOfSelection = selection.visibleStart();
     VisiblePosition visibleEndOfSelection = selection.visibleEnd();
     PositionWithAffinity startOfSelection =
         visibleStartOfSelection.toPositionWithAffinity();
     PositionWithAffinity endOfSelection =
         visibleEndOfSelection.toPositionWithAffinity();
     Position startOfLastParagraph =
         startOfParagraph(visibleEndOfSelection, CanSkipOverEditingBoundary)
             .deepEquivalent();
 
-    Range* currentSelection = firstRangeOf(endingSelection());
+    Range* currentSelection =
+        createRange(firstEphemeralRangeOf(endingSelection()));
     ContainerNode* scopeForStartOfSelection = nullptr;
     ContainerNode* scopeForEndOfSelection = nullptr;
     // FIXME: This is an inefficient way to keep selection alive because
     // indexForVisiblePosition walks from the beginning of the document to the
     // visibleEndOfSelection everytime this code is executed. But not using
     // index is hard because there are so many ways we can lose selection inside
     // doApplyForSingleParagraph.
     int indexForStartOfSelection = indexForVisiblePosition(
         visibleStartOfSelection, scopeForStartOfSelection);
     int indexForEndOfSelection =
@@ skipping 91 matching lines @@
     setEndingSelection(SelectionInDOMTree::Builder()
                            .setAffinity(visibleStartOfSelection.affinity())
                            .setBaseAndExtentDeprecated(
                                visibleStartOfSelection.deepEquivalent(),
                                visibleEndOfSelection.deepEquivalent())
                            .setIsDirectional(endingSelection().isDirectional())
                            .build());
     return;
   }
 
-  DCHECK(firstRangeOf(endingSelection()));
-  doApplyForSingleParagraph(false, listTag, *firstRangeOf(endingSelection()),
-                            editingState);
+  Range* const range = createRange(firstEphemeralRangeOf(endingSelection()));
+  DCHECK(!range);

[Xiaocheng, 2017/03/02 20:14:29]

Remove '!'

[yosin_UTC9, 2017/03/03 04:22:35]

Done.
(my brain is still damaged...)

+  doApplyForSingleParagraph(false, listTag, *range, editingState);
 }
 
 InputEvent::InputType InsertListCommand::inputType() const {
   return m_type == OrderedList ? InputEvent::InputType::InsertOrderedList
                                : InputEvent::InputType::InsertUnorderedList;
 }
 
 bool InsertListCommand::doApplyForSingleParagraph(
     bool forceCreateList,
     const HTMLQualifiedName& listTag,
@@ skipping 347 matching lines @@
       endOfParagraph(validPos, CanSkipOverEditingBoundary);
   moveParagraph(start, end, VisiblePosition::beforeNode(placeholder),
                 editingState, PreserveSelection);
 }
 
 DEFINE_TRACE(InsertListCommand) {
   CompositeEditCommand::trace(visitor);
 }
 
 }  // namespace blink