0656a2b904
I've done a bit of job to get this done. Right now readback is still used, but we have a `LayerId` -> `CanvasRenderer` map on the paint task, that we can use to get rid of that. I'd want review, to see if this is a good approach (I know it's not the initial `CanvasId` -> renderer approach, but it's pretty similar, since a canvas involves a `PaintLayer`). I had to do a bit of refactoring to avoid cyclic dependencies between canvas and gfx. I'd want you to review them too. It's mergeable and doesn't break any tests :P Some of my main concerns: * Does the canvas render really need to be behind an `Arc<Mutex<T>>`? * I can't clone a `NativeSurface` right now (that's why the `SendNativeSurface()` msg is unimplemented in the WebGL task). It should be easy to add that to rust-layers, supposing the caller is responsible to mark it as non-leaking, any reason to not do it? cc @jdm @pcwalton Source-Repo: https://github.com/servo/servo Source-Revision: ad53e95080144485e74cd9b9d48ce75e20de4e36
85 lines
3.0 KiB
Rust
85 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::{JSRef, Temporary};
|
|
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]
|
|
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) -> Temporary<CanvasGradient> {
|
|
reflect_dom_object(box CanvasGradient::new_inherited(style),
|
|
global, CanvasGradientBinding::Wrap)
|
|
}
|
|
}
|
|
|
|
impl<'a> CanvasGradientMethods for JSRef<'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 JSRef<'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))
|
|
}
|
|
}
|
|
}
|
|
}
|