Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

clippy: fix warnings in components/canvas #31563

Merged
merged 1 commit into from
Mar 8, 2024
Merged

clippy: fix warnings in components/canvas #31563

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
42 changes: 19 additions & 23 deletions components/canvas/canvas_data.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,23 +74,23 @@ impl PathState {
pub trait Backend {
fn get_composition_op(&self, opts: &DrawOptions) -> CompositionOp;
fn need_to_draw_shadow(&self, color: &Color) -> bool;
fn set_shadow_color<'a>(&mut self, color: RGBA, state: &mut CanvasPaintState<'a>);
fn set_fill_style<'a>(
fn set_shadow_color(&mut self, color: RGBA, state: &mut CanvasPaintState<'_>);
fn set_fill_style(
&mut self,
style: FillOrStrokeStyle,
state: &mut CanvasPaintState<'a>,
state: &mut CanvasPaintState<'_>,
drawtarget: &dyn GenericDrawTarget,
);
fn set_stroke_style<'a>(
fn set_stroke_style(
&mut self,
style: FillOrStrokeStyle,
state: &mut CanvasPaintState<'a>,
state: &mut CanvasPaintState<'_>,
drawtarget: &dyn GenericDrawTarget,
);
fn set_global_composition<'a>(
fn set_global_composition(
&mut self,
op: CompositionOrBlending,
state: &mut CanvasPaintState<'a>,
state: &mut CanvasPaintState<'_>,
);
fn create_drawtarget(&self, size: Size2D<u64>) -> Box<dyn GenericDrawTarget>;
fn recreate_paint_state<'a>(&self, state: &CanvasPaintState<'a>) -> CanvasPaintState<'a>;
Expand Down Expand Up @@ -222,10 +222,9 @@ impl<'a> PathBuilderRef<'a> {
Some(i) => i,
None => return None,
};
match self.builder.get_current_point() {
Some(point) => Some(inverse.transform_point(Point2D::new(point.x, point.y))),
None => None,
}
self.builder
.get_current_point()
.map(|point| inverse.transform_point(Point2D::new(point.x, point.y)))
}

fn close(&mut self) {
Expand Down Expand Up @@ -428,7 +427,7 @@ impl<'a> CanvasData<'a> {
let source_rect = source_rect.ceil();
// It discards the extra pixels (if any) that won't be painted
let image_data = if Rect::from_size(image_size).contains_rect(&source_rect) {
pixels::rgba8_get_rect(&image_data, image_size.to_u64(), source_rect.to_u64()).into()
pixels::rgba8_get_rect(image_data, image_size.to_u64(), source_rect.to_u64()).into()
} else {
image_data.into()
};
Expand Down Expand Up @@ -493,7 +492,7 @@ impl<'a> CanvasData<'a> {
let font = font_style.map_or_else(
|| load_system_font_from_style(None),
|style| {
with_thread_local_font_context(&self, |font_context| {
with_thread_local_font_context(self, |font_context| {
let font_group = font_context.font_group(ServoArc::new(style.clone()));
let font = font_group
.borrow_mut()
Expand Down Expand Up @@ -651,7 +650,7 @@ impl<'a> CanvasData<'a> {
}

if self.need_to_draw_shadow() {
self.draw_with_shadow(&rect, |new_draw_target: &mut dyn GenericDrawTarget| {
self.draw_with_shadow(rect, |new_draw_target: &mut dyn GenericDrawTarget| {
new_draw_target.stroke_rect(
rect,
self.state.stroke_style.clone(),
Expand Down Expand Up @@ -918,7 +917,7 @@ impl<'a> CanvasData<'a> {
Some(p) => p,
None => {
self.path_builder().move_to(cp1);
cp1.clone()
*cp1
},
};
let cp1 = *cp1;
Expand Down Expand Up @@ -1042,7 +1041,7 @@ impl<'a> CanvasData<'a> {
}
},
}
self.state.transform = transform.clone();
self.state.transform = *transform;
self.drawtarget.set_transform(transform)
}

Expand Down Expand Up @@ -1200,10 +1199,7 @@ impl<'a> CanvasData<'a> {
draw_shadow_source(&mut *new_draw_target);
self.drawtarget.draw_surface_with_shadow(
new_draw_target.snapshot(),
&Point2D::new(
shadow_src_rect.origin.x as f32,
shadow_src_rect.origin.y as f32,
),
&Point2D::new(shadow_src_rect.origin.x, shadow_src_rect.origin.y),
&self.state.shadow_color,
&Vector2D::new(
self.state.shadow_offset_x as f32,
Expand Down Expand Up @@ -1394,18 +1390,18 @@ fn load_system_font_from_style(font_style: Option<&FontStyleStruct>) -> Option<F
})
.weight(Weight(style.font_weight.value()))
.stretch(Stretch(style.font_stretch.to_percentage().0));
let font_handle = match SystemSource::new().select_best_match(&family_names, &properties) {
let font_handle = match SystemSource::new().select_best_match(&family_names, properties) {
Ok(handle) => handle,
Err(e) => {
error!("error getting font handle for style {:?}: {}", style, e);
return load_default_system_fallback_font(&properties);
return load_default_system_fallback_font(properties);
},
};
match font_handle.load() {
Ok(f) => Some(f),
Err(e) => {
error!("error loading font for style {:?}: {}", style, e);
load_default_system_fallback_font(&properties)
load_default_system_fallback_font(properties)
},
}
}
Expand Down
6 changes: 3 additions & 3 deletions components/canvas/canvas_paint_thread.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ impl<'a> CanvasPaintThread<'a> {

let font_cache_thread = self.font_cache_thread.clone();

let canvas_id = self.next_canvas_id.clone();
let canvas_id = self.next_canvas_id;
self.next_canvas_id.0 += 1;

let canvas_data = CanvasData::new(
Expand All @@ -139,7 +139,7 @@ impl<'a> CanvasPaintThread<'a> {
antialias,
font_cache_thread,
);
self.canvases.insert(canvas_id.clone(), canvas_data);
self.canvases.insert(canvas_id, canvas_data);

canvas_id
}
Expand Down Expand Up @@ -181,7 +181,7 @@ impl<'a> CanvasPaintThread<'a> {
source_rect,
smoothing_enabled,
) => self.canvas(canvas_id).draw_image(
&*image_data,
image_data,
image_size,
dest_rect,
source_rect,
Expand Down
59 changes: 27 additions & 32 deletions components/canvas/raqote_backend.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,36 +29,36 @@ impl Backend for RaqoteBackend {
color.as_raqote().a != 0
}

fn set_shadow_color<'a>(&mut self, color: RGBA, state: &mut CanvasPaintState<'a>) {
fn set_shadow_color(&mut self, color: RGBA, state: &mut CanvasPaintState<'_>) {
state.shadow_color = Color::Raqote(color.to_raqote_style());
}

fn set_fill_style<'a>(
fn set_fill_style(
&mut self,
style: FillOrStrokeStyle,
state: &mut CanvasPaintState<'a>,
state: &mut CanvasPaintState<'_>,
_drawtarget: &dyn GenericDrawTarget,
) {
if let Some(pattern) = style.to_raqote_pattern() {
state.fill_style = canvas_data::Pattern::Raqote(pattern);
}
}

fn set_stroke_style<'a>(
fn set_stroke_style(
&mut self,
style: FillOrStrokeStyle,
state: &mut CanvasPaintState<'a>,
state: &mut CanvasPaintState<'_>,
_drawtarget: &dyn GenericDrawTarget,
) {
if let Some(pattern) = style.to_raqote_pattern() {
state.stroke_style = canvas_data::Pattern::Raqote(pattern);
}
}

fn set_global_composition<'a>(
fn set_global_composition(
&mut self,
op: CompositionOrBlending,
state: &mut CanvasPaintState<'a>,
state: &mut CanvasPaintState<'_>,
) {
state.draw_options.as_raqote_mut().blend_mode = op.to_raqote_style();
}
Expand Down Expand Up @@ -125,9 +125,9 @@ pub struct LinearGradientPattern {
impl LinearGradientPattern {
fn new(start: Point2D<f32>, end: Point2D<f32>, stops: Vec<raqote::GradientStop>) -> Self {
LinearGradientPattern {
gradient: raqote::Gradient { stops: stops },
start: start,
end: end,
gradient: raqote::Gradient { stops },
start,
end,
}
}
}
Expand All @@ -150,11 +150,11 @@ impl RadialGradientPattern {
stops: Vec<raqote::GradientStop>,
) -> Self {
RadialGradientPattern {
gradient: raqote::Gradient { stops: stops },
center1: center1,
radius1: radius1,
center2: center2,
radius2: radius2,
gradient: raqote::Gradient { stops },
center1,
radius1,
center2,
radius2,
}
}
}
Expand All @@ -177,10 +177,10 @@ impl<'a> SurfacePattern<'a> {
},
};
SurfacePattern {
image: image,
filter: filter,
extend: extend,
repeat: repeat,
image,
filter,
extend,
repeat,
transform: Transform2D::identity(),
}
}
Expand Down Expand Up @@ -389,7 +389,7 @@ impl GenericDrawTarget for raqote::DrawTarget {
fn create_gradient_stops(&self, gradient_stops: Vec<GradientStop>) -> GradientStops {
let mut stops = gradient_stops
.into_iter()
.map(|item| item.as_raqote().clone())
.map(|item| *item.as_raqote())
.collect::<Vec<raqote::GradientStop>>();
// https://www.w3.org/html/test/results/2dcontext/annotated-spec/canvas.html#testrefs.2d.gradient.interpolate.overlap
stops.sort_by(|a, b| a.position.partial_cmp(&b.position).unwrap());
Expand Down Expand Up @@ -492,7 +492,7 @@ impl GenericDrawTarget for raqote::DrawTarget {
raqote::BlendMode::SrcOut |
raqote::BlendMode::DstIn |
raqote::BlendMode::DstAtop => {
let mut options = draw_options.as_raqote().clone();
let mut options = *draw_options.as_raqote();
self.push_layer_with_blend(1., options.blend_mode);
options.blend_mode = raqote::BlendMode::SrcOver;
self.fill(path.as_raqote(), &pattern.source(), &options);
Expand Down Expand Up @@ -654,22 +654,17 @@ impl GenericDrawTarget for raqote::DrawTarget {
#[allow(unsafe_code)]
fn snapshot_data(&self, f: &dyn Fn(&[u8]) -> Vec<u8>) -> Vec<u8> {
let v = self.get_data();
f(unsafe {
std::slice::from_raw_parts(
v.as_ptr() as *const u8,
v.len() * std::mem::size_of::<u32>(),
)
})
f(
unsafe {
std::slice::from_raw_parts(v.as_ptr() as *const u8, std::mem::size_of_val(v))
},
)
}
#[allow(unsafe_code)]
fn snapshot_data_owned(&self) -> Vec<u8> {
let v = self.get_data();
unsafe {
std::slice::from_raw_parts(
v.as_ptr() as *const u8,
v.len() * std::mem::size_of::<u32>(),
)
.into()
std::slice::from_raw_parts(v.as_ptr() as *const u8, std::mem::size_of_val(v)).into()
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion components/canvas/webgl_mode/inprocess.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ impl WebGLComm {
WebGLComm {
webgl_threads: WebGLThreads(sender),
image_handler: Box::new(external),
webxr_layer_grand_manager: webxr_layer_grand_manager,
webxr_layer_grand_manager,
}
}
}
Expand Down