Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-24 15:50:21 +01:00
Code Issues Projects Releases Packages Wiki Activity

style: Compute damage for text nodes.

Browse source 
They have styles just like elements do.

Allows a dynamic change of `display: none` to `display: inline` to work.

Closes #9868.
This commit is contained in:
Patrick Walton 2016-03-14 19:14:21 -07:00
parent aea8d8959d
commit d59dee0c65
5 changed files with 52 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
components/style/matching.rs
View file

@ -655,6 +655,7 @@ pub trait MatchMethods : TNode {
}
};
let damage;
if self.is_text_node() {
// Text nodes get a copy of the parent style. This ensures
// that during fragment construction any non-inherited
@ -663,9 +664,11 @@ pub trait MatchMethods : TNode {
let mut data_ref = self.mutate_data().unwrap();
let mut data = &mut *data_ref;
let cloned_parent_style = parent_style.unwrap().clone();
damage = Self::ConcreteRestyleDamage::compute(data.style.as_ref(),
&*cloned_parent_style);
data.style = Some(cloned_parent_style);
} else {
let damage = {
damage = {
let mut data_ref = self.mutate_data().unwrap();
let mut data = &mut *data_ref;
let (mut damage, final_style) = self.cascade_node_pseudo_element(
@ -706,13 +709,15 @@ pub trait MatchMethods : TNode {
// This method needs to borrow the data as mutable, so make sure data_ref goes out of
// scope first.
self.set_restyle_damage(damage);
self.set_can_be_fragmented(parent.map_or(false, |p| {
p.can_be_fragmented() ||
parent_style.as_ref().unwrap().is_multicol()
}));
}
// This method needs to borrow the data as mutable, so make sure data_ref goes out of
// scope first.
self.set_restyle_damage(damage);
}
}

3
tests/wpt/metadata-css/css21_dev/html4/run-in-display-none-between-003.htm.ini
View file

@ -1,3 +0,0 @@
[run-in-display-none-between-003.htm]
type: reftest
expected: FAIL

24
tests/wpt/mozilla/meta/MANIFEST.json
View file

@ -4560,6 +4560,18 @@
"url": "/_mozilla/css/text_align_start_end.html"
}
],
"css/text_damage_a.html": [
{
"path": "css/text_damage_a.html",
"references": [
[
"/_mozilla/css/text_damage_ref.html",
"=="
]
],
"url": "/_mozilla/css/text_damage_a.html"
}
],
"css/text_decoration_cached.html": [
{
"path": "css/text_decoration_cached.html",
@ -10760,6 +10772,18 @@
"url": "/_mozilla/css/text_align_start_end.html"
}
],
"css/text_damage_a.html": [
{
"path": "css/text_damage_a.html",
"references": [
[
"/_mozilla/css/text_damage_ref.html",
"=="
]
],
"url": "/_mozilla/css/text_damage_a.html"
}
],
"css/text_decoration_cached.html": [
{
"path": "css/text_decoration_cached.html",

14
tests/wpt/mozilla/tests/css/text_damage_a.html Normal file
View file

@ -0,0 +1,14 @@
<!DOCTYPE html>
<html class="reftest-wait">
<meta charset="utf-8">
<title></title>
<link rel="match" href="text_damage_ref.html">
<span class="lock" style="display: none">foo</span><span>bar</span>
<script>
window.onload = function() {
document.querySelector(".lock").style.display = "inline";
document.documentElement.classList.remove("reftest-wait");
};
</script>

6
tests/wpt/mozilla/tests/css/text_damage_ref.html Normal file
View file

@ -0,0 +1,6 @@
<!DOCTYPE html>
<html>
<meta charset="utf-8">
<title></title>
<span class="lock" style="display: inline">foo</span><span>bar</span>