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

'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

View file

@ -140,7 +140,7 @@ impl FontContext {
// so they will never be released. Find out a good time to drop them.
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();
for family in style.font_family.iter() {