From 0a2ea7381f82eed66e1473201179dbb62f38c912 Mon Sep 17 00:00:00 2001 From: Glenn Watson Date: Thu, 8 Feb 2018 09:06:45 +1000 Subject: [PATCH] Update WR (various transform, hit-testing related fixes). --- Cargo.lock | 12 ++++++------ components/layout_thread/lib.rs | 2 +- .../css/css-transforms/transform-table-006.html.ini | 3 --- 3 files changed, 7 insertions(+), 10 deletions(-) delete mode 100644 tests/wpt/metadata/css/css-transforms/transform-table-006.html.ini diff --git a/Cargo.lock b/Cargo.lock index 6082f266937..72d7964bd17 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -533,7 +533,7 @@ dependencies = [ [[package]] name = "core-text" -version = "9.0.0" +version = "9.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "core-foundation 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -971,7 +971,7 @@ dependencies = [ "byteorder 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "core-foundation 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "core-graphics 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", - "core-text 9.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "core-text 9.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "dwrote 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3310,7 +3310,7 @@ dependencies = [ [[package]] name = "webrender" version = "0.57.0" -source = "git+https://github.com/servo/webrender#47f5afa5c011080ee787c1170038de1e5fc28155" +source = "git+https://github.com/servo/webrender#7ae075a3238915530144727896e5d275d4057f34" dependencies = [ "app_units 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "bincode 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3318,7 +3318,7 @@ dependencies = [ "byteorder 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "core-foundation 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "core-graphics 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", - "core-text 9.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "core-text 9.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "dwrote 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)", "freetype 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3338,7 +3338,7 @@ dependencies = [ [[package]] name = "webrender_api" version = "0.57.0" -source = "git+https://github.com/servo/webrender#47f5afa5c011080ee787c1170038de1e5fc28155" +source = "git+https://github.com/servo/webrender#7ae075a3238915530144727896e5d275d4057f34" dependencies = [ "app_units 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "bincode 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3558,7 +3558,7 @@ dependencies = [ "checksum core-foundation 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "286e0b41c3a20da26536c6000a280585d519fd07b3956b43aed8a79e9edce980" "checksum core-foundation-sys 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "716c271e8613ace48344f723b60b900a93150271e5be206212d052bbc0883efa" "checksum core-graphics 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fb0ed45fdc32f9ab426238fba9407dfead7bacd7900c9b4dd3f396f46eafdae3" -"checksum core-text 9.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2c737a5c1f112943c961ed270aea64f7d0b01b425d327b040fa32b155646e07f" +"checksum core-text 9.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2bd581c37283d0c23311d179aefbb891f2324ee0405da58a26e8594ab76e5748" "checksum cssparser 0.23.2 (registry+https://github.com/rust-lang/crates.io-index)" = "8a807ac3ab7a217829c2a3b65732b926b2befe6a35f33b4bf8b503692430f223" "checksum cssparser-macros 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "079adec4af52bb5275eadd004292028c79eb3c5f5b4ee8086a36d4197032f6df" "checksum darling 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9861a8495606435477df581bc858ccf15a3469747edf175b94a4704fd9aaedac" diff --git a/components/layout_thread/lib.rs b/components/layout_thread/lib.rs index d3a77d1e652..5585891a011 100644 --- a/components/layout_thread/lib.rs +++ b/components/layout_thread/lib.rs @@ -707,7 +707,7 @@ impl LayoutThread { let mut txn = webrender_api::Transaction::new(); txn.scroll_node_with_id( webrender_api::LayoutPoint::from_untyped(&point), - webrender_api::IdType::ExternalScrollId(state.scroll_id), + webrender_api::ScrollNodeIdType::ExternalScrollId(state.scroll_id), webrender_api::ScrollClamping::ToContentBounds ); self.webrender_api.send_transaction(self.webrender_document, txn); diff --git a/tests/wpt/metadata/css/css-transforms/transform-table-006.html.ini b/tests/wpt/metadata/css/css-transforms/transform-table-006.html.ini deleted file mode 100644 index 86769c14663..00000000000 --- a/tests/wpt/metadata/css/css-transforms/transform-table-006.html.ini +++ /dev/null @@ -1,3 +0,0 @@ -[transform-table-006.html] - type: reftest - expected: FAIL