diff options
| author | bors-servo <metajack+bors@gmail.com> | 2015-07-01 18:27:40 -0600 |
|---|---|---|
| committer | bors-servo <metajack+bors@gmail.com> | 2015-07-01 18:27:40 -0600 |
| commit | bbb39082e0f640400546d2084a450a8675820a82 (patch) | |
| tree | f531bb4d70d8eb6a1080d9711c29587c883bf0ce /components/script/dom/canvasrenderingcontext2d.rs | |
| parent | fc1e427ff9bb0e9891053ec1eba292530ebbe91a (diff) | |
| parent | 4cf46bff2d00f33a8866dc6880c8f6178fdf81a4 (diff) | |
| download | servo-bbb39082e0f640400546d2084a450a8675820a82.tar.gz servo-bbb39082e0f640400546d2084a450a8675820a82.zip | |
Auto merge of #6529 - dwins:master, r=Manishearth
Refactor #[jstraceable] to #[derive(JSTraceable)]
fixes #6524. I had to make an additional change not mentioned in the ticket - adding the `#[feature]` to enable deriving custom traits but I assume that's expected at this time.
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6529)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/canvasrenderingcontext2d.rs')
| -rw-r--r-- | components/script/dom/canvasrenderingcontext2d.rs | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/components/script/dom/canvasrenderingcontext2d.rs b/components/script/dom/canvasrenderingcontext2d.rs index 798e1f558e5..af787682719 100644 --- a/components/script/dom/canvasrenderingcontext2d.rs +++ b/components/script/dom/canvasrenderingcontext2d.rs @@ -48,8 +48,7 @@ use url::Url; use util::vec::byte_swap; #[must_root] -#[jstraceable] -#[derive(Clone)] +#[derive(JSTraceable, Clone)] pub enum CanvasFillOrStrokeStyle { Color(RGBA), Gradient(JS<CanvasGradient>), @@ -68,8 +67,7 @@ pub struct CanvasRenderingContext2D { } #[must_root] -#[jstraceable] -#[derive(Clone)] +#[derive(JSTraceable, Clone)] struct CanvasContextState { global_alpha: f64, global_composition: CompositionOrBlending, |