[librsvg: 11/11] Merge branch 'attributes'




commit 4fd61a016191ddc132a5090e5015ff8fad867f58
Merge: e110fa20 4683044f
Author: Federico Mena Quintero <federico gnome org>
Date:   Thu Sep 10 12:44:55 2020 -0500

    Merge branch 'attributes'

 Cargo.lock                                         |  97 ++++-----
 Makefile.am                                        |   2 +-
 po/POTFILES.in                                     |   1 -
 rsvg_internals/Cargo.toml                          |   1 +
 .../src/{property_bag.rs => attributes.rs}         |  51 +++--
 rsvg_internals/src/css.rs                          |  26 ++-
 rsvg_internals/src/document.rs                     |   6 +-
 rsvg_internals/src/element.rs                      | 225 ++++++++++++---------
 rsvg_internals/src/filter.rs                       |   8 +-
 rsvg_internals/src/filters/blend.rs                |   8 +-
 rsvg_internals/src/filters/color_matrix.rs         |  10 +-
 rsvg_internals/src/filters/component_transfer.rs   |  10 +-
 rsvg_internals/src/filters/composite.rs            |   8 +-
 rsvg_internals/src/filters/convolve_matrix.rs      |  12 +-
 rsvg_internals/src/filters/displacement_map.rs     |   8 +-
 rsvg_internals/src/filters/flood.rs                |   6 +-
 rsvg_internals/src/filters/gaussian_blur.rs        |   8 +-
 rsvg_internals/src/filters/image.rs                |   8 +-
 rsvg_internals/src/filters/lighting.rs             |  32 +--
 rsvg_internals/src/filters/merge.rs                |  10 +-
 rsvg_internals/src/filters/mod.rs                  |  12 +-
 rsvg_internals/src/filters/morphology.rs           |   8 +-
 rsvg_internals/src/filters/offset.rs               |   8 +-
 rsvg_internals/src/filters/tile.rs                 |   6 +-
 rsvg_internals/src/filters/turbulence.rs           |   8 +-
 rsvg_internals/src/gradient.rs                     |  30 +--
 rsvg_internals/src/image.rs                        |   6 +-
 rsvg_internals/src/lib.rs                          |   2 +-
 rsvg_internals/src/marker.rs                       |   6 +-
 rsvg_internals/src/node.rs                         |   6 +-
 rsvg_internals/src/pattern.rs                      |  10 +-
 rsvg_internals/src/properties.rs                   |   6 +-
 rsvg_internals/src/shapes.rs                       |  30 +--
 rsvg_internals/src/structure.rs                    |  26 +--
 rsvg_internals/src/style.rs                        |   6 +-
 rsvg_internals/src/text.rs                         |  14 +-
 rsvg_internals/src/xml.rs                          |  26 +--
 rsvg_internals/src/xml2_load.rs                    |   6 +-
 .../reftests/483-attribute-selectors-ref.png       | Bin 0 -> 334 bytes
 .../fixtures/reftests/483-attribute-selectors.svg  |  23 +++
 40 files changed, 429 insertions(+), 347 deletions(-)
---
diff --cc rsvg_internals/src/filter.rs
index eb44766b,cd4f0d98..66a88960
--- a/rsvg_internals/src/filter.rs
+++ b/rsvg_internals/src/filter.rs
@@@ -1,22 -1,16 +1,22 @@@
  //! The `filter` element.
  
 +use cssparser::Parser;
  use markup5ever::{expanded_name, local_name, namespace_url, ns};
 +use std::slice::Iter;
  
 +use crate::allowed_url::Fragment;
+ use crate::attributes::Attributes;
  use crate::bbox::BoundingBox;
  use crate::coord_units::CoordUnits;
 +use crate::document::AcquiredNodes;
  use crate::drawing_ctx::DrawingCtx;
 -use crate::element::{Draw, ElementResult, SetAttributes};
 +use crate::element::{Draw, Element, ElementResult, SetAttributes};
  use crate::error::ValueErrorKind;
 +use crate::iri::IRI;
  use crate::length::*;
 +use crate::node::{Node, NodeBorrow};
  use crate::parsers::{Parse, ParseValue};
  use crate::properties::ComputedValues;
- use crate::property_bag::PropertyBag;
  use crate::rect::Rect;
  use crate::transform::Transform;
  


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