mirror of
https://github.com/servo/servo.git
synced 2025-08-03 04:30:10 +01:00
Fix incremental reflow of text selection changes
Also replace force_relayout methods with direct Node::dirty calls, for clarity.
This commit is contained in:
parent
0397e2a24d
commit
776aae6399
5 changed files with 83 additions and 20 deletions
|
@ -200,6 +200,7 @@ impl HTMLInputElement {
|
|||
text_input.selection_begin = Some(text_input.get_text_point_for_absolute_point(start));
|
||||
text_input.edit_point = text_input.get_text_point_for_absolute_point(end);
|
||||
self.selection_direction.set(*direction);
|
||||
self.upcast::<Node>().dirty(NodeDamage::OtherNodeDamage);
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -401,7 +402,7 @@ impl HTMLInputElementMethods for HTMLInputElement {
|
|||
}
|
||||
|
||||
self.value_changed.set(true);
|
||||
self.force_relayout();
|
||||
self.upcast::<Node>().dirty(NodeDamage::OtherNodeDamage);
|
||||
Ok(())
|
||||
}
|
||||
|
||||
|
@ -586,11 +587,6 @@ fn in_same_group(other: &HTMLInputElement, owner: Option<&HTMLFormElement>,
|
|||
}
|
||||
|
||||
impl HTMLInputElement {
|
||||
fn force_relayout(&self) {
|
||||
let doc = document_from_node(self);
|
||||
doc.content_changed(self.upcast(), NodeDamage::OtherNodeDamage)
|
||||
}
|
||||
|
||||
fn radio_group_updated(&self, group: Option<&Atom>) {
|
||||
if self.Checked() {
|
||||
broadcast_radio_checked(self, group);
|
||||
|
@ -654,7 +650,7 @@ impl HTMLInputElement {
|
|||
self.get_radio_group_name().as_ref());
|
||||
}
|
||||
|
||||
self.force_relayout();
|
||||
self.upcast::<Node>().dirty(NodeDamage::OtherNodeDamage);
|
||||
//TODO: dispatch change event
|
||||
}
|
||||
|
||||
|
@ -684,7 +680,7 @@ impl HTMLInputElement {
|
|||
.expect("Failed to reset input value to default.");
|
||||
self.value_dirty.set(false);
|
||||
self.value_changed.set(false);
|
||||
self.force_relayout();
|
||||
self.upcast::<Node>().dirty(NodeDamage::OtherNodeDamage);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -889,11 +885,11 @@ impl VirtualMethods for HTMLInputElement {
|
|||
ChangeEventRunnable::send(self.upcast::<Node>());
|
||||
}
|
||||
|
||||
self.force_relayout();
|
||||
self.upcast::<Node>().dirty(NodeDamage::OtherNodeDamage);
|
||||
event.PreventDefault();
|
||||
}
|
||||
RedrawSelection => {
|
||||
self.force_relayout();
|
||||
self.upcast::<Node>().dirty(NodeDamage::OtherNodeDamage);
|
||||
event.PreventDefault();
|
||||
}
|
||||
Nothing => (),
|
||||
|
|
|
@ -206,7 +206,7 @@ impl HTMLTextAreaElementMethods for HTMLTextAreaElement {
|
|||
self.textinput.borrow_mut().set_content(value);
|
||||
self.value_changed.set(true);
|
||||
|
||||
self.force_relayout();
|
||||
self.upcast::<Node>().dirty(NodeDamage::OtherNodeDamage);
|
||||
}
|
||||
|
||||
// https://html.spec.whatwg.org/multipage/#dom-lfe-labels
|
||||
|
@ -230,13 +230,6 @@ impl HTMLTextAreaElement {
|
|||
}
|
||||
|
||||
|
||||
impl HTMLTextAreaElement {
|
||||
fn force_relayout(&self) {
|
||||
let doc = document_from_node(self);
|
||||
doc.content_changed(self.upcast(), NodeDamage::OtherNodeDamage)
|
||||
}
|
||||
}
|
||||
|
||||
impl VirtualMethods for HTMLTextAreaElement {
|
||||
fn super_type(&self) -> Option<&VirtualMethods> {
|
||||
Some(self.upcast::<HTMLElement>() as &VirtualMethods)
|
||||
|
@ -321,11 +314,11 @@ impl VirtualMethods for HTMLTextAreaElement {
|
|||
ChangeEventRunnable::send(self.upcast::<Node>());
|
||||
}
|
||||
|
||||
self.force_relayout();
|
||||
self.upcast::<Node>().dirty(NodeDamage::OtherNodeDamage);
|
||||
event.PreventDefault();
|
||||
}
|
||||
KeyReaction::RedrawSelection => {
|
||||
self.force_relayout();
|
||||
self.upcast::<Node>().dirty(NodeDamage::OtherNodeDamage);
|
||||
event.PreventDefault();
|
||||
}
|
||||
KeyReaction::Nothing => (),
|
||||
|
|
|
@ -2603,6 +2603,18 @@
|
|||
"url": "/_mozilla/css/input_selection_a.html"
|
||||
}
|
||||
],
|
||||
"css/input_selection_incremental_a.html": [
|
||||
{
|
||||
"path": "css/input_selection_incremental_a.html",
|
||||
"references": [
|
||||
[
|
||||
"/_mozilla/css/input_selection_incremental_ref.html",
|
||||
"=="
|
||||
]
|
||||
],
|
||||
"url": "/_mozilla/css/input_selection_incremental_a.html"
|
||||
}
|
||||
],
|
||||
"css/input_selection_ref.html": [
|
||||
{
|
||||
"path": "css/input_selection_ref.html",
|
||||
|
@ -9025,6 +9037,18 @@
|
|||
"url": "/_mozilla/css/input_selection_a.html"
|
||||
}
|
||||
],
|
||||
"css/input_selection_incremental_a.html": [
|
||||
{
|
||||
"path": "css/input_selection_incremental_a.html",
|
||||
"references": [
|
||||
[
|
||||
"/_mozilla/css/input_selection_incremental_ref.html",
|
||||
"=="
|
||||
]
|
||||
],
|
||||
"url": "/_mozilla/css/input_selection_incremental_a.html"
|
||||
}
|
||||
],
|
||||
"css/input_selection_ref.html": [
|
||||
{
|
||||
"path": "css/input_selection_ref.html",
|
||||
|
|
|
@ -0,0 +1,31 @@
|
|||
<!doctype html>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<title>input selection incremental test</title>
|
||||
<link rel="match" href="input_selection_incremental_ref.html">
|
||||
<style>
|
||||
input {
|
||||
font: 16px sans-serif;
|
||||
border: 0 none;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
}
|
||||
::selection {
|
||||
color: white;
|
||||
background: rgba(176, 214, 255, 1.0);
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<input value="Hello">
|
||||
<script>
|
||||
var input = document.querySelector("input");
|
||||
input.focus();
|
||||
input.setSelectionRange(0, 5);
|
||||
|
||||
document.body.offsetWidth; // force layout
|
||||
input.setSelectionRange(0, 1);
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
|
@ -0,0 +1,19 @@
|
|||
<!doctype html>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<title>input selection incremental reference</title>
|
||||
<style>
|
||||
body {
|
||||
font: 16px sans-serif;
|
||||
}
|
||||
.selection {
|
||||
color: white;
|
||||
background: rgba(176, 214, 255, 1.0);
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<span class="selection">H</span>ello
|
||||
</body>
|
||||
</html>
|
Loading…
Add table
Add a link
Reference in a new issue