diff options
author | bors-servo <metajack+bors@gmail.com> | 2015-01-28 11:51:53 -0700 |
---|---|---|
committer | bors-servo <metajack+bors@gmail.com> | 2015-01-28 11:51:53 -0700 |
commit | c2076d707e85c0b197c6fde286b1799a80de4d80 (patch) | |
tree | 4f87e1313f593030e2e45e04a7c0727eb508c520 /components/gfx/font_context.rs | |
parent | 95f71eea5c4d5c220abd3307b08f48bf86504eca (diff) | |
parent | ee0ce0d8f4eecede189ee85cf51a64519ffa5c80 (diff) | |
download | servo-c2076d707e85c0b197c6fde286b1799a80de4d80.tar.gz servo-c2076d707e85c0b197c6fde286b1799a80de4d80.zip |
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.
Diffstat (limited to 'components/gfx/font_context.rs')
-rw-r--r-- | components/gfx/font_context.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/components/gfx/font_context.rs b/components/gfx/font_context.rs index e439d482f64..34e92b21540 100644 --- a/components/gfx/font_context.rs +++ b/components/gfx/font_context.rs @@ -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() { |