Remove SelectionOption argument of HTMLTextFormControlElement::setSelectionRange().

third_party/WebKit/Source/core/html/HTMLTextFormControlElement.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 171 matching lines @@
     setSelectionRange(std::min(end, selectionStart()), end, selectionDirection());
 }
 
 void HTMLTextFormControlElement::setSelectionDirection(const String& direction)
 {
     setSelectionRange(selectionStart(), selectionEnd(), direction);
 }
 
 void HTMLTextFormControlElement::select(NeedToDispatchSelectEvent eventBehaviour)
 {
-    document().updateStyleAndLayoutIgnorePendingStylesheets();
-    setSelectionRange(0, std::numeric_limits<int>::max(), SelectionHasNoDirection, eventBehaviour, isFocusable() ? ChangeSelectionAndFocus : NotChangeSelection);
+    setSelectionRange(0, std::numeric_limits<int>::max(), SelectionHasNoDirection, eventBehaviour);
+    focus();
 }
 
 bool HTMLTextFormControlElement::shouldDispatchFormControlChangeEvent(String& oldValue, String& newValue)
 {
     return !equalIgnoringNullity(oldValue, newValue);
 }
 
 void HTMLTextFormControlElement::dispatchFormControlChangeEvent()
 {
     String newValue = value();
@@ skipping 132 matching lines @@
                 index += length;
         } else if (node->hasTagName(brTag)) {
             ++index;
         }
     }
 
     DCHECK_GE(index, 0);
     return index;
 }
 
-void HTMLTextFormControlElement::setSelectionRange(int start, int end, TextFieldSelectionDirection direction, NeedToDispatchSelectEvent eventBehaviour, SelectionOption selectionOption)
+void HTMLTextFormControlElement::setSelectionRange(int start, int end, TextFieldSelectionDirection direction, NeedToDispatchSelectEvent eventBehaviour)
 {
     if (openShadowRoot() || !isTextFormControl())
         return;
     const int editorValueLength = static_cast<int>(innerEditorValue().length());
     DCHECK_GE(editorValueLength, 0);
     end = std::max(std::min(end, editorValueLength), 0);
     start = std::min(std::max(start, 0), end);
     cacheSelection(start, end, direction);
 
-    if (selectionOption == NotChangeSelection || (selectionOption == ChangeSelectionIfFocused && document().focusedElement() != this) || !isConnected()) {
+    if (document().focusedElement() != this) {
         if (eventBehaviour == DispatchSelectEvent)
             scheduleSelectEvent();
         return;
     }
 
     LocalFrame* frame = document().frame();
     HTMLElement* innerEditor = innerEditorElement();
     if (!frame || !innerEditor)
         return;
 
@@ skipping 11 matching lines @@
         DCHECK_EQ(endPosition.anchorNode()->shadowHost(), this);
     }
 #endif // DCHECK_IS_ON()
     VisibleSelection newSelection;
     if (direction == SelectionHasBackwardDirection)
         newSelection.setWithoutValidation(endPosition, startPosition);
     else
         newSelection.setWithoutValidation(startPosition, endPosition);
     newSelection.setIsDirectional(direction != SelectionHasNoDirection);
 
-    frame->selection().setSelection(newSelection, FrameSelection::DoNotAdjustInFlatTree | FrameSelection::CloseTyping | FrameSelection::ClearTypingStyle | (selectionOption == ChangeSelectionAndFocus ? 0 : FrameSelection::DoNotSetFocus));
+    frame->selection().setSelection(newSelection, FrameSelection::DoNotAdjustInFlatTree | FrameSelection::CloseTyping | FrameSelection::ClearTypingStyle | FrameSelection::DoNotSetFocus);
     if (eventBehaviour == DispatchSelectEvent)
         scheduleSelectEvent();
 }
 
 VisiblePosition HTMLTextFormControlElement::visiblePositionForIndex(int index) const
 {
     if (index <= 0)
         return VisiblePosition::firstPositionInNode(innerEditorElement());
     Position start, end;
     bool selected = Range::selectNodeContents(innerEditorElement(), start, end);
@@ skipping 625 matching lines @@
 }
 
 void HTMLTextFormControlElement::copyNonAttributePropertiesFromElement(const Element& source)
 {
     const HTMLTextFormControlElement& sourceElement = static_cast<const HTMLTextFormControlElement&>(source);
     m_lastChangeWasUserEdit = sourceElement.m_lastChangeWasUserEdit;
     HTMLFormControlElement::copyNonAttributePropertiesFromElement(source);
 }
 
 } // namespace blink