HTMLTextAreaElement.setSelectionRange should not change focus.

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 16 matching lines @@
 
 #include "bindings/core/v8/ExceptionState.h"
 #include "bindings/core/v8/ExceptionStatePlaceholder.h"
 #include "core/HTMLNames.h"
 #include "core/accessibility/AXObjectCache.h"
 #include "core/dom/Document.h"
 #include "core/dom/NodeList.h"
 #include "core/dom/NodeTraversal.h"
 #include "core/dom/Text.h"
 #include "core/dom/shadow/ShadowRoot.h"
+#include "core/editing/Editor.h"
 #include "core/editing/FrameSelection.h"
 #include "core/editing/TextIterator.h"
 #include "core/events/Event.h"
 #include "core/frame/LocalFrame.h"
 #include "core/frame/UseCounter.h"
 #include "core/html/HTMLBRElement.h"
 #include "core/html/shadow/ShadowElementNames.h"
+#include "core/page/FocusController.h"
+#include "core/page/Page.h"
+#include "core/rendering/RenderBlock.h"
 #include "core/rendering/RenderBlockFlow.h"
 #include "core/rendering/RenderTheme.h"
 #include "platform/heap/Handle.h"
 #include "platform/text/TextBoundaries.h"
 #include "wtf/text/StringBuilder.h"
 
 namespace blink {
 
 using namespace HTMLNames;
 
@@ skipping 119 matching lines @@
     setSelectionRange(std::min(end, selectionStart()), end, selectionDirection());
 }
 
 void HTMLTextFormControlElement::setSelectionDirection(const String& direction)
 {
     setSelectionRange(selectionStart(), selectionEnd(), direction);
 }
 
 void HTMLTextFormControlElement::select()
 {
-    setSelectionRange(0, std::numeric_limits<int>::max(), SelectionHasNoDirection);
+    document().updateLayoutIgnorePendingStylesheets();
+    if (isFocusable()) {
+        RefPtrWillBeRawPtr<HTMLTextFormControlElement> protector(this);

[tkent, 2014/07/24 01:04:22]

This should be moved to the outside of the |if|.

[yoichio, 2014/07/24 03:06:07]

Done.

+        document().page()->focusController().setFocusedElement(this, document().frame());
+    }
+    setSelectionRange(0, std::numeric_limits<int>::max(), SelectionHasNoDirection, ChangeSelection);
 }
 
 bool HTMLTextFormControlElement::shouldDispatchFormControlChangeEvent(String& oldValue, String& newValue)
 {
     return !equalIgnoringNullity(oldValue, newValue);
 }
 
 void HTMLTextFormControlElement::dispatchFormControlChangeEvent()
 {
     String newValue = value();
@@ skipping 73 matching lines @@
 }
 
 void HTMLTextFormControlElement::setSelectionRange(int start, int end, const String& directionString)
 {
     TextFieldSelectionDirection direction = SelectionHasNoDirection;
     if (directionString == "forward")
         direction = SelectionHasForwardDirection;
     else if (directionString == "backward")
         direction = SelectionHasBackwardDirection;
 
+    if (direction == SelectionHasNoDirection && document().frame() && document().frame()->editor().behavior().shouldConsiderSelectionAsDirectional())
+        direction = SelectionHasForwardDirection;
+
     return setSelectionRange(start, end, direction);
 }
 
-void HTMLTextFormControlElement::setSelectionRange(int start, int end, TextFieldSelectionDirection direction)
+void HTMLTextFormControlElement::setSelectionRange(int start, int end, TextFieldSelectionDirection direction, SelectionOption selectionOption)
 {
+    setNeedsValidityCheck();
     document().updateLayoutIgnorePendingStylesheets();
 
     if (!renderer() || !renderer()->isTextControl())
         return;
 
     end = std::max(end, 0);
     start = std::min(std::max(start, 0), end);
+    cacheSelection(start, end, direction);
+    if (!hasVisibleTextArea(renderer(), innerEditorElement()))
+        return;
 
-    if (!hasVisibleTextArea(renderer(), innerEditorElement())) {
-        cacheSelection(start, end, direction);
+    LocalFrame* frame = document().frame();
+
+    if (!frame)
         return;
-    }
+
+    if (selectionOption == NotChangeSelection && document().focusedElement() != this)
+        return;
+
     VisiblePosition startPosition = visiblePositionForIndex(start);
     VisiblePosition endPosition;
     if (start == end)
         endPosition = startPosition;
     else
         endPosition = visiblePositionForIndex(end);
 
     // startPosition and endPosition can be null position for example when
     // "-webkit-user-select: none" style attribute is specified.
     if (startPosition.isNotNull() && endPosition.isNotNull()) {
         ASSERT(startPosition.deepEquivalent().deprecatedNode()->shadowHost() == this
             && endPosition.deepEquivalent().deprecatedNode()->shadowHost() == this);
     }
     VisibleSelection newSelection;
     if (direction == SelectionHasBackwardDirection)
         newSelection = VisibleSelection(endPosition, startPosition);
     else
         newSelection = VisibleSelection(startPosition, endPosition);
     newSelection.setIsDirectional(direction != SelectionHasNoDirection);
 
-    if (LocalFrame* frame = document().frame())
-        frame->selection().setSelection(newSelection);
+    frame->selection().setSelection(newSelection, FrameSelection::CloseTyping | FrameSelection::ClearTypingStyle | FrameSelection::DoNotSetFocus);
 }
 
 VisiblePosition HTMLTextFormControlElement::visiblePositionForIndex(int index) const
 {
     if (index <= 0)
         return VisiblePosition(firstPositionInNode(innerEditorElement()), DOWNSTREAM);
     RefPtrWillBeRawPtr<Range> range = Range::create(document());
     range->selectNodeContents(innerEditorElement(), ASSERT_NO_EXCEPTION);
     CharacterIterator it(range.get());
     it.advance(index - 1);
@@ skipping 568 matching lines @@
             Text* textNode = toText(node);
             size_t firstLineBreak = textNode->data().find('\n', isPivotNode ? pivotPosition.offsetInContainerNode() : 0);
             if (firstLineBreak != kNotFound)
                 return Position(textNode, firstLineBreak + 1);
         }
     }
     return endOfInnerText(textFormControl);
 }
 
 } // namespace Webcore