[librsvg: 19/22] Rename get_node_of_type() to just acquire()

[Federico Mena Quintero <federico src gnome org>]

commit 2421bab600e4817596918ee70825853215af917d
Author: Federico Mena Quintero <federico gnome org>
Date:   Wed Oct 2 09:57:27 2019 -0500

    Rename get_node_of_type() to just acquire()

 rsvg_internals/src/drawing_ctx.rs   | 22 ++++++++--------------
 rsvg_internals/src/filters/image.rs |  2 +-
 rsvg_internals/src/gradient.rs      |  2 +-
 rsvg_internals/src/marker.rs        |  4 +---
 rsvg_internals/src/pattern.rs       |  2 +-
 rsvg_internals/src/structure.rs     |  2 +-
 rsvg_internals/src/text.rs          |  2 +-
 7 files changed, 14 insertions(+), 22 deletions(-)
---
diff --git a/rsvg_internals/src/drawing_ctx.rs b/rsvg_internals/src/drawing_ctx.rs
index f3800d10..e9223b9a 100644
--- a/rsvg_internals/src/drawing_ctx.rs
+++ b/rsvg_internals/src/drawing_ctx.rs
@@ -342,7 +342,7 @@ impl DrawingCtx {
         clip_uri
             .and_then(|fragment| {
                 self.acquired_nodes
-                    .get_node_of_type(fragment, &[NodeType::ClipPath])
+                    .acquire(fragment, &[NodeType::ClipPath])
                     .ok()
             })
             .and_then(|acquired| {
@@ -474,7 +474,7 @@ impl DrawingCtx {
                     if let Some(fragment) = mask {
                         if let Ok(acquired) = dc
                             .acquired_nodes
-                            .get_node_of_type(fragment, &[NodeType::Mask])
+                            .acquire(fragment, &[NodeType::Mask])
                         {
                             let mask_node = acquired.get();
 
@@ -557,7 +557,7 @@ impl DrawingCtx {
     ) -> Result<cairo::ImageSurface, RenderingError> {
         match self
             .acquired_nodes
-            .get_node_of_type(filter_uri, &[NodeType::Filter])
+            .acquire(filter_uri, &[NodeType::Filter])
         {
             Ok(acquired) => {
                 let filter_node = acquired.get();
@@ -609,7 +609,7 @@ impl DrawingCtx {
     }
 
     fn acquire_paint_server(&self, fragment: &Fragment) -> Result<AcquiredNode, AcquireError> {
-        self.acquired_nodes.get_node_of_type(
+        self.acquired_nodes.acquire(
             fragment,
             &[
                 NodeType::LinearGradient,
@@ -1103,15 +1103,6 @@ impl AcquiredNodes {
         }
     }
 
-    // Use this function when looking up urls to other nodes. This function
-    // does proper recursion checking and thereby avoids infinite loops.
-    //
-    // Nodes acquired by this function must be released in reverse
-    // acquiring order.
-    //
-    // Note that if you acquire a node, you have to release it before trying to
-    // acquire it again.  If you acquire a node "#foo" and don't release it before
-    // trying to acquire "foo" again, you will obtain a %NULL the second time.
     fn lookup_node(&self, fragment: &Fragment) -> Result<AcquiredNode, AcquireError> {
         let node = self.svg.lookup(fragment).map_err(|_| {
             // FIXME: callers shouldn't have to know that get_node() can initiate a file load.
@@ -1138,6 +1129,9 @@ impl AcquiredNodes {
     // the node to be of a particular type. This function does proper recursion
     // checking and thereby avoids infinite loops.
     //
+    // Nodes acquired by this function must be released in reverse
+    // acquiring order.
+    //
     // Specify an empty slice for `node_types` if you want a node of any type.
     //
     // Malformed SVGs, for example, may reference a marker by its IRI, but
@@ -1146,7 +1140,7 @@ impl AcquiredNodes {
     // Note that if you acquire a node, you have to release it before trying to
     // acquire it again.  If you acquire a node "#foo" and don't release it before
     // trying to acquire "foo" again, you will obtain a None the second time.
-    pub fn get_node_of_type(
+    pub fn acquire(
         &self,
         fragment: &Fragment,
         node_types: &[NodeType],
diff --git a/rsvg_internals/src/filters/image.rs b/rsvg_internals/src/filters/image.rs
index 86c563ef..aee13153 100644
--- a/rsvg_internals/src/filters/image.rs
+++ b/rsvg_internals/src/filters/image.rs
@@ -46,7 +46,7 @@ impl Image {
     ) -> Result<ImageSurface, FilterError> {
         let acquired_drawable = draw_ctx
             .acquired_nodes()
-            .get_node_of_type(fragment, &[])
+            .acquire(fragment, &[])
             .map_err(|_| FilterError::InvalidInput)?;
         let drawable = acquired_drawable.get();
 
diff --git a/rsvg_internals/src/gradient.rs b/rsvg_internals/src/gradient.rs
index 614050e3..71e65785 100644
--- a/rsvg_internals/src/gradient.rs
+++ b/rsvg_internals/src/gradient.rs
@@ -781,7 +781,7 @@ fn acquire_gradient<'a>(
     draw_ctx: &'a mut DrawingCtx,
     fragment: &Fragment,
 ) -> Result<AcquiredNode, AcquireError> {
-    draw_ctx.acquired_nodes().get_node_of_type(fragment, &[NodeType::LinearGradient, 
NodeType::RadialGradient])
+    draw_ctx.acquired_nodes().acquire(fragment, &[NodeType::LinearGradient, NodeType::RadialGradient])
 }
 
 #[cfg(test)]
diff --git a/rsvg_internals/src/marker.rs b/rsvg_internals/src/marker.rs
index 090df1e9..94850fb2 100644
--- a/rsvg_internals/src/marker.rs
+++ b/rsvg_internals/src/marker.rs
@@ -588,9 +588,7 @@ fn emit_marker_by_name(
     line_width: f64,
     clipping: bool,
 ) -> Result<BoundingBox, RenderingError> {
-    if let Ok(acquired) = draw_ctx
-        .acquired_nodes()
-        .get_node_of_type(name, &[NodeType::Marker])
+    if let Ok(acquired) = draw_ctx.acquired_nodes().acquire(name, &[NodeType::Marker])
     {
         let node = acquired.get();
 
diff --git a/rsvg_internals/src/pattern.rs b/rsvg_internals/src/pattern.rs
index c237095e..44aa740b 100644
--- a/rsvg_internals/src/pattern.rs
+++ b/rsvg_internals/src/pattern.rs
@@ -170,7 +170,7 @@ impl PaintSource for NodePattern {
 
         while !pattern.is_resolved() {
             if let Some(ref fragment) = fallback {
-                match draw_ctx.acquired_nodes().get_node_of_type(&fragment, &[NodeType::Pattern]) {
+                match draw_ctx.acquired_nodes().acquire(&fragment, &[NodeType::Pattern]) {
                     Ok(acquired) => {
                         let acquired_node = acquired.get();
 
diff --git a/rsvg_internals/src/structure.rs b/rsvg_internals/src/structure.rs
index 62224e14..de66e30f 100644
--- a/rsvg_internals/src/structure.rs
+++ b/rsvg_internals/src/structure.rs
@@ -315,7 +315,7 @@ impl NodeTrait for NodeUse {
 
         let link = self.link.as_ref().unwrap();
 
-        let child = if let Ok(acquired) = draw_ctx.acquired_nodes().get_node_of_type(link, &[]) {
+        let child = if let Ok(acquired) = draw_ctx.acquired_nodes().acquire(link, &[]) {
             // Here we clone the acquired child, so that we can drop the AcquiredNode as
             // early as possible.  This is so that the child's drawing method will be able
             // to re-acquire the child for other purposes.
diff --git a/rsvg_internals/src/text.rs b/rsvg_internals/src/text.rs
index a563a235..9870f724 100644
--- a/rsvg_internals/src/text.rs
+++ b/rsvg_internals/src/text.rs
@@ -676,7 +676,7 @@ impl NodeTRef {
         let link = self.link.as_ref().unwrap();
         let values = cascaded.get();
 
-        if let Ok(acquired) = draw_ctx.acquired_nodes().get_node_of_type(link, &[]) {
+        if let Ok(acquired) = draw_ctx.acquired_nodes().acquire(link, &[]) {
             let c = acquired.get();
             extract_chars_children_to_chunks_recursively(chunks, &c, values, depth);
         } else {