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

auto merge of #4660 : deokjinkim/servo/font_style, r=jdm

Browse source 
'oblique' font-style is not supported now.
When I checked freetype.h, same macro is used for italic and oblique.

  /*    FT_STYLE_FLAG_ITALIC ::                                            */
  /*      Indicates that a given face style is italic or oblique.          */

So, when font style is 'oblique', enable flag for italic.
With tests/html/test_italic_bold.html, it works well.
This commit is contained in:
bors-servo 2015-01-28 11:51:53 -07:00
commit c2076d707e
4 changed files with 44 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/gfx/font_context.rs
View file

@ -140,7 +140,7 @@ impl FontContext {
// so they will never be released. Find out a good time to drop them. // so they will never be released. Find out a good time to drop them.
let desc = FontTemplateDescriptor::new(style.font_weight, let desc = FontTemplateDescriptor::new(style.font_weight,
style.font_style == font_style::T::italic); style.font_style == font_style::T::italic || style.font_style == font_style::T::oblique);
let mut fonts = SmallVec8::new(); let mut fonts = SmallVec8::new();
for family in style.font_family.iter() { for family in style.font_family.iter() {

1
tests/ref/basic.list
View file

@ -26,6 +26,7 @@
# text_decoration_propagation_a.html text_decoration_propagation_b.html # text_decoration_propagation_a.html text_decoration_propagation_b.html
# inline_text_align_a.html inline_text_align_b.html # inline_text_align_a.html inline_text_align_b.html
== font_size.html font_size_ref.html == font_size.html font_size_ref.html
== font_style.html font_style_ref.html
== img_size_a.html img_size_b.html == img_size_a.html img_size_b.html
== img_dynamic_remove.html img_dynamic_remove_ref.html == img_dynamic_remove.html img_dynamic_remove_ref.html
== upper_id_attr.html upper_id_attr_ref.html == upper_id_attr.html upper_id_attr_ref.html

21
tests/ref/font_style.html Normal file
View file

@ -0,0 +1,21 @@
<!DOCTYPE html>
<html>
<head>
<style>
p.normal {
font-style: normal;
}
p.italic {
font-style: italic;
}
</style>
</head>
<body>
<p class="normal">This is a paragraph, normal.</p>
<p class="italic">This is a paragraph, italic(oblique).</p>
</body>
</html>

21
tests/ref/font_style_ref.html Normal file
View file

@ -0,0 +1,21 @@
<!DOCTYPE html>
<html>
<head>
<style>
p.normal {
font-style: normal;
}
p.oblique {
font-style: oblique;
}
</style>
</head>
<body>
<p class="normal">This is a paragraph, normal.</p>
<p class="oblique">This is a paragraph, italic(oblique).</p>
</body>
</html>