[librsvg] ClipMode: move to drawing_ctx.rs; remove viewport.rs

[Federico Mena Quintero <federico src gnome org>]

commit 6859cdc39414cf87570d2f565e82bbcc9fca4279
Author: Federico Mena Quintero <federico gnome org>
Date:   Mon Mar 4 09:52:55 2019 -0600

    ClipMode: move to drawing_ctx.rs; remove viewport.rs

 Makefile.am                       | 1 -
 rsvg_internals/src/drawing_ctx.rs | 7 ++++++-
 rsvg_internals/src/image.rs       | 3 +--
 rsvg_internals/src/lib.rs         | 1 -
 rsvg_internals/src/structure.rs   | 3 +--
 rsvg_internals/src/viewport.rs    | 5 -----
 6 files changed, 8 insertions(+), 12 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index b5f2ad02..9b610c96 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -109,7 +109,6 @@ RUST_SRC =                                                  \
        rsvg_internals/src/unit_interval.rs                     \
        rsvg_internals/src/util.rs                              \
        rsvg_internals/src/viewbox.rs                           \
-       rsvg_internals/src/viewport.rs                          \
        rsvg_internals/src/xml.rs                               \
        rsvg_internals/src/xml2.rs                              \
        rsvg_internals/src/xml2_load.rs
diff --git a/rsvg_internals/src/drawing_ctx.rs b/rsvg_internals/src/drawing_ctx.rs
index b3904db4..16842198 100644
--- a/rsvg_internals/src/drawing_ctx.rs
+++ b/rsvg_internals/src/drawing_ctx.rs
@@ -34,7 +34,6 @@ use surface_utils::shared_surface::SharedImageSurface;
 use svg::Svg;
 use unit_interval::UnitInterval;
 use viewbox::ViewBox;
-use viewport::ClipMode;
 
 /// Holds values that are required to normalize `Length` values to a current viewport.
 ///
@@ -76,6 +75,12 @@ impl Drop for ViewParams {
     }
 }
 
+#[derive(Debug, Copy, Clone, PartialEq)]
+pub enum ClipMode {
+    ClipToViewport,
+    ClipToVbox,
+}
+
 pub struct DrawingCtx {
     svg: Rc<Svg>,
 
diff --git a/rsvg_internals/src/image.rs b/rsvg_internals/src/image.rs
index bab563d7..c82e192e 100644
--- a/rsvg_internals/src/image.rs
+++ b/rsvg_internals/src/image.rs
@@ -6,7 +6,7 @@ use allowed_url::Href;
 use aspect_ratio::AspectRatio;
 use attributes::Attribute;
 use bbox::BoundingBox;
-use drawing_ctx::DrawingCtx;
+use drawing_ctx::{ClipMode, DrawingCtx};
 use error::{NodeError, RenderingError};
 use float_eq_cairo::ApproxEqCairo;
 use length::{LengthHorizontal, LengthVertical};
@@ -15,7 +15,6 @@ use parsers::{ParseError, ParseValue};
 use property_bag::PropertyBag;
 use rect::RectangleExt;
 use viewbox::ViewBox;
-use viewport::ClipMode;
 
 pub struct NodeImage {
     aspect: Cell<AspectRatio>,
diff --git a/rsvg_internals/src/lib.rs b/rsvg_internals/src/lib.rs
index e19d233a..6dafbdb2 100644
--- a/rsvg_internals/src/lib.rs
+++ b/rsvg_internals/src/lib.rs
@@ -161,7 +161,6 @@ pub mod tree_utils;
 mod unit_interval;
 mod util;
 mod viewbox;
-mod viewport;
 mod xml;
 mod xml2;
 mod xml2_load;
diff --git a/rsvg_internals/src/structure.rs b/rsvg_internals/src/structure.rs
index 8ff45f2d..33e9feb1 100644
--- a/rsvg_internals/src/structure.rs
+++ b/rsvg_internals/src/structure.rs
@@ -8,7 +8,7 @@ use aspect_ratio::*;
 use attributes::Attribute;
 use css::CssStyles;
 use dpi::Dpi;
-use drawing_ctx::{DrawingCtx, ViewParams};
+use drawing_ctx::{ClipMode, DrawingCtx, ViewParams};
 use error::{AttributeResultExt, RenderingError};
 use float_eq_cairo::ApproxEqCairo;
 use length::*;
@@ -18,7 +18,6 @@ use properties::{ComputedValues, Overflow};
 use property_bag::{OwnedPropertyBag, PropertyBag};
 use rect::RectangleExt;
 use viewbox::*;
-use viewport::ClipMode;
 
 pub struct NodeGroup();