Skip to content

GitLab

T
tangled
Commit 9fc859a3 authored by Kent Tamura's avatar Kent Tamura Committed by Commit Bot
Browse files
Options

Restoring control state should dispatch 'input' and 'change' events. 

According to the last two paragraphs of [1], UA should dispatch 'input'
and 'change' events if it fills control values on behalf of a user.

[1] https://html.spec.whatwg.org/C/#common-input-element-events

Bug: 1037728
Change-Id: Ic389cc4e3bc4523f740b0164ac863baba66dcd35
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1981241Reviewed-by: default avatarMason Freed <masonfreed@chromium.org>
Commit-Queue: Kent Tamura <tkent@chromium.org>
Cr-Commit-Position: refs/heads/master@{#727843}
parent b6037d76
Hide whitespace changes
Inline Side-by-side
Showing with 53 additions and 2 deletions
third_party/blink/renderer/core/html/forms/html_form_control_element_with_state.cc
View file @ 9fc859a3
......@@ -275,6 +275,17 @@ bool HTMLFormControlElementWithState::ShouldSaveAndRestoreFormControlState()
return isConnected() && ShouldAutocomplete();
}
void HTMLFormControlElementWithState::QueueInputAndChangeEvents() {
auto task_runner = GetDocument().GetTaskRunner(TaskType::kUserInteraction);
task_runner->PostTask(
FROM_HERE, WTF::Bind(&HTMLFormControlElementWithState::DispatchInputEvent,
WrapWeakPersistent(this)));
task_runner->PostTask(
FROM_HERE,
WTF::Bind(&HTMLFormControlElementWithState::DispatchChangeEvent,
WrapWeakPersistent(this)));
}
void HTMLFormControlElementWithState::FinishParsingChildren() {
HTMLFormControlElement::FinishParsingChildren();
ListedElement::TakeStateAndRestore();
......
third_party/blink/renderer/core/html/forms/html_form_control_element_with_state.h
View file @ 9fc859a3
......@@ -54,6 +54,8 @@ class CORE_EXPORT HTMLFormControlElementWithState
bool user_has_edited_the_field_ = false;
HTMLFormControlElementWithState(const QualifiedName& tag_name, Document&);
void QueueInputAndChangeEvents();
void FinishParsingChildren() override;
bool IsFormControlElementWithState() const final;
......
third_party/blink/renderer/core/html/forms/html_input_element.cc
View file @ 9fc859a3
......@@ -586,6 +586,7 @@ FormControlState HTMLInputElement::SaveFormControlState() const {
void HTMLInputElement::RestoreFormControlState(const FormControlState& state) {
input_type_view_->RestoreFormControlState(state);
state_restored_ = true;
QueueInputAndChangeEvents();
}
bool HTMLInputElement::CanStartSelection() const {
......
third_party/blink/renderer/core/html/forms/html_select_element.cc
View file @ 9fc859a3
......@@ -1237,6 +1237,7 @@ void HTMLSelectElement::RestoreFormControlState(const FormControlState& state) {
}
SetNeedsValidityCheck();
QueueInputAndChangeEvents();
}
void HTMLSelectElement::ParseMultipleAttribute(const AtomicString& value) {
......
third_party/blink/renderer/core/html/forms/html_text_area_element.cc
View file @ 9fc859a3
......@@ -94,7 +94,11 @@ FormControlState HTMLTextAreaElement::SaveFormControlState() const {
void HTMLTextAreaElement::RestoreFormControlState(
const FormControlState& state) {
// We don't add kDispatchInputAndChangeEvent to setValue(), and we
// post tasks to dispatch events instead. This function can be called
// while we should not dispatch any events.
setValue(state[0]);
QueueInputAndChangeEvents();
}
void HTMLTextAreaElement::ChildrenChanged(const ChildrenChange& change) {
......
third_party/blink/web_tests/fast/forms/resources/state-restore-dynamic-controls-frame.html
View file @ 9fc859a3
<!DOCTYPE html>
<script>
document.addEventListener('change', e => {
parent.inputOrChangeEvents.push('change/' + e.target.type);
});
document.addEventListener('input', e => {
parent.inputOrChangeEvents.push('input/' + e.target.type);
});
</script>
<div></div>
<input type=checkbox disabled>
<input type=text disabled>
<textarea></textarea>
<select><option>1<option>2</select>
<script>
document.querySelector('div').innerHTML = '<input type=checkbox><input type=text>'
</script>
third_party/blink/web_tests/fast/forms/state-restore-dynamic-controls.html
View file @ 9fc859a3
......@@ -5,30 +5,52 @@
<body>
<iframe src="resources/state-restore-dynamic-controls-frame.html"></iframe>
<script>
window.inputOrChangeEvents = [];
promise_test(async t => {
await waitForEvent(window, 'load', {once:true});
const iframe = document.querySelector('iframe');
const container = iframe.contentDocument.querySelector('div');
let doc = iframe.contentDocument;
const container = doc.querySelector('div');
// Change states of controls
container.firstChild.click();
container.lastChild.focus();
eventSender.keyDown('z');
doc.querySelector('textarea').focus();
eventSender.keyDown('y');
doc.querySelector('select').focus();
eventSender.keyDown('2');
assert_true(container.firstChild.checked, 'sanity check for a checkbox');
assert_equals(container.lastChild.value, 'z', 'sanity check for a text field');
assert_equals(doc.querySelector('textarea').value, 'y', 'sanity check for a textarea');
assert_equals(doc.querySelector('select').value, '2', 'sanity check for a select');
// Flush asynchronous input/change events
await timeOut(t, 0);
// Navigate
iframe.src = 'data:text/html,<h1></h1>';
await waitForEvent(iframe, 'load', {once:true});
inputOrChangeEvents = []
// Navigate back
history.back();
await waitForEvent(iframe, 'load', {once:true});
// Wait until finishing the restore task.
await timeOut(t, 0);
const inputs = iframe.contentDocument.querySelectorAll('input');
doc = iframe.contentDocument;
const inputs = doc.querySelectorAll('input');
assert_true(inputs[0].checked, 'Checkbox state should be restored.');
assert_equals(inputs[1].value, 'z', 'Text field state should be restored.');
assert_false(inputs[2].checked, 'Checkbox should have initial value.');
assert_equals(inputs[3].value, '', 'Text field should have initial value.');
assert_equals(doc.querySelector('textarea').value, 'y');
assert_equals(doc.querySelector('select').value, '2');
// Wait for asynchronous input/change events
await timeOut(t, 0);
assert_array_equals(inputOrChangeEvents, [
'input/checkbox', 'change/checkbox', 'input/text', 'change/text',
'input/textarea', 'change/textarea', 'input/select-one', 'change/select-one']);
}, 'Control states should be restored correctly even if controls were inserted before existing controls.');
</script>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment