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

Merge pull request #2738 from glennw/azure-update

Browse source 
Update submodule pointer and code to match interface change.
This commit is contained in:
Jack Moffitt 2014-06-30 21:20:44 -06:00
commit 657b291919
2 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/components/gfx/font.rs
View file

@ -27,6 +27,10 @@ use text::glyph::{CharIndex, GlyphStore, GlyphId};
use text::shaping::ShaperMethods; use text::shaping::ShaperMethods;
use text::{Shaper, TextRun}; use text::{Shaper, TextRun};
#[cfg(target_os="linux")]
#[cfg(target_os="android")]
use azure::scaled_font::NativeFont;
// FontHandle encapsulates access to the platform's font API, // FontHandle encapsulates access to the platform's font API,
// e.g. quartz, FreeType. It provides access to metrics and tables // e.g. quartz, FreeType. It provides access to metrics and tables
// needed by the text shaper as well as access to the underlying font // needed by the text shaper as well as access to the underlying font
@ -305,7 +309,7 @@ impl<'a> Font {
fn create_azure_font(&self) -> ScaledFont { fn create_azure_font(&self) -> ScaledFont {
let freetype_font = self.handle.face; let freetype_font = self.handle.face;
let size = self.style.pt_size as AzFloat; let size = self.style.pt_size as AzFloat;
ScaledFont::new(self.backend, freetype_font, size) ScaledFont::new(self.backend, NativeFont(freetype_font), size)
} }
} }

2
src/support/azure/rust-azure

@ -1 +1 @@
Subproject commit 2d00be47103f654c4fe30a806ac358abe9754d3a Subproject commit 9c71deb6575c1cf6664b19b415705af6c5f9b56f