[librsvg: 1/17] Rename ResolvedPrimitive to UserSpacePrimitive
- From: Federico Mena Quintero <federico src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [librsvg: 1/17] Rename ResolvedPrimitive to UserSpacePrimitive
- Date: Sat, 17 Apr 2021 01:46:04 +0000 (UTC)
commit d193b20106c96aa0ca423b016f44a4358b5b9f33
Author: Federico Mena Quintero <federico gnome org>
Date: Fri Apr 16 15:34:51 2021 -0500
Rename ResolvedPrimitive to UserSpacePrimitive
src/filters/mod.rs | 21 +++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
---
diff --git a/src/filters/mod.rs b/src/filters/mod.rs
index 910388c9..9db23225 100644
--- a/src/filters/mod.rs
+++ b/src/filters/mod.rs
@@ -87,7 +87,8 @@ pub struct Primitive {
result: Option<CustomIdent>,
}
-pub struct ResolvedPrimitive {
+/// Common properties for filter primitives, with all lengths in user space coordinates.
+pub struct UserSpacePrimitive {
x: Option<f64>,
y: Option<f64>,
width: Option<f64>,
@@ -132,12 +133,12 @@ impl Parse for Input {
}
impl Primitive {
- fn resolve(
+ fn to_user_space(
&self,
ctx: &FilterContext,
values: &ComputedValues,
draw_ctx: &DrawingCtx,
- ) -> ResolvedPrimitive {
+ ) -> UserSpacePrimitive {
let params = draw_ctx.push_coord_units(ctx.primitive_units());
let x = self.x.map(|l| l.normalize(values, ¶ms));
@@ -145,7 +146,7 @@ impl Primitive {
let width = self.width.map(|l| l.normalize(values, ¶ms));
let height = self.height.map(|l| l.normalize(values, ¶ms));
- ResolvedPrimitive {
+ UserSpacePrimitive {
x,
y,
width,
@@ -155,7 +156,7 @@ impl Primitive {
}
}
-impl ResolvedPrimitive {
+impl UserSpacePrimitive {
/// Validates attributes and returns the `BoundsBuilder` for bounds computation.
#[inline]
fn get_bounds(&self, ctx: &FilterContext) -> BoundsBuilder {
@@ -268,11 +269,11 @@ pub fn render(
if let Err(err) = filter
.resolve(&primitive_node)
.and_then(|(primitive, params)| {
- let resolved_primitive =
- primitive.resolve(&filter_ctx, primitive_values, draw_ctx);
+ let user_space_primitive =
+ primitive.to_user_space(&filter_ctx, primitive_values, draw_ctx);
let output = render_primitive(
- &resolved_primitive,
+ &user_space_primitive,
¶ms,
&filter_ctx,
acquired_nodes,
@@ -280,7 +281,7 @@ pub fn render(
)?;
Ok(FilterResult {
- name: resolved_primitive.result,
+ name: user_space_primitive.result,
output,
})
})
@@ -319,7 +320,7 @@ pub fn render(
#[rustfmt::skip]
fn render_primitive(
- primitive: &ResolvedPrimitive,
+ primitive: &UserSpacePrimitive,
params: &PrimitiveParams,
ctx: &FilterContext,
acquired_nodes: &mut AcquiredNodes<'_>,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]