Auto merge of #2299 - faern:upgrade-core-foundation, r=jrmuizel

Upgrade core foundation

This is a PR in a series of PRs originating at servo/core-foundation-rs#132

The plan is to make a breaking change to `core-foundation` and release it as `0.5.0`. Hopefully we can manage to bring Servo and its entire dependency tree up to date as rapidly as possible in combination with this, as to use only the new core-foundation in Servo and all its deps. :)

TODO before merge:
- [x] Merge `core-foundation`, `core-graphics`, `core-text`, `servo-glutin` PRs and publish.
- [x] Merge `font-loader` PR and publish.
- [x] Remove the last commit from this PR, so we depend on code from crates.io.
- [x] Update Cargo.lock again, to not contain urls to temporary feature branhces.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/webrender/2299)
<!-- Reviewable:end -->

Author: bors-servo

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "webrender"
-version = "0.56.1"
+version = "0.57.0"
 authors = ["Glenn Watson <[email protected]>"]
 license = "MPL-2.0"
 repository = "https://github.com/servo/webrender"
@@ -42,7 +42,7 @@ ron = { optional = true, version = "0.1.7" }
 angle = {git = "https://github.com/servo/angle", branch = "servo"}
 env_logger = "0.4"
 rand = "0.3"                # for the benchmarks
-servo-glutin = "0.13"     # for the example apps
+servo-glutin = "0.14"     # for the example apps
 
 [target.'cfg(any(target_os = "android", all(unix, not(target_os = "macos"))))'.dependencies]
 freetype = { version = "0.3", default-features = false }
@@ -51,6 +51,6 @@ freetype = { version = "0.3", default-features = false }
 dwrote = "0.4.1"
 
 [target.'cfg(target_os = "macos")'.dependencies]
-core-foundation = "0.4.6"
-core-graphics = "0.12.3"
-core-text = { version = "8.0", default-features = false }
+core-foundation = "0.5"
+core-graphics = "0.13"
+core-text = { version = "9.0", default-features = false }

webrender/Cargo.toml

@@ -8,7 +8,7 @@ use api::{GlyphKey, SubpixelDirection};
 use app_units::Au;
 use core_foundation::array::{CFArray, CFArrayRef};
 use core_foundation::base::TCFType;
-use core_foundation::dictionary::{CFDictionary, CFDictionaryRef};
+use core_foundation::dictionary::CFDictionary;
 use core_foundation::number::{CFNumber, CFNumberRef};
 use core_foundation::string::{CFString, CFStringRef};
 use core_graphics::base::{kCGImageAlphaNoneSkipFirst, kCGImageAlphaPremultipliedFirst};
@@ -171,17 +171,16 @@ fn new_ct_font_with_variations(cg_font: &CGFont, size: f64, variations: &[FontVa
         if axes_ref.is_null() {
             return ct_font;
         }
-        let axes: CFArray = TCFType::wrap_under_create_rule(axes_ref);
+        let axes: CFArray<CFDictionary> = TCFType::wrap_under_create_rule(axes_ref);
         let mut vals: Vec<(CFString, CFNumber)> = Vec::with_capacity(variations.len() as usize);
-        for axis_ptr in axes.iter() {
-            let axis: CFDictionary = TCFType::wrap_under_get_rule(axis_ptr as CFDictionaryRef);
-            if !axis.instance_of::<CFDictionaryRef, CFDictionary>() {
+        for axis in axes.iter() {
+            if !axis.instance_of::<CFDictionary>() {
                 return ct_font;
             }
             let tag_val = match axis.find(kCTFontVariationAxisIdentifierKey as *const _) {
                 Some(tag_ptr) => {
                     let tag: CFNumber = TCFType::wrap_under_get_rule(tag_ptr as CFNumberRef);
-                    if !tag.instance_of::<CFNumberRef, CFNumber>() {
+                    if !tag.instance_of::<CFNumber>() {
                         return ct_font;
                     }
                     match tag.to_i64() {
@@ -200,14 +199,14 @@ fn new_ct_font_with_variations(cg_font: &CGFont, size: f64, variations: &[FontVa
                 Some(name_ptr) => TCFType::wrap_under_get_rule(name_ptr as CFStringRef),
                 None => return ct_font,
             };
-            if !name.instance_of::<CFStringRef, CFString>() {
+            if !name.instance_of::<CFString>() {
                 return ct_font;
             }
 
             let min_val = match axis.find(kCTFontVariationAxisMinimumValueKey as *const _) {
                 Some(min_ptr) => {
                     let min: CFNumber = TCFType::wrap_under_get_rule(min_ptr as CFNumberRef);
-                    if !min.instance_of::<CFNumberRef, CFNumber>() {
+                    if !min.instance_of::<CFNumber>() {
                         return ct_font;
                     }
                     match min.to_f64() {
@@ -220,7 +219,7 @@ fn new_ct_font_with_variations(cg_font: &CGFont, size: f64, variations: &[FontVa
             let max_val = match axis.find(kCTFontVariationAxisMaximumValueKey as *const _) {
                 Some(max_ptr) => {
                     let max: CFNumber = TCFType::wrap_under_get_rule(max_ptr as CFNumberRef);
-                    if !max.instance_of::<CFNumberRef, CFNumber>() {
+                    if !max.instance_of::<CFNumber>() {
                         return ct_font;
                     }
                     match max.to_f64() {
@@ -233,7 +232,7 @@ fn new_ct_font_with_variations(cg_font: &CGFont, size: f64, variations: &[FontVa
             let def_val = match axis.find(kCTFontVariationAxisDefaultValueKey as *const _) {
                 Some(def_ptr) => {
                     let def: CFNumber = TCFType::wrap_under_get_rule(def_ptr as CFNumberRef);
-                    if !def.instance_of::<CFNumberRef, CFNumber>() {
+                    if !def.instance_of::<CFNumber>() {
                         return ct_font;
                     }
                     match def.to_f64() {

webrender/src/platform/macos/font.rs

@@ -1,6 +1,6 @@
 [package]
 name = "webrender_api"
-version = "0.56.1"
+version = "0.57.0"
 authors = ["Glenn Watson <[email protected]>"]
 license = "MPL-2.0"
 repository = "https://github.com/servo/webrender"
@@ -22,8 +22,8 @@ serde_derive = { version = "=1.0.27", features = ["deserialize_in_place"] }
 time = "0.1"
 
 [target.'cfg(target_os = "macos")'.dependencies]
-core-foundation = "0.4.6"
-core-graphics = "0.12.3"
+core-foundation = "0.5"
+core-graphics = "0.13"
 
 [target.'cfg(target_os = "windows")'.dependencies]
 dwrote = "0.4.1"

webrender_api/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "wrench"
-version = "0.2.6"
+version = "0.3.0"
 authors = ["Vladimir Vukicevic <[email protected]>"]
 build = "build.rs"
 license = "MPL-2.0"
@@ -12,7 +12,7 @@ byteorder = "1.0"
 env_logger = { version = "0.4", optional = true }
 euclid = "0.16"
 gleam = "0.4"
-servo-glutin = "0.13"
+servo-glutin = "0.14"
 app_units = "0.6"
 image = "0.17"
 clap = { version = "2", features = ["yaml"] }
@@ -30,8 +30,8 @@ webrender_api = {path = "../webrender_api", features=["debug-serialization"]}
 serde = {version = "1.0", features = ["derive"] }
 
 [target.'cfg(target_os = "macos")'.dependencies]
-core-graphics = "0.12.4"
-core-foundation = "0.4"
+core-graphics = "0.13"
+core-foundation = "0.5"
 
 [features]
 headless = [ "osmesa-sys", "osmesa-src" ]
@@ -41,4 +41,4 @@ logging = [ "env_logger" ]
 dwrote = "0.4.1"
 
 [target.'cfg(any(target_os = "linux", target_os = "macos"))'.dependencies]
-font-loader = "0.5"
+font-loader = "0.6"

wrench/Cargo.toml

@@ -58,7 +58,8 @@ pub fn font_to_data(font: CGFont) -> Result<Vec<u8>, std::io::Error> {
     let mut offset: u32 = 0;
     offset += 4 * 3;
     offset += 4 * 4 * (count as u32);
-    for tag in tags.iter() {
+    for tag_ref in tags.iter() {
+        let tag = *tag_ref;
         if tag == CFF_TAG {
             cff = true;
         }