Merge "Selection API: collapseToStart() and collapseToEnd() should work for text fields." to M59

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 276 matching lines @@
     return;
 
   // The method must throw InvalidStateError exception if the context object is
   // empty.
   if (rangeCount() == 0) {
     exception_state.ThrowDOMException(kInvalidStateError,
                                       "there is no selection.");
     return;
   }
 
-  // Otherwise, it must create a new range, set both its start and end to the
-  // end of the context object's range,
-  Range* new_range = getRangeAt(0, ASSERT_NO_EXCEPTION)->cloneRange();
-  new_range->collapse(false);
+  if (Range* current_range = DocumentCachedRange()) {
+    // Otherwise, it must create a new range, set both its start and end to the
+    // end of the context object's range,
+    Range* new_range = current_range->cloneRange();
+    new_range->collapse(false);
 
-  // and then set the context object's range to the newly-created range.
-  SelectionInDOMTree::Builder builder;
-  builder.Collapse(new_range->EndPosition());
-  UpdateFrameSelection(builder.Build(), new_range);
+    // and then set the context object's range to the newly-created range.
+    SelectionInDOMTree::Builder builder;
+    builder.Collapse(new_range->EndPosition());
+    UpdateFrameSelection(builder.Build(), new_range);
+  } else {
+    // TODO(tkent): The Selection API doesn't define this behavior. We should
+    // discuss this on https://github.com/w3c/selection-api/issues/83.
+    SelectionInDOMTree::Builder builder;
+    builder.Collapse(
+        GetFrame()->Selection().GetSelectionInDOMTree().ComputeEndPosition());
+    UpdateFrameSelection(builder.Build(), nullptr);
+  }
 }
 
 // https://www.w3.org/TR/selection-api/#dom-selection-collapsetostart
 void DOMSelection::collapseToStart(ExceptionState& exception_state) {
   if (!IsAvailable())
     return;
 
   // The method must throw InvalidStateError ([DOM4]) exception if the context
   // object is empty.
   if (rangeCount() == 0) {
     exception_state.ThrowDOMException(kInvalidStateError,
                                       "there is no selection.");
     return;
   }
 
-  // Otherwise, it must create a new range, set both its start and end to the
-  // start of the context object's range,
-  Range* new_range = getRangeAt(0, ASSERT_NO_EXCEPTION)->cloneRange();
-  new_range->collapse(true);
+  if (Range* current_range = DocumentCachedRange()) {
+    // Otherwise, it must create a new range, set both its start and end to the
+    // start of the context object's range,
+    Range* new_range = current_range->cloneRange();
+    new_range->collapse(true);
 
-  // and then set the context object's range to the newly-created range.
-  SelectionInDOMTree::Builder builder;
-  builder.Collapse(new_range->StartPosition());
-  UpdateFrameSelection(builder.Build(), new_range);
+    // and then set the context object's range to the newly-created range.
+    SelectionInDOMTree::Builder builder;
+    builder.Collapse(new_range->StartPosition());
+    UpdateFrameSelection(builder.Build(), new_range);
+  } else {
+    // TODO(tkent): The Selection API doesn't define this behavior. We should
+    // discuss this on https://github.com/w3c/selection-api/issues/83.
+    SelectionInDOMTree::Builder builder;
+    builder.Collapse(
+        GetFrame()->Selection().GetSelectionInDOMTree().ComputeStartPosition());
+    UpdateFrameSelection(builder.Build(), nullptr);
+  }
 }
 
 void DOMSelection::empty() {
   if (!IsAvailable())
     return;
   GetFrame()->Selection().Clear();
 }
 
 void DOMSelection::setBaseAndExtent(Node* base_node,
                                     unsigned base_offset,
@@ skipping 486 matching lines @@
     tree_scope_->GetDocument().AddConsoleMessage(
         ConsoleMessage::Create(kJSMessageSource, kErrorMessageLevel, message));
 }
 
 DEFINE_TRACE(DOMSelection) {
   visitor->Trace(tree_scope_);
   ContextClient::Trace(visitor);
 }
 
 }  // namespace blink