Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-29 10:10:34 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #10297 - servo:the-offscreens, r=pcwalton

Browse source 
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 -->
This commit is contained in:
bors-servo 2016-03-31 06:42:31 +05:30
commit 436f7316d9
9 changed files with 44 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

4
components/script/Cargo.toml
View file

@ -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"