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 #10291 - jfhumann:10211, r=emilio

Browse source 
<!-- 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/10291)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-04-01 01:57:20 +05:30
commit 524a004e77
15 changed files with 98 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

6
components/canvas_traits/lib.rs
View file

@ -36,9 +36,7 @@ use gfx_traits::color;
use ipc_channel::ipc::{IpcSender, IpcSharedMemory};
use std::default::Default;
use std::str::FromStr;
pub use webrender_traits::{WebGLFramebufferBindingRequest, WebGLError, WebGLParameter, WebGLResult, WebGLContextId};
pub use webrender_traits::WebGLCommand as CanvasWebGLMsg;
use webrender_traits::{WebGLCommand, WebGLContextId};
#[derive(Clone, Deserialize, Serialize)]
pub enum FillRule {
@ -51,7 +49,7 @@ pub enum CanvasMsg {
Canvas2d(Canvas2dMsg),
Common(CanvasCommonMsg),
FromLayout(FromLayoutMsg),
WebGL(CanvasWebGLMsg),
WebGL(WebGLCommand),
}
#[derive(Clone, Deserialize, Serialize)]