mirror of
https://github.com/servo/servo
synced 2026-05-12 01:46:28 +02:00
9416251cab
Instead of running "update the rendering" at every IPC message, only run it when a timeout has occured in script. In addition, avoid updating the rendering if a rendering update isn't necessary. This should greatly reduce the amount of processing that has to happen in script. Because we are running many fewer calls to "update the rendering" it is reasonable now to ensure that these always work the same way. In particular, we always run rAF and update the animation timeline when updating the ernder In addition, pull the following things out of reflow: - Code dealing with informing the Constellation that a Pipeline has become Idle when waiting for a screenshot. - Detecting when it is time to fulfill the `document.fonts.ready` promise. The latter means that reflow can never cause a garbage collection, making timing of reflows more consistent and simplifying many callsites that need to do script queries. Followup changes will seek to simplify the way that ScriptThread-driven animation timeouts happen even simpler. Testing: In general, this should not change testable behavior so much, though it does seem to fix one test. The main improvement here should be that the ScriptThread does less work. Signed-off-by: Martin Robinson <mrobinson@igalia.com> Co-authored-by: Oriol Brufau <obrufau@igalia.com>
109 lines
3.4 KiB
Rust
109 lines
3.4 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 https://mozilla.org/MPL/2.0/. */
|
|
|
|
use canvas_traits::canvas::{
|
|
CanvasGradientStop, FillOrStrokeStyle, LinearGradientStyle, RadialGradientStyle,
|
|
};
|
|
use dom_struct::dom_struct;
|
|
|
|
use crate::canvas_state::parse_color;
|
|
use crate::dom::bindings::cell::DomRefCell;
|
|
use crate::dom::bindings::codegen::Bindings::CanvasRenderingContext2DBinding::CanvasGradientMethods;
|
|
use crate::dom::bindings::error::{Error, ErrorResult};
|
|
use crate::dom::bindings::num::Finite;
|
|
use crate::dom::bindings::reflector::{Reflector, reflect_dom_object};
|
|
use crate::dom::bindings::root::DomRoot;
|
|
use crate::dom::bindings::str::DOMString;
|
|
use crate::dom::globalscope::GlobalScope;
|
|
use crate::script_runtime::CanGc;
|
|
|
|
// https://html.spec.whatwg.org/multipage/#canvasgradient
|
|
#[dom_struct]
|
|
pub(crate) struct CanvasGradient {
|
|
reflector_: Reflector,
|
|
style: CanvasGradientStyle,
|
|
#[no_trace]
|
|
stops: DomRefCell<Vec<CanvasGradientStop>>,
|
|
}
|
|
|
|
#[derive(Clone, JSTraceable, MallocSizeOf)]
|
|
pub(crate) enum CanvasGradientStyle {
|
|
Linear(#[no_trace] LinearGradientStyle),
|
|
Radial(#[no_trace] RadialGradientStyle),
|
|
}
|
|
|
|
impl CanvasGradient {
|
|
fn new_inherited(style: CanvasGradientStyle) -> CanvasGradient {
|
|
CanvasGradient {
|
|
reflector_: Reflector::new(),
|
|
style,
|
|
stops: DomRefCell::new(Vec::new()),
|
|
}
|
|
}
|
|
|
|
pub(crate) fn new(
|
|
global: &GlobalScope,
|
|
style: CanvasGradientStyle,
|
|
can_gc: CanGc,
|
|
) -> DomRoot<CanvasGradient> {
|
|
reflect_dom_object(
|
|
Box::new(CanvasGradient::new_inherited(style)),
|
|
global,
|
|
can_gc,
|
|
)
|
|
}
|
|
}
|
|
|
|
impl CanvasGradientMethods<crate::DomTypeHolder> for CanvasGradient {
|
|
// https://html.spec.whatwg.org/multipage/#dom-canvasgradient-addcolorstop
|
|
fn AddColorStop(&self, offset: Finite<f64>, color: DOMString) -> ErrorResult {
|
|
if *offset < 0f64 || *offset > 1f64 {
|
|
return Err(Error::IndexSize);
|
|
}
|
|
|
|
let color = match parse_color(None, &color) {
|
|
Ok(color) => color,
|
|
Err(_) => return Err(Error::Syntax),
|
|
};
|
|
|
|
self.stops.borrow_mut().push(CanvasGradientStop {
|
|
offset: (*offset),
|
|
color,
|
|
});
|
|
Ok(())
|
|
}
|
|
}
|
|
|
|
pub(crate) trait ToFillOrStrokeStyle {
|
|
fn to_fill_or_stroke_style(self) -> FillOrStrokeStyle;
|
|
}
|
|
|
|
impl ToFillOrStrokeStyle for &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,
|
|
))
|
|
},
|
|
}
|
|
}
|
|
}
|