aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/canvas_state.rs
diff options
context:
space:
mode:
authorSamson <16504129+sagudev@users.noreply.github.com>2023-08-04 12:17:43 +0200
committerGitHub <noreply@github.com>2023-08-04 10:17:43 +0000
commit9514f670d12b4d92514c1402d686e694f3f234a5 (patch)
treecd847449b332ac27b6018fbe8a83a248af020c5a /components/script/canvas_state.rs
parent66e0d543cfbaecb08ade2e071d6575f9f72f4dbb (diff)
downloadservo-9514f670d12b4d92514c1402d686e694f3f234a5.tar.gz
servo-9514f670d12b4d92514c1402d686e694f3f234a5.zip
No tracing of nop traceable fields (#29926)
* Add `no_trace` option to JSTraceable derive * NoTrace wrapper * Port some types to no_trace schematics * Fixing my unsafe mistakes (not tracing traceables) * Add docs & safety guards for no_trace Safety guards (trait shenanigans) guarantees safety usage of `no_trace` * Port canvas_traits to no_trace * Port servo_media to no_trace * Port net_traits to no_trace * Port style to no_trace * Port webgpu to no_trace * Port script_traits to no_trace * Port canvas_traits, devtools_traits, embedder_traits, profile_traits to no_trace * unrooted_must_root lint in seperate file * Add trace_in_no_trace_lint as script_plugin * Composable types in must_not_have_traceable * Introduced HashMapTracedValues wrapper * `HashMap<NoTrace<K>,V>`->`HashMapTracedValues<K,V>` * Port rest of servo's types to no_trace * Port html5ever, euclid, mime and http to no_trace * Port remaining externals to no_trace * Port webxr and Arc<Mutex<_>> * Fix spelling in notrace doc
Diffstat (limited to 'components/script/canvas_state.rs')
-rw-r--r--components/script/canvas_state.rs17
1 files changed, 16 insertions, 1 deletions
diff --git a/components/script/canvas_state.rs b/components/script/canvas_state.rs
index 3dacd34ec48..fc1eff7df8b 100644
--- a/components/script/canvas_state.rs
+++ b/components/script/canvas_state.rs
@@ -61,7 +61,7 @@ use style_traits::values::ToCss;
#[derive(Clone, JSTraceable, MallocSizeOf)]
#[allow(dead_code)]
pub(crate) enum CanvasFillOrStrokeStyle {
- Color(RGBA),
+ Color(#[no_trace] RGBA),
Gradient(Dom<CanvasGradient>),
Pattern(Dom<CanvasPattern>),
}
@@ -80,22 +80,31 @@ impl CanvasFillOrStrokeStyle {
#[derive(Clone, JSTraceable, MallocSizeOf)]
pub(crate) struct CanvasContextState {
global_alpha: f64,
+ #[no_trace]
global_composition: CompositionOrBlending,
image_smoothing_enabled: bool,
fill_style: CanvasFillOrStrokeStyle,
stroke_style: CanvasFillOrStrokeStyle,
line_width: f64,
+ #[no_trace]
line_cap: LineCapStyle,
+ #[no_trace]
line_join: LineJoinStyle,
miter_limit: f64,
+ #[no_trace]
transform: Transform2D<f32>,
shadow_offset_x: f64,
shadow_offset_y: f64,
shadow_blur: f64,
+ #[no_trace]
shadow_color: RGBA,
+ #[no_trace]
font_style: Option<Font>,
+ #[no_trace]
text_align: TextAlign,
+ #[no_trace]
text_baseline: TextBaseline,
+ #[no_trace]
direction: Direction,
}
@@ -131,17 +140,23 @@ impl CanvasContextState {
#[derive(JSTraceable, MallocSizeOf)]
pub(crate) struct CanvasState {
#[ignore_malloc_size_of = "Defined in ipc-channel"]
+ #[no_trace]
ipc_renderer: IpcSender<CanvasMsg>,
+ #[no_trace]
canvas_id: CanvasId,
state: DomRefCell<CanvasContextState>,
origin_clean: Cell<bool>,
#[ignore_malloc_size_of = "Arc"]
+ #[no_trace]
image_cache: Arc<dyn ImageCache>,
/// The base URL for resolving CSS image URL values.
/// Needed because of https://github.com/servo/servo/issues/17625
+ #[no_trace]
base_url: ServoUrl,
+ #[no_trace]
origin: ImmutableOrigin,
/// Any missing image URLs.
+ #[no_trace]
missing_image_urls: DomRefCell<Vec<ServoUrl>>,
saved_states: DomRefCell<Vec<CanvasContextState>>,
}