Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 03:15:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

servo: Add rust-core-graphics submodule; Import CoreGraphics bindings from

Browse Source 
that module, not rust-cocoa.

Source-Repo: https://github.com/servo/servo
Source-Revision: 9971c4d6e008d694f27f46db441b5b41662fe6d4
This commit is contained in:
Brian J. Burg 2012-10-19 12:50:49 -07:00
parent f275d70c5f
commit 261f07319d
3 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
servo/configure vendored
View File

@ -348,7 +348,7 @@ CFG_SUBMODULES="libwapcaplet rust-wapcaplet rust-harfbuzz rust-opengles rust-azu
if [ $CFG_OSTYPE = "darwin" ]
then
CFG_SUBMODULES="rust-cocoa rust-io-surface rust-core-foundation ${CFG_SUBMODULES}"
CFG_SUBMODULES="rust-cocoa rust-io-surface rust-core-foundation rust-core-graphics ${CFG_SUBMODULES}"
fi
# needed because Spidermonkey configure is in non-standard location

12
servo/mk/sub.mk
View File

@ -5,14 +5,14 @@ DEPS_rust-glut += \
rust-opengles
DEPS_rust-layers += \
rust-azure \
rust-geom \
rust-opengles \
rust-glut \
rust-azure
rust-opengles
DEPS_sharegl += \
rust-opengles \
rust-geom
rust-geom \
rust-opengles
DEPS_servo-sandbox += \
libhubbub \
@ -44,11 +44,11 @@ DEPS_libcss += \
# Platform-specific dependencies
ifeq ($(CFG_OSTYPE),darwin)
DEPS_rust-azure += \
rust-cocoa \
rust-core-graphics \
rust-core-foundation
DEPS_rust-layers += \
rust-cocoa
rust-core-graphics
DEPS_rust-io-surface += \
rust-core-foundation

13
servo/src/servo/text/native_font/quartz_native_font.rs
View File

@ -1,4 +1,4 @@
extern mod cocoa;
extern mod core_graphics;
export QuartzNativeFont, with_test_native_font, create;
@ -8,15 +8,16 @@ use au = gfx::geometry;
use libc::size_t;
use ptr::null;
use glyph::GlyphIndex;
use cocoa::cg::{
use cg = core_graphics;
use cg::data_provider::{
CGDataProviderRef,
CGFontRef
};
use cocoa::cg::cg::{
CGDataProviderCreateWithData,
CGDataProviderRelease,
};
use cg::font::{
CGFontRef,
CGFontCreateWithDataProvider,
CGFontRelease
CGFontRelease,
};
use cast::transmute;
use coretext::CTFontRef;