Get rid of createVisibleSelection() taking two Position

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

 /*
  * Copyright (C) 2007, 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2012 Google 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.
@@ skipping 29 matching lines @@
 #include "core/editing/EditingUtilities.h"
 #include "core/editing/FrameSelection.h"
 #include "core/editing/iterators/TextIterator.h"
 #include "core/frame/LocalFrame.h"
 #include "core/frame/UseCounter.h"
 #include "core/inspector/ConsoleMessage.h"
 #include "wtf/text/WTFString.h"
 
 namespace blink {
 
-static Position createPosition(Node* node, int offset) {
-  DCHECK_GE(offset, 0);
-  if (!node)
-    return Position();
-  return Position(node, offset);
-}
-
 static Node* selectionShadowAncestor(LocalFrame* frame) {
   Node* node = frame->selection().selection().base().anchorNode();
   if (!node)
     return 0;
 
   if (!node->isInShadowTree())
     return 0;
 
   return frame->document()->ancestorInThisScope(node);
 }
@@ skipping 225 matching lines @@
         String::number(extentOffset) + " is not a valid extent offset.");
     return;
   }
 
   if (!baseNode || !extentNode)
     UseCounter::count(frame(), UseCounter::SelectionSetBaseAndExtentNull);
 
   if (!isValidForPosition(baseNode) || !isValidForPosition(extentNode))
     return;
 
-  Position base = createPosition(baseNode, baseOffset);
-  Position extent = createPosition(extentNode, extentOffset);
-  const bool selectionHasDirection = true;
-
-  // TODO(xiaochengh): The use of updateStyleAndLayoutIgnorePendingStylesheets
+  // TODO(editing-dev): The use of updateStyleAndLayoutIgnorePendingStylesheets
   // needs to be audited.  See http://crbug.com/590369 for more details.
   // In the long term, we should change FrameSelection::setSelection to take a
   // parameter that does not require clean layout, so that modifying selection
   // no longer performs synchronous layout by itself.
+  // TODO(editing-dev): Once SVG USE element doesn't modifies DOM tree, we
+  // should get rid of this update layout call.
+  // See http://crbug.com/566281
+  // See "svg/text/textpath-reference-crash.html"
   frame()->document()->updateStyleAndLayoutIgnorePendingStylesheets();
 
-  frame()->selection().setSelection(createVisibleSelection(
-      base, extent, SelDefaultAffinity, selectionHasDirection));
+  frame()->selection().setSelection(
+      SelectionInDOMTree::Builder()
+          .setBaseAndExtentDeprecated(Position(baseNode, baseOffset),
+                                      Position(extentNode, extentOffset))
+          .setIsDirectional(true)
+          .build());
 }
 
 void DOMSelection::modify(const String& alterString,
                           const String& directionString,
                           const String& granularityString) {
   if (!isAvailable())
     return;
 
   FrameSelection::EAlteration alter;
   if (equalIgnoringCase(alterString, "extend"))
@@ skipping 61 matching lines @@
     exceptionState.throwDOMException(
         IndexSizeError,
         String::number(offset) + " is larger than the given node's length.");
     return;
   }
 
   if (!isValidForPosition(node))
     return;
 
   const Position& base = frame()->selection().base();
-  const Position& extent = createPosition(node, offset);
-  const bool selectionHasDirection = true;
-
-  // TODO(xiaochengh): The use of updateStyleAndLayoutIgnorePendingStylesheets
-  // needs to be audited.  See http://crbug.com/590369 for more details.
-  // In the long term, we should change FrameSelection::setSelection to take a
-  // parameter that does not require clean layout, so that modifying selection
-  // no longer performs synchronous layout by itself.
-  frame()->document()->updateStyleAndLayoutIgnorePendingStylesheets();
-
-  const VisibleSelection newSelection = createVisibleSelection(
-      base, extent, TextAffinity::Downstream, selectionHasDirection);
-  frame()->selection().setSelection(newSelection);
+  if (base.isNull()) {
+    // TODO(editing-dev): We should throw |InvalidStateError| if selection is
+    // none to follow the spec.
+    frame()->selection().setSelection(SelectionInDOMTree::Builder()
+                                          .collapse(Position(node, offset))
+                                          .setIsDirectional(true)
+                                          .build());
+    return;
+  }
+  frame()->selection().setSelection(SelectionInDOMTree::Builder()
+                                        .collapse(base)
+                                        .extend(Position(node, offset))
+                                        .setIsDirectional(true)
+                                        .build());
 }
 
 Range* DOMSelection::getRangeAt(int index, ExceptionState& exceptionState) {
   if (!isAvailable())
     return nullptr;
 
   if (index < 0 || index >= rangeCount()) {
     exceptionState.throwDOMException(
         IndexSizeError, String::number(index) + " is not a valid index.");
     return nullptr;
@@ skipping 254 matching lines @@
     m_treeScope->document().addConsoleMessage(
         ConsoleMessage::create(JSMessageSource, ErrorMessageLevel, message));
 }
 
 DEFINE_TRACE(DOMSelection) {
   visitor->trace(m_treeScope);
   DOMWindowProperty::trace(visitor);
 }
 
 }  // namespace blink