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/canvas | |
| 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/canvas')
| -rw-r--r-- | components/canvas/Cargo.toml | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/components/canvas/Cargo.toml b/components/canvas/Cargo.toml index c6bb21cd61a..ff31840b39d 100644 --- a/components/canvas/Cargo.toml +++ b/components/canvas/Cargo.toml @@ -28,9 +28,6 @@ path = "../util" [dependencies.gfx_traits] path = "../gfx_traits" -[dependencies.offscreen_gl_context] -git = "https://github.com/ecoal95/rust-offscreen-rendering-context" - [dependencies.ipc-channel] git = "https://github.com/servo/ipc-channel" @@ -38,7 +35,8 @@ git = "https://github.com/servo/ipc-channel" git = "https://github.com/servo/webrender_traits" [dependencies] +euclid = {version = "0.6.4", features = ["plugins"]} +gleam = "0.2.8" log = "0.3.5" num = "0.1.24" -gleam = "0.2.8" -euclid = {version = "0.6.4", features = ["plugins"]} +offscreen_gl_context = "0.1.2" |