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

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

Issue 404483002: Revert of "Blink does not respect input.selectionStart and input.selectionEnd for some cases" (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: 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
Index: Source/core/html/HTMLTextFormControlElement.cpp
diff --git a/Source/core/html/HTMLTextFormControlElement.cpp b/Source/core/html/HTMLTextFormControlElement.cpp
index d9b2c5b31cea91ae5ddde9009fd204eb6d2f5319..e02eff2f1f42ef1acac04ccc9505076341adb25f 100644
--- a/Source/core/html/HTMLTextFormControlElement.cpp
+++ b/Source/core/html/HTMLTextFormControlElement.cpp
@@ -284,21 +284,13 @@ void HTMLTextFormControlElement::setSelectionRange(int start, int end, TextField
if (!renderer() || !renderer()->isTextControl())
return;
- 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();
+ end = std::max(end, 0);
+ start = std::min(std::max(start, 0), end);
- if (!frame || !shouldSetSelection)
+ if (!hasVisibleTextArea(renderer(), innerEditorElement())) {
+ cacheSelection(start, end, direction);
return;
-
+ }
VisiblePosition startPosition = visiblePositionForIndex(start);
VisiblePosition endPosition;
if (start == end)
@@ -319,7 +311,8 @@ void HTMLTextFormControlElement::setSelectionRange(int start, int end, TextField
newSelection = VisibleSelection(startPosition, endPosition);
newSelection.setIsDirectional(direction != SelectionHasNoDirection);
- frame->selection().setSelection(newSelection);
+ if (LocalFrame* frame = document().frame())
+ frame->selection().setSelection(newSelection);
}
VisiblePosition HTMLTextFormControlElement::visiblePositionForIndex(int index) const
@@ -486,8 +479,8 @@ void HTMLTextFormControlElement::selectionChanged(bool userTriggered)
if (!renderer() || !isTextFormControl())
return;
- if (document().focusedElement() == this)
- cacheSelection(computeSelectionStart(), computeSelectionEnd(), computeSelectionDirection());
+ // selectionStart() or selectionEnd() will return cached selection when this node doesn't have focus
+ cacheSelection(computeSelectionStart(), computeSelectionEnd(), computeSelectionDirection());
if (LocalFrame* frame = document().frame()) {
if (frame->selection().isRange() && userTriggered)
« no previous file with comments | « LayoutTests/platform/win/fast/repaint/subtree-root-skipped-expected.txt ('k') | Source/core/html/forms/TextFieldInputType.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698