[librsvg: 2/3] pattern: shorten code
- From: Federico Mena Quintero <federico src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [librsvg: 2/3] pattern: shorten code
- Date: Sat, 17 Nov 2018 13:59:41 +0000 (UTC)
commit 8691ea938ac09ca42fb04600217a1ed60356cadf
Author: Paolo Borelli <pborelli gnome org>
Date: Sat Nov 17 14:07:03 2018 +0100
pattern: shorten code
It also more consistent with similar code in gradient.rs
rsvg_internals/src/pattern.rs | 15 ++-------------
1 file changed, 2 insertions(+), 13 deletions(-)
---
diff --git a/rsvg_internals/src/pattern.rs b/rsvg_internals/src/pattern.rs
index a763bda9..17a8088e 100644
--- a/rsvg_internals/src/pattern.rs
+++ b/rsvg_internals/src/pattern.rs
@@ -447,17 +447,6 @@ fn set_pattern_on_draw_context(
res.and_then(|_| Ok(true))
}
-fn resolve_fallbacks_and_set_pattern(
- pattern: &Pattern,
- values: &ComputedValues,
- draw_ctx: &mut DrawingCtx<'_>,
- bbox: &BoundingBox,
-) -> Result<bool, RenderingError> {
- let resolved = resolve_pattern(pattern, draw_ctx);
-
- set_pattern_on_draw_context(&resolved, values, draw_ctx, bbox)
-}
-
pub fn pattern_resolve_fallbacks_and_set_pattern(
node: &RsvgNode,
draw_ctx: &mut DrawingCtx<'_>,
@@ -467,10 +456,10 @@ pub fn pattern_resolve_fallbacks_and_set_pattern(
node.with_impl(|node_pattern: &NodePattern| {
let pattern = &*node_pattern.pattern.borrow();
+ let resolved = resolve_pattern(pattern, draw_ctx);
let cascaded = node.get_cascaded_values();
let values = cascaded.get();
-
- resolve_fallbacks_and_set_pattern(pattern, values, draw_ctx, bbox)
+ set_pattern_on_draw_context(&resolved, values, draw_ctx, bbox)
})
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]