servo: Merge #17389 - Update WR (unrevert border snapping code) (from glennw:revert); r=jdm

Source-Repo: https://github.com/servo/servo
Source-Revision: 348c28240760560eef44bc1443673e0cf6fd501c

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 2f0bfd81d375754ba8176a36a992b27331478c21
This commit is contained in:
Alexis Beingessner 2017-06-18 09:07:35 -07:00
Родитель f2e4fa0a56
Коммит 41ef937667
1 изменённых файлов: 2 добавлений и 2 удалений

4
servo/Cargo.lock сгенерированный
Просмотреть файл

@ -3350,7 +3350,7 @@ dependencies = [
[[package]]
name = "webrender"
version = "0.43.0"
source = "git+https://github.com/servo/webrender#dfeefbd8c7bcb85744ebb3d3026712ff5bcbf1d4"
source = "git+https://github.com/servo/webrender#96375038e904ac85317be53acc987eeab27207b6"
dependencies = [
"app_units 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
"bincode 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -3379,7 +3379,7 @@ dependencies = [
[[package]]
name = "webrender_traits"
version = "0.43.0"
source = "git+https://github.com/servo/webrender#dfeefbd8c7bcb85744ebb3d3026712ff5bcbf1d4"
source = "git+https://github.com/servo/webrender#96375038e904ac85317be53acc987eeab27207b6"
dependencies = [
"app_units 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
"bincode 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",