Auto merge of #10291 - jfhumann:10211, r=emilio

<!-- 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

View file

@ -29,7 +29,6 @@
//! The `no_jsmanaged_fields!()` macro adds an empty implementation of `JSTraceable` to
//! a datatype.
use canvas_traits::WebGLError;
use canvas_traits::{CanvasGradientStop, LinearGradientStyle, RadialGradientStyle};
use canvas_traits::{CompositionOrBlending, LineCapStyle, LineJoinStyle, RepetitionStyle};
use cssparser::RGBA;
@ -91,7 +90,7 @@ use style::values::specified::Length;
use url::Url;
use util::str::{DOMString, LengthOrPercentageOrAuto};
use uuid::Uuid;
use webrender_traits::WebGLError;
/// A trait to allow tracing (only) DOM objects.
pub trait JSTraceable {