зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1716518 - Upgrade core-graphics-related crates.. r=jrmuizel
core-graphics to v0.22.2 core-graphics-types to v0.1.1 core-foundation to v0.9.1 core-test to v19.2.0 Differential Revision: https://phabricator.services.mozilla.com/D117775
This commit is contained in:
Mike Hommey
Родитель
a0166dabd8
Коммит
1d7a7231cd
|
|
@ -686,9 +686,9 @@ checksum = "a2df960f5d869b2dd8532793fde43eb5427cceb126c929747a26823ab0eeb536"
|
|||
|
||||
[[package]]
|
||||
name = "core-foundation"
|
||||
version = "0.9.0"
|
||||
version = "0.9.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3b5ed8e7e76c45974e15e41bfa8d5b0483cd90191639e01d8f5f1e606299d3fb"
|
||||
checksum = "0a89e2ae426ea83155dccf10c0fa6b1463ef6d5fcb44cee0b224a408fa640a62"
|
||||
dependencies = [
|
||||
"core-foundation-sys",
|
||||
"libc",
|
||||
|
|
@ -702,9 +702,9 @@ checksum = "ea221b5284a47e40033bf9b66f35f984ec0ea2931eb03505246cd27a963f981b"
|
|||
|
||||
[[package]]
|
||||
name = "core-graphics"
|
||||
version = "0.22.0"
|
||||
version = "0.22.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f6082396a349fa49674ba1bda4077332a18bf150e8fa75745ece07085e29a113"
|
||||
checksum = "269f35f69b542b80e736a20a89a05215c0ce80c2c03c514abb2e318b78379d86"
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
"core-foundation",
|
||||
|
|
@ -715,9 +715,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "core-graphics-types"
|
||||
version = "0.1.0"
|
||||
version = "0.1.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e92f5d519093a4178296707dbaa3880eae85a5ef5386675f361a1cf25376e93c"
|
||||
checksum = "3a68b68b3446082644c91ac778bf50cd4104bfb002b5a6a7c44cca5a2c70788b"
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
"core-foundation",
|
||||
|
|
@ -727,9 +727,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "core-text"
|
||||
version = "19.0.0"
|
||||
version = "19.2.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "04dfae50af11e72657fe7174cddb1ecddc5398037f7f6f39533ad69207c9a4e2"
|
||||
checksum = "99d74ada66e07c1cefa18f8abfba765b486f250de2e4a999e5727fc0dd4b4a25"
|
||||
dependencies = [
|
||||
"core-foundation",
|
||||
"core-graphics",
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
{"files":{"Cargo.toml":"d6974076ca199bc2da1dfe5dee3735fdc1c50344af7fbe53ce9c9b4ccdb30b73","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"62065228e42caebca7e7d7db1204cbb867033de5982ca4009928915e4095f3a3","src/array.rs":"221e81de15d95ca453df39466ba65faf879f2923202145958dfcebe63bfef97f","src/attributed_string.rs":"c04c5a3c912b6ab58d3081fa5dfa8fda07957b26396ebc907bba5ad07dc1087d","src/base.rs":"9ed46d59afdb22ecc65504ccd77f1c98108ea0ff96fad568dadb7ed49fde588c","src/boolean.rs":"f5b4d295aaf6cc3681212afebeae2974c5d551125badcc066e6089ac0d2a0873","src/bundle.rs":"7c26060c6ca64347b96800498e663d622f8dc1aa551a2f18cffa258cd27272a0","src/characterset.rs":"a3ffb46c5463c99813eebfc177a65794f44a1b9343534e28bbccd262034714c2","src/data.rs":"a1d7e6430c745731fc7b2aee49af9f14e79c8a288951c82ea6507689a3356af8","src/date.rs":"a02f6cca7b6e8fbabc7713177429012658dba5146556e14a08e7baaf81958d83","src/dictionary.rs":"ed8080eb00507e342521fb2c513a83c5706e883c3f8d67d8f38e9a0ed685c7eb","src/error.rs":"22c21087d9c2c103d1bcb2c4af33b684317bbda5d4747902e510d410f8c1a14b","src/filedescriptor.rs":"6c2087a8e101bfb31a6b916759a69a82852b18b2174c818f6ec9211ccdcaf1e6","src/lib.rs":"867b9b5acbc8dcf1d9f61a936cec5c26762a0af444fa83cafdf9f3ab1ee979eb","src/number.rs":"5a6cc9036c156e7e9d787864dd671087677abf4175cd840cbf123ccd89abcafe","src/propertylist.rs":"9f182135d9eb21421673280112d5676051bf7f1c2548c6da1ff879ea0bfb4704","src/runloop.rs":"048772c566cf3a1ec3e478958293aa9f3af38ff40b71ab7695f86b61d12f2023","src/set.rs":"da75b31f894bd04c0518211e113ca21a2781cd6ac71018104eeb354dd2f1a19e","src/string.rs":"bea7f3fd2528377442d1bebfeacf7e905d879320ae662fe6a8ef917b6a8e9c36","src/timezone.rs":"6dcf188db76303292b519d6283b71b71c7b3d6ed1afddc28de16d727075f5ef1","src/url.rs":"c544725399d3fbc4de54fd9d1c987e02f81760effd08c5c64c8deacd11478950","src/uuid.rs":"c3457e43fc22ba0f3fcab3ee8108500585ba005dbcbfa7edad0d389701ddf379","tests/use_macro_outside_crate.rs":"ed5e74ac9e988f2609c0b785189f1e6368d693f6401603ad065521f3ab51df94"},"package":"3b5ed8e7e76c45974e15e41bfa8d5b0483cd90191639e01d8f5f1e606299d3fb"}
|
||||
{"files":{"Cargo.toml":"0ddd9a3c5e8b40befdd1dd5efdfc95cacff3d244ed472e413c19fc61c2e17697","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"62065228e42caebca7e7d7db1204cbb867033de5982ca4009928915e4095f3a3","src/array.rs":"221e81de15d95ca453df39466ba65faf879f2923202145958dfcebe63bfef97f","src/attributed_string.rs":"c04c5a3c912b6ab58d3081fa5dfa8fda07957b26396ebc907bba5ad07dc1087d","src/base.rs":"9ed46d59afdb22ecc65504ccd77f1c98108ea0ff96fad568dadb7ed49fde588c","src/boolean.rs":"f5b4d295aaf6cc3681212afebeae2974c5d551125badcc066e6089ac0d2a0873","src/bundle.rs":"7c26060c6ca64347b96800498e663d622f8dc1aa551a2f18cffa258cd27272a0","src/characterset.rs":"a3ffb46c5463c99813eebfc177a65794f44a1b9343534e28bbccd262034714c2","src/data.rs":"a1d7e6430c745731fc7b2aee49af9f14e79c8a288951c82ea6507689a3356af8","src/date.rs":"a02f6cca7b6e8fbabc7713177429012658dba5146556e14a08e7baaf81958d83","src/dictionary.rs":"ed8080eb00507e342521fb2c513a83c5706e883c3f8d67d8f38e9a0ed685c7eb","src/error.rs":"22c21087d9c2c103d1bcb2c4af33b684317bbda5d4747902e510d410f8c1a14b","src/filedescriptor.rs":"6c2087a8e101bfb31a6b916759a69a82852b18b2174c818f6ec9211ccdcaf1e6","src/lib.rs":"867b9b5acbc8dcf1d9f61a936cec5c26762a0af444fa83cafdf9f3ab1ee979eb","src/number.rs":"5a6cc9036c156e7e9d787864dd671087677abf4175cd840cbf123ccd89abcafe","src/propertylist.rs":"9f182135d9eb21421673280112d5676051bf7f1c2548c6da1ff879ea0bfb4704","src/runloop.rs":"048772c566cf3a1ec3e478958293aa9f3af38ff40b71ab7695f86b61d12f2023","src/set.rs":"da75b31f894bd04c0518211e113ca21a2781cd6ac71018104eeb354dd2f1a19e","src/string.rs":"bea7f3fd2528377442d1bebfeacf7e905d879320ae662fe6a8ef917b6a8e9c36","src/timezone.rs":"6dcf188db76303292b519d6283b71b71c7b3d6ed1afddc28de16d727075f5ef1","src/url.rs":"c544725399d3fbc4de54fd9d1c987e02f81760effd08c5c64c8deacd11478950","src/uuid.rs":"c3457e43fc22ba0f3fcab3ee8108500585ba005dbcbfa7edad0d389701ddf379","tests/use_macro_outside_crate.rs":"ed5e74ac9e988f2609c0b785189f1e6368d693f6401603ad065521f3ab51df94"},"package":"0a89e2ae426ea83155dccf10c0fa6b1463ef6d5fcb44cee0b224a408fa640a62"}
|
||||
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
[package]
|
||||
name = "core-foundation"
|
||||
version = "0.9.0"
|
||||
version = "0.9.1"
|
||||
authors = ["The Servo Project Developers"]
|
||||
description = "Bindings to Core Foundation for macOS"
|
||||
homepage = "https://github.com/servo/core-foundation-rs"
|
||||
|
|
@ -20,6 +20,8 @@ keywords = ["macos", "framework", "objc"]
|
|||
categories = ["os::macos-apis"]
|
||||
license = "MIT / Apache-2.0"
|
||||
repository = "https://github.com/servo/core-foundation-rs"
|
||||
[package.metadata.docs.rs]
|
||||
default-target = "x86_64-apple-darwin"
|
||||
[dependencies.chrono]
|
||||
version = "0.4"
|
||||
optional = true
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
{"files":{"Cargo.toml":"99ebaa23c8f85f471729708a6405b546932314a1033f0a9bcc89893489b3305f","src/base.rs":"3764010f0c416db49be8a9e191fffb6848e8287edbdd5b12972613e301720ded","src/geometry.rs":"b94e50a16b8540dc6f37bfe4b1549ac68974cd6ba6c0bbd9209559f8a46d86eb","src/lib.rs":"31700ac9508fd32005bafd1c12a86a6803d198e9b1a71166a7391e642c091cd1"},"package":"e92f5d519093a4178296707dbaa3880eae85a5ef5386675f361a1cf25376e93c"}
|
||||
{"files":{"Cargo.toml":"e2e38d84cf514ad088ebc1909123ef4f707db6855528f938eb57d1e06c5a23ef","src/base.rs":"3764010f0c416db49be8a9e191fffb6848e8287edbdd5b12972613e301720ded","src/geometry.rs":"b94e50a16b8540dc6f37bfe4b1549ac68974cd6ba6c0bbd9209559f8a46d86eb","src/lib.rs":"31700ac9508fd32005bafd1c12a86a6803d198e9b1a71166a7391e642c091cd1"},"package":"3a68b68b3446082644c91ac778bf50cd4104bfb002b5a6a7c44cca5a2c70788b"}
|
||||
|
|
@ -12,12 +12,14 @@
|
|||
|
||||
[package]
|
||||
name = "core-graphics-types"
|
||||
version = "0.1.0"
|
||||
version = "0.1.1"
|
||||
authors = ["The Servo Project Developers"]
|
||||
description = "Bindings for some fundamental Core Graphics types"
|
||||
homepage = "https://github.com/servo/core-foundation-rs"
|
||||
license = "MIT / Apache-2.0"
|
||||
repository = "https://github.com/servo/core-foundation-rs"
|
||||
[package.metadata.docs.rs]
|
||||
default-target = "x86_64-apple-darwin"
|
||||
[dependencies.bitflags]
|
||||
version = "1.0"
|
||||
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
{"files":{"COPYRIGHT":"ec82b96487e9e778ee610c7ab245162464782cfa1f555c2299333f8dbe5c036a","Cargo.toml":"8ae209cd9a5905900c64dd3ec6cae30b2a4877804c2cb0a45452b03a8daa65ee","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"62065228e42caebca7e7d7db1204cbb867033de5982ca4009928915e4095f3a3","README.md":"6745c3c38183d2eda9b1fa265fb0a95018db5c110cbabc00b32327d951bbe2ea","src/base.rs":"838683ff67253f4aff1d4b4177531210ca73d4e61f05c5d96a8f196b2a88c787","src/color.rs":"4c8ec4ab828cbc1b2a1538a34a51f5b380927f2f1daf187dff6f732f57a43656","src/color_space.rs":"b3d7ee8a21703c789160867cb8eb2188bd1daa193e3d030f21adb6f1a6f872de","src/context.rs":"8bda7f9ecb5be768b09a29cc3b0a4f329f55d2a2ab74030d121610283862d833","src/data_provider.rs":"9badc70bdd1bdb18f6ba4a25fdfc56ab11c5747751b5473987d29898e5efe6fb","src/display.rs":"cc691712c3d27342ae97f04df6032d6f682570239ba51936fcc796c61bf08c8b","src/event.rs":"84d6035ab155e702be056f4f37d0cbb76ccfa8fb9277fcbfb42c7953d0cd3937","src/event_source.rs":"d55a4f5b5e62789325028febc51bbf54c74b15ab1a4e70c6ad749a2f9753e081","src/font.rs":"cfff63d8f07d8fe497fdef258163c1bf7b3755b845fffb8e3c99a5cb45986fc8","src/geometry.rs":"8e12dc89835406bfa514de8fb58f5fd435724d1ddb97dc3a70392efbcf1c42ed","src/gradient.rs":"8ee8661706f36914d08e903840c4f07414b38ba40ea4a482d34b900ac6ac7cf9","src/image.rs":"a5a5df8c0f310455f038eeb16688015f481688cb417f8e8f424a4c1d2a1cdd57","src/lib.rs":"78264571227db6fc9194cb90d64beaff1738a501f88b5da55eb17ae42592d26f","src/path.rs":"c429afeaed999b02ac00f89a867b5fc64f1e223039079a4e0529306b734ff117","src/private.rs":"da3fd61338bab2d8e26aa5433b2e18ecd2a0a408c62e1ac2b33a0f87f2dad88a","src/sys.rs":"72cd460e499734a9394a8ec57dcb30ea0a15717452ff9fb343f22effa5d6d308","src/window.rs":"2f6c3dc958ae2c0c9e2fc5033300b96e60ed0abee9823ea1f03797d64df0911a"},"package":"f6082396a349fa49674ba1bda4077332a18bf150e8fa75745ece07085e29a113"}
|
||||
{"files":{"COPYRIGHT":"ec82b96487e9e778ee610c7ab245162464782cfa1f555c2299333f8dbe5c036a","Cargo.toml":"4f4c058a2b1b415d2b94911d133a72e9046b0dc397ccb6bcdc07d8633557fe2d","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"62065228e42caebca7e7d7db1204cbb867033de5982ca4009928915e4095f3a3","README.md":"6745c3c38183d2eda9b1fa265fb0a95018db5c110cbabc00b32327d951bbe2ea","src/base.rs":"838683ff67253f4aff1d4b4177531210ca73d4e61f05c5d96a8f196b2a88c787","src/color.rs":"4c8ec4ab828cbc1b2a1538a34a51f5b380927f2f1daf187dff6f732f57a43656","src/color_space.rs":"b3d7ee8a21703c789160867cb8eb2188bd1daa193e3d030f21adb6f1a6f872de","src/context.rs":"8bda7f9ecb5be768b09a29cc3b0a4f329f55d2a2ab74030d121610283862d833","src/data_provider.rs":"b25201fdea43ea1a019c68aa5e997725d04d0824a238354ddc9f2dd8a6835cc4","src/display.rs":"cc691712c3d27342ae97f04df6032d6f682570239ba51936fcc796c61bf08c8b","src/event.rs":"84d6035ab155e702be056f4f37d0cbb76ccfa8fb9277fcbfb42c7953d0cd3937","src/event_source.rs":"d55a4f5b5e62789325028febc51bbf54c74b15ab1a4e70c6ad749a2f9753e081","src/font.rs":"cfff63d8f07d8fe497fdef258163c1bf7b3755b845fffb8e3c99a5cb45986fc8","src/geometry.rs":"8e12dc89835406bfa514de8fb58f5fd435724d1ddb97dc3a70392efbcf1c42ed","src/gradient.rs":"8ee8661706f36914d08e903840c4f07414b38ba40ea4a482d34b900ac6ac7cf9","src/image.rs":"a5a5df8c0f310455f038eeb16688015f481688cb417f8e8f424a4c1d2a1cdd57","src/lib.rs":"78264571227db6fc9194cb90d64beaff1738a501f88b5da55eb17ae42592d26f","src/path.rs":"c429afeaed999b02ac00f89a867b5fc64f1e223039079a4e0529306b734ff117","src/private.rs":"da3fd61338bab2d8e26aa5433b2e18ecd2a0a408c62e1ac2b33a0f87f2dad88a","src/sys.rs":"72cd460e499734a9394a8ec57dcb30ea0a15717452ff9fb343f22effa5d6d308","src/window.rs":"2f6c3dc958ae2c0c9e2fc5033300b96e60ed0abee9823ea1f03797d64df0911a"},"package":"269f35f69b542b80e736a20a89a05215c0ce80c2c03c514abb2e318b78379d86"}
|
||||
|
|
@ -12,12 +12,14 @@
|
|||
|
||||
[package]
|
||||
name = "core-graphics"
|
||||
version = "0.22.0"
|
||||
version = "0.22.2"
|
||||
authors = ["The Servo Project Developers"]
|
||||
description = "Bindings to Core Graphics for macOS"
|
||||
homepage = "https://github.com/servo/core-graphics-rs"
|
||||
license = "MIT / Apache-2.0"
|
||||
repository = "https://github.com/servo/core-foundation-rs"
|
||||
[package.metadata.docs.rs]
|
||||
default-target = "x86_64-apple-darwin"
|
||||
[dependencies.bitflags]
|
||||
version = "1.0"
|
||||
|
||||
|
|
|
|||
|
|
@ -60,7 +60,7 @@ impl CGDataProvider {
|
|||
}
|
||||
|
||||
unsafe extern "C" fn release<T>(info: *mut c_void, _: *const c_void, _: size_t) {
|
||||
drop(Arc::from_raw(info))
|
||||
drop(Arc::from_raw(info as *mut T))
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -136,9 +136,10 @@ fn test_data_provider() {
|
|||
let dropped = Arc::new(AtomicBool::default());
|
||||
let l = Arc::new(VecWrapper {inner: vec![5], dropped: dropped.clone() });
|
||||
let m = l.clone();
|
||||
drop(CGDataProvider::from_buffer(l));
|
||||
assert!(!dropped.load(SeqCst));
|
||||
let dp = CGDataProvider::from_buffer(l);
|
||||
drop(m);
|
||||
assert!(!dropped.load(SeqCst));
|
||||
drop(dp);
|
||||
assert!(dropped.load(SeqCst))
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
{"files":{"COPYRIGHT":"ec82b96487e9e778ee610c7ab245162464782cfa1f555c2299333f8dbe5c036a","Cargo.toml":"fd13910a84ac160e2f17a693091bce523f7c88c5f58e923c78a37f7ea17511ce","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"62065228e42caebca7e7d7db1204cbb867033de5982ca4009928915e4095f3a3","README.md":"98d25015857a430aac32f34bdc979a1a66e672a0ea42c5f92dd9cfe23c1fccfd","src/font.rs":"6c260c8e0ba08400b67835cfdfe0f1473bf94e4f385e8c509b48ae95164c3b75","src/font_collection.rs":"02de0ce2a61683314897a521d31ab9cc572a8b10ceda2ac47181fbe18bf4f235","src/font_descriptor.rs":"beba611e282150ff7d7551f858f1b001a0ec0863d708af035532d51ee307f5d0","src/font_manager.rs":"0abebafad90fc1cc74742493c812ec617a44a80969bab64807d6e32ae70033c0","src/frame.rs":"ed1e2aad7be9dafc3e9729f2caecefd4214a9552f834932a414239146142069a","src/framesetter.rs":"13e34b4111cee5f023aa05e2220d2a6f102e96fd18c51a356992bffd6c9fc7c1","src/lib.rs":"74646976f818f56abe5c68d67e7731080e2ca898ffd66f806625b92a8f3dd666","src/line.rs":"02fab7f07c3f6a003a7c35ffeb3d37546ae58e4da7fe05f26e520f283397a602","src/run.rs":"b86e9b9b39effe4a79c6002880d95f214742d448029a3111e288734abe75b827","src/string_attributes.rs":"ea0f854d64097d3626a03002323e2276e28affae7a698aaadd89dd6b744dd80f"},"package":"04dfae50af11e72657fe7174cddb1ecddc5398037f7f6f39533ad69207c9a4e2"}
|
||||
{"files":{"COPYRIGHT":"ec82b96487e9e778ee610c7ab245162464782cfa1f555c2299333f8dbe5c036a","Cargo.toml":"26a527860e530d18a5ce446ffb595f63a178504506fb4a283993402295053afe","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"62065228e42caebca7e7d7db1204cbb867033de5982ca4009928915e4095f3a3","README.md":"98d25015857a430aac32f34bdc979a1a66e672a0ea42c5f92dd9cfe23c1fccfd","src/font.rs":"17d957510eee8d96ef2bc1b5bc97491917ac0336ad3dbf48416dda3685cef579","src/font_collection.rs":"02de0ce2a61683314897a521d31ab9cc572a8b10ceda2ac47181fbe18bf4f235","src/font_descriptor.rs":"43a2fec6bca9689d8172f363ab20ce8c633696974e1653cad2e072e3af776528","src/font_manager.rs":"6e5056a42868187e1f4e696c181ca247423308652d3c68867c708616031876e4","src/frame.rs":"ed1e2aad7be9dafc3e9729f2caecefd4214a9552f834932a414239146142069a","src/framesetter.rs":"13e34b4111cee5f023aa05e2220d2a6f102e96fd18c51a356992bffd6c9fc7c1","src/lib.rs":"1c662e51874eb43ff52a8a1af131d1b2fd84095c3d949a271dc895bf56fd0fc6","src/line.rs":"02fab7f07c3f6a003a7c35ffeb3d37546ae58e4da7fe05f26e520f283397a602","src/run.rs":"b86e9b9b39effe4a79c6002880d95f214742d448029a3111e288734abe75b827","src/string_attributes.rs":"ea0f854d64097d3626a03002323e2276e28affae7a698aaadd89dd6b744dd80f"},"package":"99d74ada66e07c1cefa18f8abfba765b486f250de2e4a999e5727fc0dd4b4a25"}
|
||||
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
[package]
|
||||
name = "core-text"
|
||||
version = "19.0.0"
|
||||
version = "19.2.0"
|
||||
authors = ["The Servo Project Developers"]
|
||||
description = "Bindings to the Core Text framework."
|
||||
license = "MIT/Apache-2.0"
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@
|
|||
use font_descriptor;
|
||||
use font_descriptor::{CTFontDescriptor, CTFontDescriptorRef, CTFontOrientation};
|
||||
use font_descriptor::{CTFontSymbolicTraits, CTFontTraits, SymbolicTraitAccessors, TraitAccessors};
|
||||
use font_manager::create_font_descriptor;
|
||||
|
||||
use core_foundation::array::{CFArray, CFArrayRef};
|
||||
use core_foundation::base::{CFIndex, CFOptionFlags, CFType, CFTypeID, CFTypeRef, TCFType};
|
||||
|
|
@ -124,6 +125,11 @@ pub fn new_from_descriptor(desc: &CTFontDescriptor, pt_size: f64) -> CTFont {
|
|||
}
|
||||
}
|
||||
|
||||
pub fn new_from_buffer(buffer: &[u8]) -> Result<CTFont, ()> {
|
||||
let ct_font_descriptor = create_font_descriptor(buffer)?;
|
||||
Ok(new_from_descriptor(&ct_font_descriptor, 16.0))
|
||||
}
|
||||
|
||||
pub fn new_from_name(name: &str, pt_size: f64) -> Result<CTFont, ()> {
|
||||
unsafe {
|
||||
let name: CFString = name.parse().unwrap();
|
||||
|
|
@ -156,6 +162,13 @@ impl CTFont {
|
|||
}
|
||||
}
|
||||
|
||||
pub fn copy_descriptor(&self) -> CTFontDescriptor {
|
||||
unsafe {
|
||||
let desc = CTFontCopyFontDescriptor(self.0);
|
||||
CTFontDescriptor::wrap_under_create_rule(desc)
|
||||
}
|
||||
}
|
||||
|
||||
pub fn clone_with_font_size(&self, size: f64) -> CTFont {
|
||||
unsafe {
|
||||
let font_ref = CTFontCreateCopyWithAttributes(self.0,
|
||||
|
|
@ -526,7 +539,8 @@ extern {
|
|||
fn CTFontCreateWithFontDescriptor(descriptor: CTFontDescriptorRef, size: CGFloat,
|
||||
matrix: *const CGAffineTransform) -> CTFontRef;
|
||||
//fn CTFontCreateWithFontDescriptorAndOptions
|
||||
//fn CTFontCreateUIFontForLanguage
|
||||
#[cfg(test)]
|
||||
fn CTFontCreateUIFontForLanguage(uiType: CTFontUIFontType, size: CGFloat, language: CFStringRef) -> CTFontRef;
|
||||
fn CTFontCreateCopyWithAttributes(font: CTFontRef, size: CGFloat, matrix: *const CGAffineTransform,
|
||||
attributes: CTFontDescriptorRef) -> CTFontRef;
|
||||
fn CTFontCreateCopyWithSymbolicTraits(font: CTFontRef,
|
||||
|
|
@ -539,7 +553,7 @@ extern {
|
|||
//fn CTFontCreateForString
|
||||
|
||||
/* Getting Font Data */
|
||||
//fn CTFontCopyFontDescriptor(font: CTFontRef) -> CTFontDescriptorRef;
|
||||
fn CTFontCopyFontDescriptor(font: CTFontRef) -> CTFontDescriptorRef;
|
||||
fn CTFontCopyAttribute(font: CTFontRef, attribute: CFStringRef) -> CFTypeRef;
|
||||
fn CTFontGetSize(font: CTFontRef) -> CGFloat;
|
||||
//fn CTFontGetMatrix
|
||||
|
|
@ -632,3 +646,99 @@ extern {
|
|||
fn CTFontGetTypeID() -> CFTypeID;
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn copy_font() {
|
||||
use std::io::Read;
|
||||
let mut f = std::fs::File::open("/System/Library/Fonts/ZapfDingbats.ttf").unwrap();
|
||||
let mut font_data = Vec::new();
|
||||
f.read_to_end(&mut font_data).unwrap();
|
||||
let desc = crate::font_manager::create_font_descriptor(&font_data).unwrap();
|
||||
let font = new_from_descriptor(&desc, 12.);
|
||||
drop(desc);
|
||||
let desc = font.copy_descriptor();
|
||||
drop(font);
|
||||
let font = new_from_descriptor(&desc, 14.);
|
||||
assert_eq!(font.family_name(), "Zapf Dingbats");
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
fn macos_version() -> (i32, i32, i32) {
|
||||
use std::io::Read;
|
||||
|
||||
// This is the same approach that Firefox uses for detecting versions
|
||||
let file = "/System/Library/CoreServices/SystemVersion.plist";
|
||||
let mut f = std::fs::File::open(file).unwrap();
|
||||
let mut system_version_data = Vec::new();
|
||||
f.read_to_end(&mut system_version_data).unwrap();
|
||||
|
||||
use core_foundation::propertylist;
|
||||
let (list, _) = propertylist::create_with_data(core_foundation::data::CFData::from_buffer(&system_version_data), propertylist::kCFPropertyListImmutable).unwrap();
|
||||
let k = unsafe { propertylist::CFPropertyList::wrap_under_create_rule(list) };
|
||||
|
||||
let dict = unsafe { std::mem::transmute::<_, CFDictionary<CFType, CFType>>(k.downcast::<CFDictionary>().unwrap()) };
|
||||
|
||||
let version = dict.find(&CFString::new("ProductVersion").as_CFType())
|
||||
.as_ref().unwrap()
|
||||
.downcast::<CFString>().unwrap()
|
||||
.to_string();
|
||||
|
||||
match version.split(".").map(|x| x.parse().unwrap()).collect::<Vec<_>>()[..] {
|
||||
[a, b, c] => (a, b, c),
|
||||
[a, b] => (a, b, 0),
|
||||
_ => panic!()
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn copy_system_font() {
|
||||
let small = unsafe {
|
||||
CTFont::wrap_under_create_rule(
|
||||
CTFontCreateUIFontForLanguage(kCTFontSystemDetailFontType, 19., std::ptr::null())
|
||||
)
|
||||
};
|
||||
let big = small.clone_with_font_size(20.);
|
||||
|
||||
// ensure that we end up with different fonts for the different sizes before 10.15
|
||||
if macos_version() < (10, 15, 0) {
|
||||
assert_ne!(big.url(), small.url());
|
||||
} else {
|
||||
assert_eq!(big.url(), small.url());
|
||||
}
|
||||
|
||||
let ps = small.postscript_name();
|
||||
let desc = small.copy_descriptor();
|
||||
|
||||
// check that we can construct a new vesion by descriptor
|
||||
let ctfont = new_from_descriptor(&desc, 20.);
|
||||
assert_eq!(big.postscript_name(), ctfont.postscript_name());
|
||||
|
||||
// on newer versions of macos we can't construct by name anymore
|
||||
if macos_version() < (10, 13, 0) {
|
||||
let ui_font_by_name = new_from_name(&small.postscript_name(), 19.).unwrap();
|
||||
assert_eq!(ui_font_by_name.postscript_name(), small.postscript_name());
|
||||
|
||||
let ui_font_by_name = new_from_name(&small.postscript_name(), 20.).unwrap();
|
||||
assert_eq!(ui_font_by_name.postscript_name(), small.postscript_name());
|
||||
|
||||
let ui_font_by_name = new_from_name(&big.postscript_name(), 20.).unwrap();
|
||||
assert_eq!(ui_font_by_name.postscript_name(), big.postscript_name());
|
||||
}
|
||||
|
||||
// but we can still construct the CGFont by name
|
||||
let cgfont = CGFont::from_name(&CFString::new(&ps)).unwrap();
|
||||
let cgfont = new_from_CGFont(&cgfont, 0.);
|
||||
println!("{:?}", cgfont);
|
||||
let desc = cgfont.copy_descriptor();
|
||||
let matching = unsafe { crate::font_descriptor::CTFontDescriptorCreateMatchingFontDescriptor(desc.as_concrete_TypeRef(), std::ptr::null()) };
|
||||
let matching = unsafe { CTFontDescriptor::wrap_under_create_rule(matching) };
|
||||
|
||||
println!("{:?}", cgfont.copy_descriptor());
|
||||
assert!(desc.attributes().find(CFString::from_static_string("NSFontSizeAttribute")).is_some());
|
||||
|
||||
println!("{:?}", matching);
|
||||
println!("{:?}", matching.attributes().find(CFString::from_static_string("NSFontSizeAttribute")));
|
||||
|
||||
assert!(matching.attributes().find(CFString::from_static_string("NSFontSizeAttribute")).is_none());
|
||||
|
||||
assert_eq!(small.postscript_name(), cgfont.postscript_name());
|
||||
}
|
||||
|
|
@ -194,6 +194,10 @@ declare_TCFType! {
|
|||
impl_TCFType!(CTFontDescriptor, CTFontDescriptorRef, CTFontDescriptorGetTypeID);
|
||||
impl_CFTypeDescription!(CTFontDescriptor);
|
||||
|
||||
// "Font objects (CTFont, CTFontDescriptor, and associated objects) can be used
|
||||
// simultaneously by multiple operations, work queues, or threads."
|
||||
unsafe impl Send for CTFontDescriptor {}
|
||||
unsafe impl Sync for CTFontDescriptor {}
|
||||
|
||||
impl CTFontDescriptor {
|
||||
fn get_string_attribute(&self, attribute: CFStringRef) -> Option<String> {
|
||||
|
|
@ -278,6 +282,24 @@ impl CTFontDescriptor {
|
|||
CFDictionary::wrap_under_get_rule(value.as_CFTypeRef() as CFDictionaryRef)
|
||||
}
|
||||
}
|
||||
|
||||
pub fn create_copy_with_attributes(&self, attr: CFDictionary) -> Result<CTFontDescriptor, ()> {
|
||||
unsafe {
|
||||
let desc = CTFontDescriptorCreateCopyWithAttributes(self.as_concrete_TypeRef(),
|
||||
attr.as_concrete_TypeRef());
|
||||
if desc.is_null() {
|
||||
return Err(());
|
||||
}
|
||||
Ok(CTFontDescriptor::wrap_under_create_rule(desc))
|
||||
}
|
||||
}
|
||||
|
||||
pub fn attributes(&self) -> CFDictionary<CFString, CFType> {
|
||||
unsafe {
|
||||
let attrs = CTFontDescriptorCopyAttributes(self.as_concrete_TypeRef());
|
||||
CFDictionary::wrap_under_create_rule(attrs)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub fn new_from_attributes(attributes: &CFDictionary<CFString, CFType>) -> CTFontDescriptor {
|
||||
|
|
|
|||
|
|
@ -11,6 +11,8 @@ use core_foundation::array::{CFArray, CFArrayRef};
|
|||
use core_foundation::base::TCFType;
|
||||
use core_foundation::string::CFString;
|
||||
use core_foundation::url::CFURLRef;
|
||||
use core_foundation::data::{CFDataRef, CFData};
|
||||
use crate::font_descriptor::{CTFontDescriptorRef, CTFontDescriptor};
|
||||
|
||||
pub fn copy_available_font_family_names() -> CFArray<CFString> {
|
||||
unsafe {
|
||||
|
|
@ -18,6 +20,27 @@ pub fn copy_available_font_family_names() -> CFArray<CFString> {
|
|||
}
|
||||
}
|
||||
|
||||
pub fn create_font_descriptor(buffer: &[u8]) -> Result<CTFontDescriptor, ()> {
|
||||
let cf_data = CFData::from_buffer(buffer);
|
||||
unsafe {
|
||||
let ct_font_descriptor_ref = CTFontManagerCreateFontDescriptorFromData(cf_data.as_concrete_TypeRef());
|
||||
if ct_font_descriptor_ref.is_null() {
|
||||
return Err(());
|
||||
}
|
||||
Ok(CTFontDescriptor::wrap_under_create_rule(ct_font_descriptor_ref))
|
||||
}
|
||||
}
|
||||
|
||||
pub fn create_font_descriptor_with_data(data: CFData) -> Result<CTFontDescriptor, ()> {
|
||||
unsafe {
|
||||
let ct_font_descriptor_ref = CTFontManagerCreateFontDescriptorFromData(data.as_concrete_TypeRef());
|
||||
if ct_font_descriptor_ref.is_null() {
|
||||
return Err(());
|
||||
}
|
||||
Ok(CTFontDescriptor::wrap_under_create_rule(ct_font_descriptor_ref))
|
||||
}
|
||||
}
|
||||
|
||||
extern {
|
||||
/*
|
||||
* CTFontManager.h
|
||||
|
|
@ -31,6 +54,7 @@ extern {
|
|||
pub fn CTFontManagerCopyAvailableFontFamilyNames() -> CFArrayRef;
|
||||
pub fn CTFontManagerCopyAvailablePostScriptNames() -> CFArrayRef;
|
||||
pub fn CTFontManagerCreateFontDescriptorsFromURL(fileURL: CFURLRef) -> CFArrayRef;
|
||||
pub fn CTFontManagerCreateFontDescriptorFromData(data: CFDataRef) -> CTFontDescriptorRef;
|
||||
//pub fn CTFontManagerCreateFontRequestRunLoopSource
|
||||
//pub fn CTFontManagerEnableFontDescriptors
|
||||
//pub fn CTFontManagerGetAutoActivationSetting
|
||||
|
|
|
|||
|
|
@ -12,6 +12,11 @@
|
|||
|
||||
#![allow(non_snake_case)]
|
||||
|
||||
/*!
|
||||
Many of these functions will add objects to the autorelease pool.
|
||||
If you don't have one this will cause leaks.
|
||||
*/
|
||||
|
||||
extern crate foreign_types;
|
||||
extern crate libc;
|
||||
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче