servo: Merge #16551 - Update WR (improved double border quality, minor API changes) (from glennw:update-wr-mostly-borders); r=jdm

Source-Repo: https://github.com/servo/servo
Source-Revision: 0f6c883658930006994b2738f059d050c037ffb9

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 5a2b967824253fe8b67619ee1e323b5d2dac7e4f

servo/Cargo.lock

@@ -3168,7 +3168,7 @@ dependencies = [
 [[package]]
 name = "webrender"
 version = "0.35.0"
-source = "git+https://github.com/servo/webrender#04eeee4593c11a0d9c934722896c67aa5ddd9554"
+source = "git+https://github.com/servo/webrender#861fb7b5570d69de37d8a1f364f42f38c87cb2d3"
 dependencies = [
  "app_units 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "bincode 1.0.0-alpha6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3196,10 +3196,11 @@ dependencies = [
 [[package]]
 name = "webrender_traits"
 version = "0.35.0"
-source = "git+https://github.com/servo/webrender#04eeee4593c11a0d9c934722896c67aa5ddd9554"
+source = "git+https://github.com/servo/webrender#861fb7b5570d69de37d8a1f364f42f38c87cb2d3"
 dependencies = [
  "app_units 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "byteorder 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "core-foundation 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "core-graphics 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "dwrote 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "euclid 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",

servo/components/gfx/platform/macos/font_template.rs

@@ -18,6 +18,7 @@ use std::fs::File;
 use std::io::{Read, Error as IoError};
 use std::ops::Deref;
 use std::sync::Mutex;
+use webrender_traits::NativeFontHandle;
 
 /// Platform specific font representation for mac.
 /// The identifier is a PostScript font name. The
@@ -106,8 +107,8 @@ impl FontTemplateData {
     }
 
     /// Returns the native font that underlies this font template, if applicable.
-    pub fn native_font(&self) -> Option<CGFont> {
-        self.ctfont(0.0).map(|ctfont| ctfont.copy_to_CGFont())
+    pub fn native_font(&self) -> Option<NativeFontHandle> {
+        self.ctfont(0.0).map(|ctfont| NativeFontHandle(ctfont.copy_to_CGFont()))
     }
 }
 

servo/components/layout/webrender_helpers.rs

@@ -258,10 +258,12 @@ impl WebRenderDisplayItemConverter for DisplayItem {
                         };
                         if !slice.glyphs.is_whitespace() {
                             let glyph_offset = glyph.offset().unwrap_or(Point2D::zero());
+                            let x = (origin.x + glyph_offset.x).to_f32_px();
+                            let y = (origin.y + glyph_offset.y).to_f32_px();
+                            let point = webrender_traits::LayoutPoint::new(x, y);
                             let glyph = webrender_traits::GlyphInstance {
                                 index: glyph.id(),
-                                point: Point2D::new((origin.x + glyph_offset.x).to_f32_px(),
-                                                    (origin.y + glyph_offset.y).to_f32_px()),
+                                point: point,
                             };
                             glyphs.push(glyph);
                         }