Backed out 3 changesets (bug 1677263, bug 1679460, bug 1679461) for test_focus.xhtml failures CLOSED TREE

Backed out changeset 03db12dabc63 (bug 1677263)
Backed out changeset 75de13448090 (bug 1679460)
Backed out changeset 4f4fd8e7ce93 (bug 1679461)
This commit is contained in:
Bogdan Tara
2020-12-02 21:16:28 +02:00
parent 6a555cd304
commit 9ef9c44401
8 changed files with 91 additions and 57 deletions

View File

@@ -3020,11 +3020,17 @@ void HTMLInputElement::Select() {
return;
}
TextControlState* state = GetEditorState();
MOZ_ASSERT(state, "Single line text controls are expected to have a state");
// XXX Bug? We have to give the input focus before contents can be
// selected
if (FocusState() != eUnfocusable) {
RefPtr<nsFrameSelection> fs = state->GetConstFrameSelection();
FocusTristate state = FocusState();
if (state == eUnfocusable) {
return;
}
TextControlState* tes = GetEditorState();
if (tes) {
RefPtr<nsFrameSelection> fs = tes->GetConstFrameSelection();
if (fs && fs->MouseDownRecorded()) {
// This means that we're being called while the frame selection has a
// mouse down event recorded to adjust the caret during the mouse up
@@ -3033,24 +3039,27 @@ void HTMLInputElement::Select() {
// select() call takes effect.
fs->SetDelayedCaretData(nullptr);
}
if (RefPtr<nsFocusManager> fm = nsFocusManager::GetFocusManager()) {
fm->SetFocus(this, nsIFocusManager::FLAG_NOSCROLL);
// A focus event handler may change the type attribute, which will destroy
// the previous state object.
state = GetEditorState();
if (!state) {
return;
}
}
}
// Directly call TextControlState::SetSelectionRange because
// HTMLInputElement::SetSelectionRange only applies to fewer types
state->SetSelectionRange(0, UINT32_MAX,
nsITextControlFrame::SelectionDirection::eNone,
IgnoredErrorResult());
nsFocusManager* fm = nsFocusManager::GetFocusManager();
RefPtr<nsPresContext> presContext = GetPresContext(eForComposedDoc);
if (state == eInactiveWindow) {
if (fm) fm->SetFocus(this, nsIFocusManager::FLAG_NOSCROLL);
SelectAll(presContext);
return;
}
DispatchSelectEvent(presContext);
if (fm) {
fm->SetFocus(this, nsIFocusManager::FLAG_NOSCROLL);
// ensure that the element is actually focused
if (this == fm->GetFocusedElement()) {
// Now Select all the text!
SelectAll(presContext);
}
}
}
void HTMLInputElement::DispatchSelectEvent(nsPresContext* aPresContext) {