diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-03-17 05:13:58 +0530 |
|---|---|---|
| committer | bors-servo <lbergstrom+bors@mozilla.com> | 2016-03-17 05:13:58 +0530 |
| commit | e273517fe06720afe0ef74815cce5e007df7dc3d (patch) | |
| tree | 40530a1923c0f6c7a720bf31365b5b56a3eb7d27 | |
| parent | b7304f11529f92b4b08b5bac59a16c331c6ee774 (diff) | |
| parent | 74e5d901eb4bef699af3eaa16800bc96b774eeef (diff) | |
| download | servo-e273517fe06720afe0ef74815cce5e007df7dc3d.tar.gz servo-e273517fe06720afe0ef74815cce5e007df7dc3d.zip | |
Auto merge of #10039 - pcwalton:update-webrender-again, r=glennw
servo: Update WebRender to pick up the blend mode fix.
Closes #9877.
r? @glennw
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/10039)
<!-- Reviewable:end -->
| -rw-r--r-- | components/servo/Cargo.lock | 3 | ||||
| -rw-r--r-- | ports/cef/Cargo.lock | 3 | ||||
| -rw-r--r-- | ports/gonk/Cargo.lock | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock index 0190a6a604c..89472231cfe 100644 --- a/components/servo/Cargo.lock +++ b/components/servo/Cargo.lock @@ -2294,7 +2294,7 @@ dependencies = [ [[package]] name = "webrender" version = "0.1.0" -source = "git+https://github.com/servo/webrender#ce55aca74c7628ee05b57b31a3f7ffc9ebf132cb" +source = "git+https://github.com/servo/webrender#ab1c795612a5bd560a8adf750b4630cf1d24f706" dependencies = [ "app_units 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "core-graphics 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2305,6 +2305,7 @@ dependencies = [ "gleam 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.2.1 (git+https://github.com/servo/ipc-channel)", "lazy_static 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", "num 0.1.31 (registry+https://github.com/rust-lang/crates.io-index)", "offscreen_gl_context 0.1.0 (git+https://github.com/ecoal95/rust-offscreen-rendering-context)", "scoped_threadpool 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock index b880d765609..1f0fda6e6c7 100644 --- a/ports/cef/Cargo.lock +++ b/ports/cef/Cargo.lock @@ -2170,7 +2170,7 @@ dependencies = [ [[package]] name = "webrender" version = "0.1.0" -source = "git+https://github.com/servo/webrender#ce55aca74c7628ee05b57b31a3f7ffc9ebf132cb" +source = "git+https://github.com/servo/webrender#ab1c795612a5bd560a8adf750b4630cf1d24f706" dependencies = [ "app_units 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "core-graphics 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2181,6 +2181,7 @@ dependencies = [ "gleam 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.2.1 (git+https://github.com/servo/ipc-channel)", "lazy_static 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", "num 0.1.31 (registry+https://github.com/rust-lang/crates.io-index)", "offscreen_gl_context 0.1.0 (git+https://github.com/ecoal95/rust-offscreen-rendering-context)", "scoped_threadpool 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/ports/gonk/Cargo.lock b/ports/gonk/Cargo.lock index 079706df287..79cd1b98c57 100644 --- a/ports/gonk/Cargo.lock +++ b/ports/gonk/Cargo.lock @@ -2119,7 +2119,7 @@ dependencies = [ [[package]] name = "webrender" version = "0.1.0" -source = "git+https://github.com/servo/webrender#ce55aca74c7628ee05b57b31a3f7ffc9ebf132cb" +source = "git+https://github.com/servo/webrender#ab1c795612a5bd560a8adf750b4630cf1d24f706" dependencies = [ "app_units 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "core-graphics 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2130,6 +2130,7 @@ dependencies = [ "gleam 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.2.1 (git+https://github.com/servo/ipc-channel)", "lazy_static 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", "num 0.1.31 (registry+https://github.com/rust-lang/crates.io-index)", "offscreen_gl_context 0.1.0 (git+https://github.com/ecoal95/rust-offscreen-rendering-context)", "scoped_threadpool 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", |