Auto merge of #12497 - glennw:wr-update, r=emilio

Update WR to get fix for texture atlas assert.

<!-- Please describe your changes on the following line: -->

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [ ] `./mach build -d` does not report any errors
- [ ] `./mach test-tidy` does not report any errors
- [ ] These changes fix #__ (github issue number if applicable).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [ ] These changes do not require tests because _____

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/12497)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-07-18 18:46:14 -07:00 committed by GitHub
commit 877e480c47
2 changed files with 2 additions and 2 deletions

View file

@ -2591,7 +2591,7 @@ dependencies = [
[[package]]
name = "webrender"
version = "0.1.0"
source = "git+https://github.com/servo/webrender#29fcb362a71b0434db186db7e7b9fa8349a0dc3a"
source = "git+https://github.com/servo/webrender#fd38ab8994be39ba194f56182af8c467b4f9f929"
dependencies = [
"app_units 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
"bit-set 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",

2
ports/cef/Cargo.lock generated
View file

@ -2453,7 +2453,7 @@ dependencies = [
[[package]]
name = "webrender"
version = "0.1.0"
source = "git+https://github.com/servo/webrender#29fcb362a71b0434db186db7e7b9fa8349a0dc3a"
source = "git+https://github.com/servo/webrender#fd38ab8994be39ba194f56182af8c467b4f9f929"
dependencies = [
"app_units 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
"bit-set 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",