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

style: simplify -servo-text-decorations-in-effect.

Browse source 
It's stupid.

Signed-off-by: Emilio Cobos Álvarez <emilio@crisal.io>
This commit is contained in:
Emilio Cobos Álvarez 2017-09-17 00:30:25 +02:00
parent 2c88248b87
commit 15a76b01c1
No known key found for this signature in database
GPG key ID: 056B727BB9C1027C
2 changed files with 34 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

47
components/layout/display_list_builder.rs
View file

@ -2230,13 +2230,10 @@ impl FragmentDisplayListBuilding for Fragment {
// Create display items for text decorations.
let mut text_decorations = self.style()
.get_inheritedtext()
._servo_text_decorations_in_effect;
// Note that the text decoration colors are always the same as the text color.
text_decorations.underline = text_decorations.underline.map(|_| text_color);
text_decorations.overline = text_decorations.overline.map(|_| text_color);
text_decorations.line_through = text_decorations.line_through.map(|_| text_color);
let text_decorations =
self.style()
.get_inheritedtext()
._servo_text_decorations_in_effect;
let stacking_relative_content_box =
LogicalRect::from_physical(self.style.writing_mode,
@ -2244,25 +2241,29 @@ impl FragmentDisplayListBuilding for Fragment {
container_size);
// Underline
if let Some(ref underline_color) = text_decorations.underline {
if text_decorations.underline {
let mut stacking_relative_box = stacking_relative_content_box;
stacking_relative_box.start.b = stacking_relative_content_box.start.b +
metrics.ascent - metrics.underline_offset;
stacking_relative_box.size.block = metrics.underline_size;
self.build_display_list_for_text_decoration(state,
underline_color,
&stacking_relative_box,
clip);
self.build_display_list_for_text_decoration(
state,
&text_color,
&stacking_relative_box,
clip,
);
}
// Overline
if let Some(ref overline_color) = text_decorations.overline {
if text_decorations.overline {
let mut stacking_relative_box = stacking_relative_content_box;
stacking_relative_box.size.block = metrics.underline_size;
self.build_display_list_for_text_decoration(state,
overline_color,
&stacking_relative_box,
clip);
self.build_display_list_for_text_decoration(
state,
&text_color,
&stacking_relative_box,
clip,
);
}
// Text
@ -2281,15 +2282,17 @@ impl FragmentDisplayListBuilding for Fragment {
// Line-Through
if let Some(ref line_through_color) = text_decorations.line_through {
if text_decorations.line_through {
let mut stacking_relative_box = stacking_relative_content_box;
stacking_relative_box.start.b = stacking_relative_box.start.b + metrics.ascent -
metrics.strikeout_offset;
stacking_relative_box.size.block = metrics.strikeout_size;
self.build_display_list_for_text_decoration(state,
line_through_color,
&stacking_relative_box,
clip);
self.build_display_list_for_text_decoration(
state,
&text_color,
&stacking_relative_box,
clip,
);
}
// Pair all the PushTextShadows