[librsvg: 43/90] DrawingCtx::mask_surface(): inline into its only caller
- From: Federico Mena Quintero <federico src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [librsvg: 43/90] DrawingCtx::mask_surface(): inline into its only caller
- Date: Tue, 26 Mar 2019 19:15:40 +0000 (UTC)
commit 19fb7e853301b199714831256091cc9fd6166afa
Author: Federico Mena Quintero <federico gnome org>
Date: Thu Mar 14 18:54:12 2019 -0600
DrawingCtx::mask_surface(): inline into its only caller
rsvg_internals/src/drawing_ctx.rs | 8 --------
rsvg_internals/src/mask.rs | 7 ++++++-
2 files changed, 6 insertions(+), 9 deletions(-)
---
diff --git a/rsvg_internals/src/drawing_ctx.rs b/rsvg_internals/src/drawing_ctx.rs
index b2d42ecf..7c6449db 100644
--- a/rsvg_internals/src/drawing_ctx.rs
+++ b/rsvg_internals/src/drawing_ctx.rs
@@ -843,14 +843,6 @@ impl DrawingCtx {
res.and_then(|_| self.check_limits())
}
- pub fn mask_surface(&mut self, mask: &cairo::ImageSurface) {
- let cr = self.get_cairo_context();
-
- cr.identity_matrix();
-
- cr.mask_surface(&mask, 0.0, 0.0);
- }
-
pub fn add_node_and_ancestors_to_stack(&mut self, node: &RsvgNode) {
self.drawsub_stack.push(node.clone());
if let Some(ref parent) = node.get_parent() {
diff --git a/rsvg_internals/src/mask.rs b/rsvg_internals/src/mask.rs
index 502e2125..dc80821d 100644
--- a/rsvg_internals/src/mask.rs
+++ b/rsvg_internals/src/mask.rs
@@ -140,7 +140,12 @@ impl NodeMask {
let Opacity(opacity) = values.opacity;
let mask_surface = compute_luminance_to_alpha(surface, opacity)?;
- draw_ctx.mask_surface(&mask_surface);
+
+ let cr = draw_ctx.get_cairo_context();
+
+ cr.identity_matrix();
+
+ cr.mask_surface(&mask_surface, 0.0, 0.0);
Ok(())
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]