diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-03-31 06:42:31 +0530 |
|---|---|---|
| committer | bors-servo <lbergstrom+bors@mozilla.com> | 2016-03-31 06:42:31 +0530 |
| commit | 436f7316d97eabff4238c774a8ff7cc66fca08a0 (patch) | |
| tree | b7e6ea3ce080e536433706bd2a47475c85d536ba /components/script | |
| parent | af06d32628bafe50e82a17e50d3daea2981974f2 (diff) | |
| parent | 48b5d1d6be15bbaee380a28438b1bf2da1202547 (diff) | |
| download | servo-436f7316d97eabff4238c774a8ff7cc66fca08a0.tar.gz servo-436f7316d97eabff4238c774a8ff7cc66fca08a0.zip | |
Auto merge of #10297 - servo:the-offscreens, r=pcwalton
Update webrender with crates.io's offscreen_gl_context (fixes #10296)
Crate webrender is bumped to the first commit in https://github.com/servo/webrender/pull/248.
Crate webrender_traits is bumped to the merge of https://github.com/servo/webrender_traits/pull/21.
<!-- 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/10297)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script')
| -rw-r--r-- | components/script/Cargo.toml | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/components/script/Cargo.toml b/components/script/Cargo.toml index 2b350fcdd55..9af8a445723 100644 --- a/components/script/Cargo.toml +++ b/components/script/Cargo.toml @@ -46,9 +46,6 @@ path = "../canvas_traits" [dependencies.js] git = "https://github.com/servo/rust-mozjs" -[dependencies.offscreen_gl_context] -git = "https://github.com/ecoal95/rust-offscreen-rendering-context" - [dependencies.angle] git = "https://github.com/emilio/angle" branch = "servo" @@ -79,6 +76,7 @@ image = "0.7" libc = "0.2" log = "0.3.5" num = "0.1.24" +offscreen_gl_context = "0.1.2" rand = "0.3" phf = "0.7.13" phf_macros = "0.7.13" |