Get rid of flat tree version of createVisibleSelection() taking two VisiblePosition

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

 /*
  * Copyright (C) 2004, 2005, 2006, 2007 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 1771 matching lines @@
     const VisibleSelection& original) {
   VisibleSelection newSelection(original);
   VisiblePosition startOfSelection(newSelection.visibleStart());
   VisiblePosition endOfSelection(newSelection.visibleEnd());
 
   // If the end of the selection to modify is just after a table, and if the
   // start of the selection is inside that table, then the last paragraph that
   // we'll want modify is the last one inside the table, not the table itself (a
   // table is itself a paragraph).
   if (Element* table = tableElementJustBefore(endOfSelection)) {
-    if (startOfSelection.deepEquivalent().anchorNode()->isDescendantOf(table))
-      newSelection = createVisibleSelection(
-          startOfSelection,
-          previousPositionOf(endOfSelection, CannotCrossEditingBoundary));
+    if (startOfSelection.deepEquivalent().anchorNode()->isDescendantOf(table)) {
+      const VisiblePosition& newEnd =
+          previousPositionOf(endOfSelection, CannotCrossEditingBoundary);
+      if (newEnd.isNotNull()) {
+        newSelection = createVisibleSelection(
+            SelectionInDOMTree::Builder()
+                .collapse(startOfSelection.toPositionWithAffinity())
+                .extend(newEnd.deepEquivalent())
+                .build());
+      } else {
+        newSelection = createVisibleSelection(
+            SelectionInDOMTree::Builder()
+                .collapse(startOfSelection.toPositionWithAffinity())
+                .build());
+      }
+    }
   }
 
   // If the start of the selection to modify is just before a table, and if the
   // end of the selection is inside that table, then the first paragraph we'll
   // want to modify is the first one inside the table, not the paragraph
   // containing the table itself.
   if (Element* table = tableElementJustAfter(startOfSelection)) {
-    if (endOfSelection.deepEquivalent().anchorNode()->isDescendantOf(table))
-      newSelection = createVisibleSelection(
-          nextPositionOf(startOfSelection, CannotCrossEditingBoundary),
-          endOfSelection);
+    if (endOfSelection.deepEquivalent().anchorNode()->isDescendantOf(table)) {
+      const VisiblePosition newStart =
+          nextPositionOf(startOfSelection, CannotCrossEditingBoundary);
+      if (newStart.isNotNull()) {
+        newSelection = createVisibleSelection(
+            SelectionInDOMTree::Builder()
+                .collapse(newStart.toPositionWithAffinity())
+                .extend(endOfSelection.deepEquivalent())
+                .build());
+      } else {
+        newSelection = createVisibleSelection(
+            SelectionInDOMTree::Builder()
+                .collapse(endOfSelection.toPositionWithAffinity())
+                .build());
+      }
+    }
   }
 
   return newSelection;
 }
 
 // FIXME: indexForVisiblePosition and visiblePositionForIndex use TextIterators
 // to convert between VisiblePositions and indices. But TextIterator iteration
 // using TextIteratorEmitsCharactersBetweenAllVisiblePositions does not exactly
 // match VisiblePosition iteration, so using them to preserve a selection during
 // an editing opertion is unreliable. TextIterator's
@@ skipping 266 matching lines @@
         return InputType::DeleteWordBackward;
       if (granularity == LineBoundary)
         return InputType::DeleteLineBackward;
       return InputType::DeleteContentBackward;
     default:
       return InputType::None;
   }
 }
 
 }  // namespace blink