[librsvg: 11/14] filters: port context to ExclusiveImageSurface

[Federico Mena Quintero <federico src gnome org>]

commit 9271fce170e75583e1ebea9f9d35d76438dca373
Author: Paolo Borelli <pborelli gnome org>
Date:   Tue Jan 14 20:56:55 2020 +0100

    filters: port context to ExclusiveImageSurface

 rsvg_internals/src/filters/context.rs | 64 +++++++++++++++++------------------
 1 file changed, 31 insertions(+), 33 deletions(-)
---
diff --git a/rsvg_internals/src/filters/context.rs b/rsvg_internals/src/filters/context.rs
index 2e427297..74c0dbec 100644
--- a/rsvg_internals/src/filters/context.rs
+++ b/rsvg_internals/src/filters/context.rs
@@ -10,7 +10,9 @@ use crate::node::RsvgNode;
 use crate::paint_server::PaintServer;
 use crate::properties::ComputedValues;
 use crate::rect::IRect;
-use crate::surface_utils::shared_surface::{SharedImageSurface, SurfaceType};
+use crate::surface_utils::shared_surface::{
+    ExclusiveImageSurface, SharedImageSurface, SurfaceType,
+};
 use crate::unit_interval::UnitInterval;
 
 use super::error::FilterError;
@@ -274,34 +276,38 @@ impl FilterContext {
         draw_ctx: &mut DrawingCtx,
         paint_server: &PaintServer,
         opacity: UnitInterval,
-    ) -> Result<cairo::ImageSurface, cairo::Status> {
-        let surface = cairo::ImageSurface::create(
-            cairo::Format::ARgb32,
+    ) -> Result<SharedImageSurface, cairo::Status> {
+        let mut surface = ExclusiveImageSurface::new(
             self.source_surface.width(),
             self.source_surface.height(),
+            SurfaceType::SRgb,
         )?;
 
-        let cr_save = draw_ctx.get_cairo_context();
-        let cr = cairo::Context::new(&surface);
-        draw_ctx.set_cairo_context(&cr);
-
-        // FIXME: we are ignoring the following error; propagate it upstream
-        let _ = draw_ctx
-            .set_source_paint_server(
-                paint_server,
-                opacity,
-                &self.node_bbox,
-                self.computed_from_node_being_filtered.color.0,
-            )
-            .and_then(|had_paint_server| {
-                if had_paint_server {
-                    cr.paint();
-                }
-                Ok(())
-            });
-
-        draw_ctx.set_cairo_context(&cr_save);
-        Ok(surface)
+        surface.draw(&mut |cr| {
+            let cr_save = draw_ctx.get_cairo_context();
+            draw_ctx.set_cairo_context(&cr);
+
+            // FIXME: we are ignoring the following error; propagate it upstream
+            let _ = draw_ctx
+                .set_source_paint_server(
+                    paint_server,
+                    opacity,
+                    &self.node_bbox,
+                    self.computed_from_node_being_filtered.color.0,
+                )
+                .and_then(|had_paint_server| {
+                    if had_paint_server {
+                        cr.paint();
+                    }
+                    Ok(())
+                });
+
+            draw_ctx.set_cairo_context(&cr_save);
+
+            Ok(())
+        })?;
+
+        surface.share()
     }
 
     /// Retrieves the filter input surface according to the SVG rules.
@@ -350,19 +356,11 @@ impl FilterContext {
             Input::FillPaint => self
                 .get_paint_server_surface(draw_ctx, &values.fill.0, values.fill_opacity.0)
                 .map_err(FilterError::CairoError)
-                .and_then(|surface| {
-                    SharedImageSurface::wrap(surface, SurfaceType::SRgb)
-                        .map_err(FilterError::CairoError)
-                })
                 .map(FilterInput::StandardInput),
 
             Input::StrokePaint => self
                 .get_paint_server_surface(draw_ctx, &values.stroke.0, values.stroke_opacity.0)
                 .map_err(FilterError::CairoError)
-                .and_then(|surface| {
-                    SharedImageSurface::wrap(surface, SurfaceType::SRgb)
-                        .map_err(FilterError::CairoError)
-                })
                 .map(FilterInput::StandardInput),
 
             Input::FilterOutput(ref name) => self