ae3ff6be00
> Here it is. > > ~~There's two major things that are unfinished here:~~ > - ~~Dealing with the unroot_must_root lint. I'm not sure about the value of this lint with the new rooting API.~~ Done. > - ~~Updating the Cargo.locks to point to the new SM and SM binding.~~ Done. > > I also included my fixes for the rust update, but these will disappear in a rebase. A rust update is necessary to support calling `Drop` on `Heap<T>` correctly when `Heap<T>` is inside a `Rc<T>`. Otherwise `&self` points to the wrong location. > > Incremental GC is disabled here. I'm not sure how to deal with the incremental barriers so that's left for later. > > Generational GC works. SM doesn't work without it. > > The biggest change here is to the rooting API. `Root` was made movable, and `Temporary` and `JSRef` was removed. Movable `Root`s means there's no need for `Temporary`, and `JSRef`s aren't needed generally since it can be assumed that being able to obtain a reference to a dom object means it's already rooted. References have their lifetime bound to the Roots that provided them. DOM objects that haven't passed through `reflect_dom_object` don't need to be rooted, and DOM objects that have passed through `reflect_dom_object` can't be obtained without being rooted through `native_from_reflector_jsmanaged` or `JS::<T>::root()`. > > Support for `Heap<T>` ended up messier than I expected. It's split into two commits, but only because it's a bit difficult to fold them together. Supporting `Heap<T>` properly requires that that `Heap::<T>::set()` be called on something that won't move. I removed the Copy and Clone trait from `Heap<T>` so `Cell` can't hold `Heap<T>` - only `UnsafeCell` can hold it. > > `CallbackObject` is a bit tricky - I moved all callbacks into `Rc<T>` in order to make sure that the pointer inside to a `*mut JSObject` doesn't move. This is necessary for supporting `Heap<T>`. > > `RootedCollectionSet` is very general purpose now. Anything with `JSTraceable` can be rooted by `RootedCollectionSet`/`RootedTraceable`. Right now, `RootedTraceable` is only used to hold down dom objects before they're fully attached to their reflector. I had to make a custom mechanism to dispatch the trace call - couldn't figure out how to get trait objects working for this case. > > This has been tested with the following zeal settings: > > GC after every allocation > JS_GC_ZEAL=2,1 > > GC after every 100 allocations (important for catching use-after-free bugs) > JS_GC_ZEAL=2,100 > > Verify pre barriers > JS_GC_ZEAL=4,1 > > Verify post barriers > JS_GC_ZEAL=11,1 Source-Repo: https://github.com/servo/servo Source-Revision: e7808c526c348fea5e3b48af70b7f1a066652097
86 lines
3.0 KiB
Rust
86 lines
3.0 KiB
Rust
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
use cssparser::RGBA;
|
|
use canvas_traits::{CanvasGradientStop, FillOrStrokeStyle, LinearGradientStyle, RadialGradientStyle};
|
|
use dom::bindings::cell::DOMRefCell;
|
|
use dom::bindings::codegen::Bindings::CanvasGradientBinding;
|
|
use dom::bindings::codegen::Bindings::CanvasGradientBinding::CanvasGradientMethods;
|
|
use dom::bindings::global::GlobalRef;
|
|
use dom::bindings::js::Root;
|
|
use dom::bindings::num::Finite;
|
|
use dom::bindings::utils::{Reflector, reflect_dom_object};
|
|
use dom::canvasrenderingcontext2d::parse_color;
|
|
|
|
// https://html.spec.whatwg.org/multipage/#canvasgradient
|
|
#[dom_struct]
|
|
pub struct CanvasGradient {
|
|
reflector_: Reflector,
|
|
style: CanvasGradientStyle,
|
|
stops: DOMRefCell<Vec<CanvasGradientStop>>,
|
|
}
|
|
|
|
#[jstraceable]
|
|
#[derive(Clone)]
|
|
pub enum CanvasGradientStyle {
|
|
Linear(LinearGradientStyle),
|
|
Radial(RadialGradientStyle),
|
|
}
|
|
|
|
impl CanvasGradient {
|
|
fn new_inherited(style: CanvasGradientStyle) -> CanvasGradient {
|
|
CanvasGradient {
|
|
reflector_: Reflector::new(),
|
|
style: style,
|
|
stops: DOMRefCell::new(Vec::new()),
|
|
}
|
|
}
|
|
|
|
pub fn new(global: GlobalRef, style: CanvasGradientStyle) -> Root<CanvasGradient> {
|
|
reflect_dom_object(box CanvasGradient::new_inherited(style),
|
|
global, CanvasGradientBinding::Wrap)
|
|
}
|
|
}
|
|
|
|
impl<'a> CanvasGradientMethods for &'a CanvasGradient {
|
|
// https://html.spec.whatwg.org/multipage/#dom-canvasgradient-addcolorstop
|
|
fn AddColorStop(self, offset: Finite<f64>, color: String) {
|
|
let default_black = RGBA {
|
|
red: 0.0,
|
|
green: 0.0,
|
|
blue: 0.0,
|
|
alpha: 1.0,
|
|
};
|
|
|
|
self.stops.borrow_mut().push(CanvasGradientStop {
|
|
offset: (*offset) as f64,
|
|
color: parse_color(&color).unwrap_or(default_black),
|
|
});
|
|
}
|
|
}
|
|
|
|
pub trait ToFillOrStrokeStyle {
|
|
fn to_fill_or_stroke_style(self) -> FillOrStrokeStyle;
|
|
}
|
|
|
|
impl<'a> ToFillOrStrokeStyle for &'a CanvasGradient {
|
|
fn to_fill_or_stroke_style(self) -> FillOrStrokeStyle {
|
|
let gradient_stops = self.stops.borrow().clone();
|
|
match self.style {
|
|
CanvasGradientStyle::Linear(ref gradient) => {
|
|
FillOrStrokeStyle::LinearGradient(
|
|
LinearGradientStyle::new(gradient.x0, gradient.y0,
|
|
gradient.x1, gradient.y1,
|
|
gradient_stops))
|
|
},
|
|
CanvasGradientStyle::Radial(ref gradient) => {
|
|
FillOrStrokeStyle::RadialGradient(
|
|
RadialGradientStyle::new(gradient.x0, gradient.y0, gradient.r0,
|
|
gradient.x1, gradient.y1, gradient.r1,
|
|
gradient_stops))
|
|
}
|
|
}
|
|
}
|
|
}
|