mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-24 10:45:42 +00:00
5a62942911
Servo currently uses `heapsize`, but Stylo/Gecko use `malloc_size_of`. `malloc_size_of` is better -- it handles various cases that `heapsize` does not -- so this patch changes Servo to use `malloc_size_of`. This patch makes the following changes to the `malloc_size_of` crate. - Adds `MallocSizeOf` trait implementations for numerous types, some built-in (e.g. `VecDeque`), some external and Servo-only (e.g. `string_cache`). - Makes `enclosing_size_of_op` optional, because vanilla jemalloc doesn't support that operation. - For `HashSet`/`HashMap`, falls back to a computed estimate when `enclosing_size_of_op` isn't available. - Adds an extern "C" `malloc_size_of` function that does the actual heap measurement; this is based on the same functions from the `heapsize` crate. This patch makes the following changes elsewhere. - Converts all the uses of `heapsize` to instead use `malloc_size_of`. - Disables the "heapsize"/"heap_size" feature for the external crates that provide it. - Removes the `HeapSizeOf` implementation from `hashglobe`. - Adds `ignore` annotations to a few `Rc`/`Arc`, because `malloc_size_of` doesn't derive those types, unlike `heapsize`. <!-- Please describe your changes on the following line: --> --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: --> - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [ ] These changes fix https://bugzilla.mozilla.org/show_bug.cgi?id=1409255 <!-- Either: --> - [ ] There are tests for these changes OR - [ ] These changes do not require tests because testing is on the Gecko side. <!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.--> <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. --> Source-Repo: https://github.com/servo/servo Source-Revision: 4c538b642e4bdfbf42c522c5a59c258a6d14546e --HG-- extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear extra : subtree_revision : f9a6feed1088d0b0be2b55d7f0c2ec9c594ac33b
104 lines
4.1 KiB
Rust
104 lines
4.1 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 canvas_traits::canvas::{CanvasGradientStop, FillOrStrokeStyle, LinearGradientStyle, RadialGradientStyle};
|
|
use cssparser::{Parser, ParserInput, RGBA};
|
|
use cssparser::Color as CSSColor;
|
|
use dom::bindings::cell::DomRefCell;
|
|
use dom::bindings::codegen::Bindings::CanvasGradientBinding;
|
|
use dom::bindings::codegen::Bindings::CanvasGradientBinding::CanvasGradientMethods;
|
|
use dom::bindings::error::{Error, ErrorResult};
|
|
use dom::bindings::num::Finite;
|
|
use dom::bindings::reflector::{Reflector, reflect_dom_object};
|
|
use dom::bindings::root::DomRoot;
|
|
use dom::bindings::str::DOMString;
|
|
use dom::globalscope::GlobalScope;
|
|
use dom_struct::dom_struct;
|
|
|
|
// https://html.spec.whatwg.org/multipage/#canvasgradient
|
|
#[dom_struct]
|
|
pub struct CanvasGradient {
|
|
reflector_: Reflector,
|
|
style: CanvasGradientStyle,
|
|
stops: DomRefCell<Vec<CanvasGradientStop>>,
|
|
}
|
|
|
|
#[derive(Clone, JSTraceable, MallocSizeOf)]
|
|
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: &GlobalScope, style: CanvasGradientStyle) -> DomRoot<CanvasGradient> {
|
|
reflect_dom_object(Box::new(CanvasGradient::new_inherited(style)),
|
|
global,
|
|
CanvasGradientBinding::Wrap)
|
|
}
|
|
}
|
|
|
|
impl CanvasGradientMethods 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 mut input = ParserInput::new(&color);
|
|
let mut parser = Parser::new(&mut input);
|
|
let color = CSSColor::parse(&mut parser);
|
|
let color = if parser.is_exhausted() {
|
|
match color {
|
|
Ok(CSSColor::RGBA(rgba)) => rgba,
|
|
Ok(CSSColor::CurrentColor) => RGBA::new(0, 0, 0, 255),
|
|
_ => return Err(Error::Syntax)
|
|
}
|
|
} else {
|
|
return Err(Error::Syntax)
|
|
};
|
|
|
|
self.stops.borrow_mut().push(CanvasGradientStop {
|
|
offset: (*offset) as f64,
|
|
color: color,
|
|
});
|
|
Ok(())
|
|
}
|
|
}
|
|
|
|
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))
|
|
}
|
|
}
|
|
}
|
|
}
|