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

layout: Perform text decoration propagation per CSS 2.1 § 16.3.1 without

Browse source 
going to the DOM.
This commit is contained in:
Patrick Walton 2013-12-12 17:26:23 -08:00
parent 7b3c3542a3
commit a2e91d242b
13 changed files with 215 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/components/gfx/display_list.rs
View file

@ -92,12 +92,38 @@ pub struct SolidColorDisplayItem<E> {
/// Renders text.
pub struct TextDisplayItem<E> {
/// Fields common to all display items.
base: BaseDisplayItem<E>,
/// The text run.
text_run: Arc<~TextRun>,
/// The range of text within the text run.
range: Range,
/// The color of the text.
color: Color,
/// A bitfield of flags for text display items.
flags: TextDisplayItemFlags,
}
/// Flags for text display items.
pub struct TextDisplayItemFlags(u8);
impl TextDisplayItemFlags {
pub fn new() -> TextDisplayItemFlags {
TextDisplayItemFlags(0)
}
}
// Whether underlining is forced on.
bitfield!(TextDisplayItemFlags, override_underline, set_override_underline, 0x01)
// Whether overlining is forced on.
bitfield!(TextDisplayItemFlags, override_overline, set_override_overline, 0x02)
// Whether line-through is forced on.
bitfield!(TextDisplayItemFlags, override_line_through, set_override_line_through, 0x04)
/// Renders an image.
pub struct ImageDisplayItem<E> {
base: BaseDisplayItem<E>,
@ -184,18 +210,18 @@ impl<E> DisplayItem<E> {
let strikeout_size = font_metrics.strikeout_size;
let strikeout_offset = font_metrics.strikeout_offset;
if text_run.decoration.underline {
if text_run.decoration.underline || text.flags.override_underline() {
let underline_y = baseline_origin.y - underline_offset;
let underline_bounds = Rect(Point2D(baseline_origin.x, underline_y),
Size2D(width, underline_size));
render_context.draw_solid_color(&underline_bounds, text.color);
}
if text_run.decoration.overline {
if text_run.decoration.overline || text.flags.override_overline() {
let overline_bounds = Rect(Point2D(baseline_origin.x, origin.y),
Size2D(width, underline_size));
render_context.draw_solid_color(&overline_bounds, text.color);
}
if text_run.decoration.line_through {
if text_run.decoration.line_through || text.flags.override_line_through() {
let strikeout_y = baseline_origin.y - strikeout_offset;
let strikeout_bounds = Rect(Point2D(baseline_origin.x, strikeout_y),
Size2D(width, strikeout_size));