diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-03-31 21:51:06 +0530 |
|---|---|---|
| committer | bors-servo <lbergstrom+bors@mozilla.com> | 2016-03-31 21:51:06 +0530 |
| commit | 84a3dee67ea7a45d6ec505f59c7a55162621f11e (patch) | |
| tree | 6d893c786c463ffcea7d91af6055aab0b50703f1 /components/canvas/webgl_paint_thread.rs | |
| parent | b38fafcf11d2588fecc565c581260106411ad484 (diff) | |
| parent | 97f4ef28d4e0c717c3576b2b4fad2508881383ea (diff) | |
| download | servo-84a3dee67ea7a45d6ec505f59c7a55162621f11e.tar.gz servo-84a3dee67ea7a45d6ec505f59c7a55162621f11e.zip | |
Auto merge of #10302 - emilio:webrender-up, r=nox
Update webrender to master
I'll rebase #10224 against it.
Sorry for the blocking of #10224, I expected it to be reviewed way sooner, my fault for landing breaking changes.
r? @nox or @pcwalton
<!-- 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/10302)
<!-- Reviewable:end -->
Diffstat (limited to 'components/canvas/webgl_paint_thread.rs')
| -rw-r--r-- | components/canvas/webgl_paint_thread.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/components/canvas/webgl_paint_thread.rs b/components/canvas/webgl_paint_thread.rs index 652a11b9332..1b1ce738cad 100644 --- a/components/canvas/webgl_paint_thread.rs +++ b/components/canvas/webgl_paint_thread.rs @@ -29,7 +29,7 @@ impl WebGLPaintThread { webrender_api_sender: Option<webrender_traits::RenderApiSender>) -> Result<WebGLPaintThread, String> { let data = if let Some(sender) = webrender_api_sender { let webrender_api = sender.create_api(); - let id = try!(webrender_api.request_webgl_context(&size, attrs)); + let (id, _) = try!(webrender_api.request_webgl_context(&size, attrs)); WebGLPaintTaskData::WebRender(webrender_api, id) } else { let context = try!(GLContext::<NativeGLContext>::new(size, attrs, ColorAttachmentType::Texture, None)); |