Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(864)

Unified Diff: Source/core/html/HTMLTextFormControlElement.cpp

Issue 258063005: Blink does not respect input.selectionStart and input.selectionEnd for some cases (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Addressing changes asked in previous patch Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « LayoutTests/fast/forms/validationMessage.html ('k') | Source/core/html/forms/TextFieldInputType.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/html/HTMLTextFormControlElement.cpp
diff --git a/Source/core/html/HTMLTextFormControlElement.cpp b/Source/core/html/HTMLTextFormControlElement.cpp
index 0434728f24a557dcb6aa4a94af75ce08ceaccc60..3ce8c61419cf9ea69ab0bc1de60dc03180087b30 100644
--- a/Source/core/html/HTMLTextFormControlElement.cpp
+++ b/Source/core/html/HTMLTextFormControlElement.cpp
@@ -282,13 +282,21 @@ void HTMLTextFormControlElement::setSelectionRange(int start, int end, TextField
if (!renderer() || !renderer()->isTextControl())
return;
- end = std::max(end, 0);
- start = std::min(std::max(start, 0), end);
+ int textLength = innerEditorValue().length();
+ end = std::max(std::min(end, textLength), 0);
+ start = std::max(std::min(start, end), 0);
+ cacheSelection(start, end, direction);
+ bool isCaretSelection = start == end;
+ bool shouldSetSelection = document().focusedElement() == this || (!isCaretSelection && start < textLength);
+
+ if (!hasVisibleTextArea(renderer(), innerEditorElement()))
+ return;
+
+ LocalFrame* frame = document().frame();
- if (!hasVisibleTextArea(renderer(), innerEditorElement())) {
- cacheSelection(start, end, direction);
+ if (!frame || !shouldSetSelection)
return;
- }
+
VisiblePosition startPosition = visiblePositionForIndex(start);
VisiblePosition endPosition;
if (start == end)
@@ -309,8 +317,7 @@ void HTMLTextFormControlElement::setSelectionRange(int start, int end, TextField
newSelection = VisibleSelection(startPosition, endPosition);
newSelection.setIsDirectional(direction != SelectionHasNoDirection);
- if (LocalFrame* frame = document().frame())
- frame->selection().setSelection(newSelection);
+ frame->selection().setSelection(newSelection);
}
VisiblePosition HTMLTextFormControlElement::visiblePositionForIndex(int index) const
@@ -477,8 +484,8 @@ void HTMLTextFormControlElement::selectionChanged(bool userTriggered)
if (!renderer() || !isTextFormControl())
return;
- // selectionStart() or selectionEnd() will return cached selection when this node doesn't have focus
- cacheSelection(computeSelectionStart(), computeSelectionEnd(), computeSelectionDirection());
+ if (document().focusedElement() == this)
+ cacheSelection(computeSelectionStart(), computeSelectionEnd(), computeSelectionDirection());
if (LocalFrame* frame = document().frame()) {
if (frame->selection().isRange() && userTriggered)
« no previous file with comments | « LayoutTests/fast/forms/validationMessage.html ('k') | Source/core/html/forms/TextFieldInputType.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698