TextControlElement::selection() should return SelectionInDOMTree.

third_party/WebKit/Source/core/html/TextControlElement.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved.
  *           (C) 2006 Alexey Proskuryakov (ap@nypop.com)
  *
  * 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
@@ skipping 590 matching lines @@
                                                  int& offsetInContainer) {
   if (node->isTextNode()) {
     containerNode = node;
     offsetInContainer = offset;
   } else {
     containerNode = node->parentNode();
     offsetInContainer = node->nodeIndex() + offset;
   }
 }
 
-Range* TextControlElement::selection() const {
+const SelectionInDOMTree TextControlElement::selection() const {
   if (!layoutObject() || !isTextControl())
-    return nullptr;
+    return SelectionInDOMTree();
 
   int start = m_cachedSelectionStart;
   int end = m_cachedSelectionEnd;
 
   DCHECK_LE(start, end);
   HTMLElement* innerText = innerEditorElement();
   if (!innerText)
-    return nullptr;
+    return SelectionInDOMTree();
 
-  if (!innerText->hasChildren())
-    return Range::create(document(), innerText, 0, innerText, 0);
+  if (!innerText->hasChildren()) {
+    return SelectionInDOMTree::Builder()
+        .collapse(Position(innerText, 0))
+        .setIsDirectional(selectionDirection() != "none" ? true : false)

[yosin_UTC9, 2017/03/15 09:29:28]

nit: No need to have |? true : false|

[tanvir, 2017/03/15 10:18:15]

Done.

[tanvir, 2017/03/15 10:18:15]

Done.

+        .build();
+  }
 
   int offset = 0;
   Node* startNode = 0;
   Node* endNode = 0;
   for (Node& node : NodeTraversal::descendantsOf(*innerText)) {
     DCHECK(!node.hasChildren());
     DCHECK(node.isTextNode() || isHTMLBRElement(node));
     int length = node.isTextNode() ? Position::lastOffsetInNode(&node) : 1;
 
     if (offset <= start && start <= offset + length)
       setContainerAndOffsetForRange(&node, start - offset, startNode, start);
 
     if (offset <= end && end <= offset + length) {
       setContainerAndOffsetForRange(&node, end - offset, endNode, end);
       break;
     }
 
     offset += length;
   }
 
   if (!startNode || !endNode)
-    return nullptr;
+    return SelectionInDOMTree();
 
-  return Range::create(document(), startNode, start, endNode, end);
+  return SelectionInDOMTree::Builder()
+      .setBaseAndExtent(Position(startNode, start), Position(endNode, end))
+      .setIsDirectional(selectionDirection() != "none" ? true : false)

[yosin_UTC9, 2017/03/15 09:29:28]

nit: No need to have |? true : false|

[tanvir, 2017/03/15 10:18:15]

Done.

+      .build();
 }
 
 const AtomicString& TextControlElement::autocapitalize() const {
   DEFINE_STATIC_LOCAL(const AtomicString, off, ("off"));
   DEFINE_STATIC_LOCAL(const AtomicString, none, ("none"));
   DEFINE_STATIC_LOCAL(const AtomicString, characters, ("characters"));
   DEFINE_STATIC_LOCAL(const AtomicString, words, ("words"));
   DEFINE_STATIC_LOCAL(const AtomicString, sentences, ("sentences"));
 
   const AtomicString& value = fastGetAttribute(autocapitalizeAttr);
@@ skipping 290 matching lines @@
 
 void TextControlElement::copyNonAttributePropertiesFromElement(
     const Element& source) {
   const TextControlElement& sourceElement =
       static_cast<const TextControlElement&>(source);
   m_lastChangeWasUserEdit = sourceElement.m_lastChangeWasUserEdit;
   HTMLFormControlElement::copyNonAttributePropertiesFromElement(source);
 }
 
 }  // namespace blink