[librsvg: 81/90] Rename "node" to "mask_node" when appropriate



commit 736a22adfe28914165509e6e2afc82cdf7c8533f
Author: Federico Mena Quintero <federico gnome org>
Date:   Fri Mar 22 11:04:06 2019 -0600

    Rename "node" to "mask_node" when appropriate

 rsvg_internals/src/drawing_ctx.rs |  6 +++---
 rsvg_internals/src/mask.rs        | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/rsvg_internals/src/drawing_ctx.rs b/rsvg_internals/src/drawing_ctx.rs
index acc3df9d..08fa9edb 100644
--- a/rsvg_internals/src/drawing_ctx.rs
+++ b/rsvg_internals/src/drawing_ctx.rs
@@ -526,12 +526,12 @@ impl DrawingCtx {
                         if let Some(acquired) =
                             dc.get_acquired_node_of_type(Some(mask), NodeType::Mask)
                         {
-                            let node = acquired.get();
+                            let mask_node = acquired.get();
 
                             res = res.and_then(|_| {
-                                node.with_impl(|mask: &NodeMask| {
+                                mask_node.with_impl(|mask: &NodeMask| {
                                     let bbox = dc.bbox;
-                                    mask.generate_cairo_mask(&node, &affines, dc, &bbox)
+                                    mask.generate_cairo_mask(&mask_node, &affines, dc, &bbox)
                                 })
                             });
                         } else {
diff --git a/rsvg_internals/src/mask.rs b/rsvg_internals/src/mask.rs
index ad80e460..da5250a9 100644
--- a/rsvg_internals/src/mask.rs
+++ b/rsvg_internals/src/mask.rs
@@ -48,7 +48,7 @@ impl NodeMask {
 
     pub fn generate_cairo_mask(
         &self,
-        node: &RsvgNode,
+        mask_node: &RsvgNode,
         affines: &CompositingAffines,
         draw_ctx: &mut DrawingCtx,
         bbox: &BoundingBox,
@@ -61,7 +61,7 @@ impl NodeMask {
 
         let bbox_rect = bbox.rect.as_ref().unwrap();
 
-        let cascaded = node.get_cascaded_values();
+        let cascaded = mask_node.get_cascaded_values();
         let values = cascaded.get();
 
         let mask_content_surface = draw_ctx.create_surface_for_toplevel_viewport()?;
@@ -91,7 +91,7 @@ impl NodeMask {
 
             let mask_cr = cairo::Context::new(&mask_content_surface);
             mask_cr.set_matrix(affines.for_temporary_surface);
-            mask_cr.transform(node.get_transform());
+            mask_cr.transform(mask_node.get_transform());
 
             draw_ctx.set_cairo_context(&mask_cr);
 
@@ -124,8 +124,8 @@ impl NodeMask {
                     draw_ctx.get_view_params()
                 };
 
-                let res = draw_ctx.with_discrete_layer(node, values, false, &mut |dc| {
-                    node.draw_children(&cascaded, dc, false)
+                let res = draw_ctx.with_discrete_layer(mask_node, values, false, &mut |dc| {
+                    mask_node.draw_children(&cascaded, dc, false)
                 });
 
                 draw_ctx.set_cairo_context(&save_cr);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]