Update webrender.

11 files changed, 16 insertions, 28 deletions

diff --git a/Cargo.lock b/Cargo.lock
index ecde48f35a7..f0fe61854da 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -755,7 +755,6 @@ dependencies = [
 name = "compositing"
 version = "0.0.1"
 dependencies = [
- "app_units",
  "canvas",
  "crossbeam-channel",
  "embedder_traits",
@@ -1890,7 +1889,6 @@ dependencies = [
 name = "gfx_traits"
 version = "0.0.1"
 dependencies = [
- "app_units",
  "malloc_size_of",
  "malloc_size_of_derive",
  "range",
@@ -3018,7 +3016,6 @@ dependencies = [
 name = "libservo"
 version = "0.0.1"
 dependencies = [
- "app_units",
  "background_hang_monitor",
  "bluetooth",
  "bluetooth_traits",
@@ -3934,7 +3931,7 @@ dependencies = [
 [[package]]
 name = "peek-poke"
 version = "0.2.0"
-source = "git+https://github.com/servo/webrender#de3999583ab20aad7c57ea35a3e0394ed45be627"
+source = "git+https://github.com/servo/webrender#1175acad2d4f49fa712e105c84149ac7f394261d"
 dependencies = [
  "euclid",
  "peek-poke-derive 0.2.1 (git+https://github.com/servo/webrender)",
@@ -3952,7 +3949,7 @@ dependencies = [
 [[package]]
 name = "peek-poke-derive"
 version = "0.2.1"
-source = "git+https://github.com/servo/webrender#de3999583ab20aad7c57ea35a3e0394ed45be627"
+source = "git+https://github.com/servo/webrender#1175acad2d4f49fa712e105c84149ac7f394261d"
 dependencies = [
  "proc-macro2 1.0.17",
  "quote 1.0.2",
@@ -6398,7 +6395,7 @@ dependencies = [
 [[package]]
 name = "webrender"
 version = "0.61.0"
-source = "git+https://github.com/servo/webrender#de3999583ab20aad7c57ea35a3e0394ed45be627"
+source = "git+https://github.com/servo/webrender#1175acad2d4f49fa712e105c84149ac7f394261d"
 dependencies = [
  "base64 0.10.1",
  "bincode",
@@ -6440,7 +6437,7 @@ dependencies = [
 [[package]]
 name = "webrender_api"
 version = "0.61.0"
-source = "git+https://github.com/servo/webrender#de3999583ab20aad7c57ea35a3e0394ed45be627"
+source = "git+https://github.com/servo/webrender#1175acad2d4f49fa712e105c84149ac7f394261d"
 dependencies = [
  "app_units",
  "bitflags",
@@ -6461,7 +6458,7 @@ dependencies = [
 [[package]]
 name = "webrender_build"
 version = "0.0.1"
-source = "git+https://github.com/servo/webrender#de3999583ab20aad7c57ea35a3e0394ed45be627"
+source = "git+https://github.com/servo/webrender#1175acad2d4f49fa712e105c84149ac7f394261d"
 dependencies = [
  "bitflags",
  "lazy_static",
@@ -6641,7 +6638,7 @@ dependencies = [
 [[package]]
 name = "wr_malloc_size_of"
 version = "0.0.1"
-source = "git+https://github.com/servo/webrender#de3999583ab20aad7c57ea35a3e0394ed45be627"
+source = "git+https://github.com/servo/webrender#1175acad2d4f49fa712e105c84149ac7f394261d"
 dependencies = [
  "app_units",
  "euclid",
diff --git a/components/compositing/Cargo.toml b/components/compositing/Cargo.toml
index 97419f37752..027d16233bf 100644
--- a/components/compositing/Cargo.toml
+++ b/components/compositing/Cargo.toml
@@ -16,7 +16,6 @@ default = []
 gl = ["gleam", "pixels"]
 
 [dependencies]
-app_units = "0.7"
 canvas = { path = "../canvas" }
 crossbeam-channel = "0.4"
 embedder_traits = { path = "../embedder_traits" }
diff --git a/components/compositing/compositor_thread.rs b/components/compositing/compositor_thread.rs
index 01fb92a544e..d74851d4413 100644
--- a/components/compositing/compositor_thread.rs
+++ b/components/compositing/compositor_thread.rs
@@ -129,7 +129,7 @@ pub enum Msg {
 pub enum WebrenderFontMsg {
     AddFontInstance(
         webrender_api::FontKey,
-        app_units::Au,
+        f32,
         Sender<webrender_api::FontInstanceKey>,
     ),
     AddFont(gfx_traits::FontData, Sender<webrender_api::FontKey>),
diff --git a/components/gfx/font_cache_thread.rs b/components/gfx/font_cache_thread.rs
index 45eead2357d..21771b151da 100644
--- a/components/gfx/font_cache_thread.rs
+++ b/components/gfx/font_cache_thread.rs
@@ -182,10 +182,13 @@ impl FontCache {
                 Command::GetFontInstance(font_key, size, result) => {
                     let webrender_api = &self.webrender_api;
 
-                    let instance_key = *self
-                        .font_instances
-                        .entry((font_key, size))
-                        .or_insert_with(|| webrender_api.add_font_instance(font_key, size));
+                    let instance_key =
+                        *self
+                            .font_instances
+                            .entry((font_key, size))
+                            .or_insert_with(|| {
+                                webrender_api.add_font_instance(font_key, size.to_f32_px())
+                            });
 
                     let _ = result.send(instance_key);
                 },
diff --git a/components/gfx_traits/Cargo.toml b/components/gfx_traits/Cargo.toml
index 5d7acdd1b61..f4b7ef68931 100644
--- a/components/gfx_traits/Cargo.toml
+++ b/components/gfx_traits/Cargo.toml
@@ -11,7 +11,6 @@ name = "gfx_traits"
 path = "lib.rs"
 
 [dependencies]
-app_units = "0.7"
 malloc_size_of = { path = "../malloc_size_of" }
 malloc_size_of_derive = "0.1"
 range = { path = "../range" }
diff --git a/components/gfx_traits/lib.rs b/components/gfx_traits/lib.rs
index 447be6e5dc2..a7d447dfded 100644
--- a/components/gfx_traits/lib.rs
+++ b/components/gfx_traits/lib.rs
@@ -113,7 +113,7 @@ pub trait WebrenderApi {
     fn add_font_instance(
         &self,
         font_key: webrender_api::FontKey,
-        size: app_units::Au,
+        size: f32,
     ) -> webrender_api::FontInstanceKey;
     fn add_font(&self, data: FontData) -> webrender_api::FontKey;
 }
diff --git a/components/servo/Cargo.toml b/components/servo/Cargo.toml
index 96b2ad36f68..2b52339e628 100644
--- a/components/servo/Cargo.toml
+++ b/components/servo/Cargo.toml
@@ -38,7 +38,6 @@ webrender_debugger = ["webrender/debugger"]
 xr-profile = ["canvas/xr-profile", "canvas_traits/xr-profile", "script/xr-profile", "webxr/profile"]
 
 [dependencies]
-app_units = "0.7"
 background_hang_monitor = { path = "../background_hang_monitor" }
 bluetooth = { path = "../bluetooth" }
 bluetooth_traits = { path = "../bluetooth_traits" }
diff --git a/components/servo/lib.rs b/components/servo/lib.rs
index 6dda30ed6ea..390bd2c6ea0 100644
--- a/components/servo/lib.rs
+++ b/components/servo/lib.rs
@@ -928,7 +928,7 @@ impl gfx_traits::WebrenderApi for FontCacheWR {
     fn add_font_instance(
         &self,
         font_key: webrender_api::FontKey,
-        size: app_units::Au,
+        size: f32,
     ) -> webrender_api::FontInstanceKey {
         let (sender, receiver) = unbounded();
         let _ = self.0.send(Msg::Webrender(WebrenderMsg::Font(
diff --git a/tests/wpt/metadata/css/css-paint-api/geometry-border-image-001.https.html.ini b/tests/wpt/metadata/css/css-paint-api/geometry-border-image-001.https.html.ini
deleted file mode 100644
index 458137c2908..00000000000
--- a/tests/wpt/metadata/css/css-paint-api/geometry-border-image-001.https.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[geometry-border-image-001.https.html]
-  bug: https://github.com/servo/servo/issues/17861
-  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-paint-api/geometry-border-image-004.https.html.ini b/tests/wpt/metadata/css/css-paint-api/geometry-border-image-004.https.html.ini
deleted file mode 100644
index 2e84bc8e22f..00000000000
--- a/tests/wpt/metadata/css/css-paint-api/geometry-border-image-004.https.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[geometry-border-image-004.https.html]
-  bug: https://github.com/servo/servo/issues/17860
-  expected: FAIL
diff --git a/tests/wpt/metadata/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-transform-translatez.html.ini b/tests/wpt/metadata/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-transform-translatez.html.ini
deleted file mode 100644
index 8f2209ffd03..00000000000
--- a/tests/wpt/metadata/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-transform-translatez.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[fieldset-transform-translatez.html]
-  expected:
-    if os == "linux": FAIL