mirror of
https://github.com/servo/servo.git
synced 2025-08-06 06:00:15 +01:00
Add rust-core-graphics submodule; Import CoreGraphics bindings from
that module, not rust-cocoa.
This commit is contained in:
parent
9e521bc122
commit
9971c4d6e0
8 changed files with 21 additions and 17 deletions
4
.gitmodules
vendored
4
.gitmodules
vendored
|
@ -58,10 +58,12 @@
|
|||
[submodule "src/libcss"]
|
||||
path = src/libcss
|
||||
url = git://github.com/pcwalton/libcss.git
|
||||
|
||||
[submodule "src/rust-netsurfcss"]
|
||||
path = src/rust-netsurfcss
|
||||
url = git://github.com/mozilla-servo/rust-netsurfcss.git
|
||||
[submodule "src/rust-wapcaplet"]
|
||||
path = src/rust-wapcaplet
|
||||
url = git://github.com/mozilla-servo/rust-wapcaplet.git
|
||||
[submodule "src/rust-core-graphics"]
|
||||
path = src/rust-core-graphics
|
||||
url = git://github.com/mozilla-servo/rust-core-graphics.git
|
||||
|
|
2
configure
vendored
2
configure
vendored
|
@ -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
mk/sub.mk
12
mk/sub.mk
|
@ -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
|
||||
|
|
|
@ -1 +1 @@
|
|||
Subproject commit 008961b96fb3ee009fcbfba43feaefe5f9f8cbf2
|
||||
Subproject commit 702a173e7b2f0fa61a47205bd79da30d5522bfa8
|
|
@ -1 +1 @@
|
|||
Subproject commit 7dff0d5d6dc40e53989f0db94df74be79bda91c9
|
||||
Subproject commit 0503ea12c3bfa33a829b9c9c309fac471663e185
|
1
src/rust-core-graphics
Submodule
1
src/rust-core-graphics
Submodule
|
@ -0,0 +1 @@
|
|||
Subproject commit 6291af5e127bcaf527d689e8a93183c3288e1efe
|
|
@ -1 +1 @@
|
|||
Subproject commit 90a617d9139b505b0fb03838a62a41887d658904
|
||||
Subproject commit b178de413ad288ba47160a4691cd8a32eddd359c
|
|
@ -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;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue