diff options
| author | bors-servo <metajack+bors@gmail.com> | 2015-04-22 14:15:28 -0500 |
|---|---|---|
| committer | bors-servo <metajack+bors@gmail.com> | 2015-04-22 14:15:28 -0500 |
| commit | e278e5b9a27738bdca7a151b4295628e1f179e29 (patch) | |
| tree | b3d0b0b83ac2625de2ece329513fc20002a99530 /components/script/dom/bindings/trace.rs | |
| parent | 9ae3cad31e6c0567afc909651ab1bcd1dc89d320 (diff) | |
| parent | a8343a07509ed48673268d1fdcb30c798d3b19f8 (diff) | |
| download | servo-e278e5b9a27738bdca7a151b4295628e1f179e29.tar.gz servo-e278e5b9a27738bdca7a151b4295628e1f179e29.zip | |
Auto merge of #5757 - mmatyas:canvas_globalcomposite, r=jdm
Implements https://html.spec.whatwg.org/multipage/scripting.html#dom-context-2d-globalcompositeoperation.
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/5757)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/bindings/trace.rs')
| -rw-r--r-- | components/script/dom/bindings/trace.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/components/script/dom/bindings/trace.rs b/components/script/dom/bindings/trace.rs index 10e13c90a5b..0d261092bb4 100644 --- a/components/script/dom/bindings/trace.rs +++ b/components/script/dom/bindings/trace.rs @@ -35,7 +35,7 @@ use dom::bindings::utils::{Reflectable, Reflector, WindowProxyHandler}; use script_task::ScriptChan; use canvas::canvas_paint_task::{CanvasGradientStop, LinearGradientStyle, RadialGradientStyle}; -use canvas::canvas_paint_task::{LineCapStyle, LineJoinStyle}; +use canvas::canvas_paint_task::{LineCapStyle, LineJoinStyle, CompositionOrBlending}; use cssparser::RGBA; use encoding::types::EncodingRef; use geom::matrix2d::Matrix2D; @@ -270,7 +270,7 @@ no_jsmanaged_fields!(RGBA); no_jsmanaged_fields!(Matrix2D<T>); no_jsmanaged_fields!(StorageType); no_jsmanaged_fields!(CanvasGradientStop, LinearGradientStyle, RadialGradientStyle); -no_jsmanaged_fields!(LineCapStyle, LineJoinStyle); +no_jsmanaged_fields!(LineCapStyle, LineJoinStyle, CompositionOrBlending); impl JSTraceable for Box<ScriptChan+Send> { #[inline] |