Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 06:00:15 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #6812 - ecoal95:webgl-fail, r=jdm

Browse source 
webgl: Make context creation fallible. Fixes #6806



<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6812)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-07-29 15:29:58 -06:00
commit b90fd5931d
3 changed files with 24 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

17
components/compositing/constellation.rs
View file

@ -949,12 +949,17 @@ impl<LTF: LayoutTaskFactory, STF: ScriptTaskFactory> Constellation<LTF, STF> {
&mut self,
size: &Size2D<i32>,
attributes: GLContextAttributes,
response_sender: IpcSender<(IpcSender<CanvasMsg>, usize)>) {
let id = self.webgl_paint_tasks.len();
let (out_of_process_sender, in_process_sender) =
WebGLPaintTask::start(*size, attributes).unwrap();
self.webgl_paint_tasks.push(in_process_sender);
response_sender.send((out_of_process_sender, id)).unwrap()
response_sender: IpcSender<Result<(IpcSender<CanvasMsg>, usize), String>>) {
let response = match WebGLPaintTask::start(*size, attributes) {
Ok((out_of_process_sender, in_process_sender)) => {
let id = self.webgl_paint_tasks.len();
self.webgl_paint_tasks.push(in_process_sender);
Ok((out_of_process_sender, id))
},
Err(msg) => Err(msg.to_owned()),
};
response_sender.send(response).unwrap()
}
fn handle_webdriver_msg(&mut self, msg: WebDriverCommandMsg) {