Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sync changes from mozilla-central #3815

Merged
merged 3 commits into from Dec 17, 2019
Merged
Changes from 1 commit
Commits
File filter...
Filter file types
Jump to…
Jump to file
Failed to load files.

Always

Just for now

Prev

Backed out changeset bf28a7e8a8a4 (bug 1600470) for wrench bustages o…

  • Loading branch information
Oana Pop Rus authored and moz-gfx committed Dec 17, 2019
commit f541b78226a654573b9428cad9f61b2a4735586b
@@ -106,7 +106,7 @@ ft_dyn_fn!(FT_Done_MM_Var(library: FT_Library, desc: *mut FT_MM_Var) -> FT_Error
ft_dyn_fn!(FT_Set_Var_Design_Coordinates(face: FT_Face, num_vals: FT_UInt, vals: *mut FT_Fixed) -> FT_Error);

extern "C" {
fn mozilla_GlyphSlot_Embolden_Less(slot: FT_GlyphSlot);
fn FT_GlyphSlot_Embolden(slot: FT_GlyphSlot);
}

enum FontFile {
@@ -495,7 +495,7 @@ impl FontContext {
assert!(slot != ptr::null_mut());

if font.flags.contains(FontInstanceFlags::SYNTHETIC_BOLD) {
unsafe { mozilla_GlyphSlot_Embolden_Less(slot) };
unsafe { FT_GlyphSlot_Embolden(slot) };
}

let format = unsafe { (*slot).format };
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.