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 | |
| 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.
| -rw-r--r-- | components/gfx/font_context.rs | 2 | ||||
| -rw-r--r-- | tests/ref/basic.list | 1 | ||||
| -rw-r--r-- | tests/ref/font_style.html | 21 | ||||
| -rw-r--r-- | tests/ref/font_style_ref.html | 21 |
4 files changed, 44 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() { diff --git a/tests/ref/basic.list b/tests/ref/basic.list index 3587b59e181..f4af79d356f 100644 --- a/tests/ref/basic.list +++ b/tests/ref/basic.list @@ -26,6 +26,7 @@ # text_decoration_propagation_a.html text_decoration_propagation_b.html # inline_text_align_a.html inline_text_align_b.html == font_size.html font_size_ref.html +== font_style.html font_style_ref.html == img_size_a.html img_size_b.html == img_dynamic_remove.html img_dynamic_remove_ref.html == upper_id_attr.html upper_id_attr_ref.html diff --git a/tests/ref/font_style.html b/tests/ref/font_style.html new file mode 100644 index 00000000000..18c67976c26 --- /dev/null +++ b/tests/ref/font_style.html @@ -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> + diff --git a/tests/ref/font_style_ref.html b/tests/ref/font_style_ref.html new file mode 100644 index 00000000000..023dc14f501 --- /dev/null +++ b/tests/ref/font_style_ref.html @@ -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> + |