servo: Merge #18645 - Update WR (support color emoji on mac, also sub-primitive clips) (from glennw:update-wr-emoji); r=KiChjang

Source-Repo: https://github.com/servo/servo
Source-Revision: 1162aed4e5a4bf80b622ab5fd26b25538385541c

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : f1ec1553c1e85c725286b33d577fffd6eefb461a
This commit is contained in:
Glenn Watson 2017-09-27 02:43:45 -05:00
Родитель 8558f8dcb0
Коммит eca1a32c70
1 изменённых файлов: 2 добавлений и 2 удалений

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

@ -3599,7 +3599,7 @@ dependencies = [
[[package]]
name = "webrender"
version = "0.52.0"
source = "git+https://github.com/servo/webrender#c8c515df5288368fc02f315a4144103213aec12c"
source = "git+https://github.com/servo/webrender#0fd01baa9cc1f295e983f0d9056d7c205d1ba1e4"
dependencies = [
"app_units 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
"bincode 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -3627,7 +3627,7 @@ dependencies = [
[[package]]
name = "webrender_api"
version = "0.52.0"
source = "git+https://github.com/servo/webrender#c8c515df5288368fc02f315a4144103213aec12c"
source = "git+https://github.com/servo/webrender#0fd01baa9cc1f295e983f0d9056d7c205d1ba1e4"
dependencies = [
"app_units 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
"bincode 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",