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

Fix style issues

Browse source
This commit is contained in:
Eric Atkinson 2013-05-24 10:34:16 -07:00
parent d4b837bba6
commit e45ae15640
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/components/servo-gfx/text/text_run.rs
View file

@ -34,7 +34,7 @@ impl SendableTextRun {
TextRun { TextRun {
text: copy self.text, text: copy self.text,
font: font, font: font,
underline: copy self.underline, underline: self.underline,
glyphs: copy self.glyphs glyphs: copy self.glyphs
} }
} }
@ -105,7 +105,7 @@ pub impl<'self> TextRun {
SendableTextRun { SendableTextRun {
text: copy self.text, text: copy self.text,
font: self.font.get_descriptor(), font: self.font.get_descriptor(),
underline: copy self.underline, underline: self.underline,
glyphs: copy self.glyphs, glyphs: copy self.glyphs,
} }
} }

6
src/components/servo/layout/inline.rs
View file

@ -245,7 +245,7 @@ impl TextRunScanner {
let inline = &mut *flow.inline(); let inline = &mut *flow.inline();
let in_boxes = &inline.boxes; let in_boxes = &inline.boxes;
fn hasUnderline(decoration: CSSTextDecoration) -> bool{ fn has_underline(decoration: CSSTextDecoration) -> bool{
match decoration { match decoration {
CSSTextDecorationUnderline => true, CSSTextDecorationUnderline => true,
_ => false _ => false
@ -273,7 +273,7 @@ impl TextRunScanner {
let old_box = in_boxes[self.clump.begin()]; let old_box = in_boxes[self.clump.begin()];
let text = old_box.raw_text(); let text = old_box.raw_text();
let font_style = old_box.font_style(); let font_style = old_box.font_style();
let underline = hasUnderline(old_box.text_decoration()); let underline = has_underline(old_box.text_decoration());
// TODO(#115): Use the actual CSS `white-space` property of the relevant style. // TODO(#115): Use the actual CSS `white-space` property of the relevant style.
let compression = CompressWhitespaceNewline; let compression = CompressWhitespaceNewline;
@ -326,7 +326,7 @@ impl TextRunScanner {
// and then letting `FontGroup` decide which `Font` to stick into the text run. // and then letting `FontGroup` decide which `Font` to stick into the text run.
let font_style = in_boxes[self.clump.begin()].font_style(); let font_style = in_boxes[self.clump.begin()].font_style();
let fontgroup = ctx.font_ctx.get_resolved_font_for_style(&font_style); let fontgroup = ctx.font_ctx.get_resolved_font_for_style(&font_style);
let underline = hasUnderline(in_boxes[self.clump.begin()].text_decoration()); let underline = has_underline(in_boxes[self.clump.begin()].text_decoration());
// TextRuns contain a cycle which is usually resolved by the teardown // TextRuns contain a cycle which is usually resolved by the teardown
// sequence. If no clump takes ownership, however, it will leak. // sequence. If no clump takes ownership, however, it will leak.