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

Auto merge of #6981 - pcwalton:github-font-fallback, r=metajack

Browse source 
gfx: Fix Core Text font instantiation for Web fonts on Mac.

r? @metajack

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6981)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-08-05 06:11:36 -06:00
commit 11acfbc29f
7 changed files with 52 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

1
tests/ref/basic.list
View file

@ -219,6 +219,7 @@ flaky_cpu == linebreak_simple_a.html linebreak_simple_b.html
== nth_last_of_type_pseudo_a.html nth_last_of_type_pseudo_b.html
== nth_of_type_pseudo_a.html nth_of_type_pseudo_b.html
== object_element_a.html object_element_b.html
!= octicons_a.html octicons_ref.html
== ol_japanese_iroha_a.html ol_japanese_iroha_ref.html
!= ol_japanese_iroha_bullet_styles.html ol_japanese_iroha_ref.html
== ol_simple_a.html ol_simple_ref.html

9
tests/ref/fonts/octicons/LICENSE.txt Normal file
View file

@ -0,0 +1,9 @@
(c) 2012-2015 GitHub
When using the GitHub logos, be sure to follow the GitHub logo guidelines (https://github.com/logos)
Font License: SIL OFL 1.1 (http://scripts.sil.org/OFL)
Applies to all font files
Code License: MIT (http://choosealicense.com/licenses/mit/)
Applies to all other files

BIN
tests/ref/fonts/octicons/octicons.ttf Normal file
View file

Binary file not shown.

15
tests/ref/octicons_a.html Normal file
View file

@ -0,0 +1,15 @@
<!DOCTYPE html>
<head>
<meta charset="utf-8">
<style>
@font-face {
font-family: 'Octicons';
src: url(fonts/octicons/octicons.ttf);
}
h1 {
font-family: Octicons;
}
</style>
</head>
<h1></h1>

12
tests/ref/octicons_ref.html Normal file
View file

@ -0,0 +1,12 @@
<!DOCTYPE html>
<head>
<meta charset="utf-8">
<style>
h1 {
font-family: Octiconz;
}
</style>
</head>
<h1></h1>