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

Update webrender to 923ee495bd9b0fda8a4a94c5a6cf42e2f0548731.

Browse source
This commit is contained in:
Josh Matthews 2018-10-09 14:41:37 -04:00
parent d13172845c
commit 171469c27c
14 changed files with 128 additions and 120 deletions
Download patch file Download diff file Expand all files Collapse all files

6
components/gfx/Cargo.toml
View file

@ -48,8 +48,8 @@ ucd = "0.1.1"
[target.'cfg(target_os = "macos")'.dependencies]
byteorder = "1.0"
core-foundation = "0.6"
core-graphics = "0.16"
core-text = "11.0"
core-graphics = "0.17"
core-text = "13.0"
[target.'cfg(any(target_os = "linux", target_os = "android"))'.dependencies]
freetype = "0.4"
@ -62,5 +62,5 @@ servo-fontconfig = "0.2.1"
xml5ever = {version = "0.12"}
[target.'cfg(target_os = "windows")'.dependencies]
dwrote = "0.4"
dwrote = "0.5"
truetype = "0.26"

22
components/gfx/platform/macos/font.rs
View file

@ -235,9 +235,11 @@ impl FontHandleMethods for FontHandle {
let mut glyphs: [CGGlyph; 1] = [0 as CGGlyph];
let count: CFIndex = 1;
let result = self
.ctfont
.get_glyphs_for_characters(&characters[0], &mut glyphs[0], count);
let result = unsafe {
self
.ctfont
.get_glyphs_for_characters(&characters[0], &mut glyphs[0], count)
};
if !result {
// No glyph for this character
@ -263,12 +265,14 @@ impl FontHandleMethods for FontHandle {
fn glyph_h_advance(&self, glyph: GlyphId) -> Option<FractionalPixel> {
let glyphs = [glyph as CGGlyph];
let advance = self.ctfont.get_advances_for_glyphs(
kCTFontDefaultOrientation,
&glyphs[0],
ptr::null_mut(),
1,
);
let advance = unsafe {
self.ctfont.get_advances_for_glyphs(
kCTFontDefaultOrientation,
&glyphs[0],
ptr::null_mut(),
1,
)
};
Some(advance as FractionalPixel)
}

7
components/gfx/platform/macos/font_list.rs
View file

@ -24,9 +24,10 @@ where
let family_collection = core_text::font_collection::create_for_family(family_name);
if let Some(family_collection) = family_collection {
let family_descriptors = family_collection.get_descriptors();
for family_descriptor in family_descriptors.iter() {
callback(family_descriptor.font_name());
if let Some(family_descriptors) = family_collection.get_descriptors() {
for family_descriptor in family_descriptors.iter() {
callback(family_descriptor.font_name());
}
}
}
}