[lasem] svg_view: appeler un chat un chat.

[Emmanuel Pacaud <emmanuel src gnome org>]

commit 72be78654e410ed2c3b1fb3d5f68b965047a08da
Author: Emmanuel Pacaud <emmanuel gnome org>
Date:   Mon Oct 15 23:24:32 2012 +0200

    svg_view: appeler un chat un chat.

 src/lsmsvgclippathelement.c |    4 ++--
 src/lsmsvgelement.c         |    4 ++--
 src/lsmsvgfilterprimitive.c |    4 ++--
 src/lsmsvgmarkerelement.c   |    4 ++--
 src/lsmsvgmaskelement.c     |    8 ++++----
 src/lsmsvgpatternelement.c  |    8 ++++----
 src/lsmsvgview.c            |   16 ++++++++++------
 src/lsmsvgview.h            |    4 ++--
 8 files changed, 28 insertions(+), 24 deletions(-)
---
diff --git a/src/lsmsvgclippathelement.c b/src/lsmsvgclippathelement.c
index 305907d..c53bbe6 100644
--- a/src/lsmsvgclippathelement.c
+++ b/src/lsmsvgclippathelement.c
@@ -53,7 +53,7 @@ lsm_svg_clip_path_element_render (LsmSvgElement *self, LsmSvgView *view)
 	}
 
 	style = lsm_svg_style_new_inherited (NULL, &self->property_bag);
-	lsm_svg_view_push_style (view, style);
+	lsm_svg_view_push_composition (view, style);
 
 	is_object_bounding_box = (clip->units.value == LSM_SVG_PATTERN_UNITS_OBJECT_BOUNDING_BOX);
 
@@ -72,7 +72,7 @@ lsm_svg_clip_path_element_render (LsmSvgElement *self, LsmSvgView *view)
 		lsm_svg_view_pop_viewport (view);
 	}
 
-	lsm_svg_view_pop_style (view);
+	lsm_svg_view_pop_composition (view);
 	lsm_svg_style_unref (style);
 }
 
diff --git a/src/lsmsvgelement.c b/src/lsmsvgelement.c
index b8fe96c..750a489 100644
--- a/src/lsmsvgelement.c
+++ b/src/lsmsvgelement.c
@@ -172,11 +172,11 @@ _transformed_render (LsmSvgElement *element, LsmSvgView *view)
 				  lsm_dom_node_get_node_name (LSM_DOM_NODE (element)),
 				  element->id.value != NULL ? element->id.value : "no id");
 		lsm_svg_view_push_element (view, element);
-		lsm_svg_view_push_style (view, style);
+		lsm_svg_view_push_composition (view, style);
 
 		element_class->render (element, view);
 
-		lsm_svg_view_pop_style (view);
+		lsm_svg_view_pop_composition (view);
 		lsm_svg_view_pop_element (view);
 	}
 
diff --git a/src/lsmsvgfilterprimitive.c b/src/lsmsvgfilterprimitive.c
index 77f41ef..44a9ce3 100644
--- a/src/lsmsvgfilterprimitive.c
+++ b/src/lsmsvgfilterprimitive.c
@@ -60,12 +60,12 @@ lsm_svg_filter_primitive_apply  (LsmSvgFilterPrimitive *self, LsmSvgView *view)
 	parent_style = lsm_svg_view_get_current_style (view);
 	style = lsm_svg_style_new_inherited (parent_style, &(LSM_SVG_ELEMENT (self))->property_bag);
 
-	lsm_svg_view_push_style_only (view, style);
+	lsm_svg_view_push_style (view, style);
 
 	if (primitive_class->apply != NULL)
 		primitive_class->apply (self, view, self->in.value, self->result.value, x, y, w, h);
 
-	lsm_svg_view_pop_style_only (view);
+	lsm_svg_view_pop_style (view);
 
 	lsm_svg_style_unref (style);
 }
diff --git a/src/lsmsvgmarkerelement.c b/src/lsmsvgmarkerelement.c
index 2d2cd19..ea85bd3 100644
--- a/src/lsmsvgmarkerelement.c
+++ b/src/lsmsvgmarkerelement.c
@@ -67,7 +67,7 @@ _marker_element_render (LsmSvgElement *self, LsmSvgView *view)
 	}
 
 	style = lsm_svg_style_new_inherited (marker->style, &self->property_bag);
-	lsm_svg_view_push_style (view, style);
+	lsm_svg_view_push_composition (view, style);
 
 	if (marker->stroke_width > 0.0 || marker->units.value != LSM_SVG_MARKER_UNITS_STROKE_WIDTH) {
 		ref_x = lsm_svg_view_normalize_length (view, &marker->ref_x.length,
@@ -121,7 +121,7 @@ _marker_element_render (LsmSvgElement *self, LsmSvgView *view)
 		lsm_svg_view_pop_matrix (view);
 	}
 
-	lsm_svg_view_pop_style (view);
+	lsm_svg_view_pop_composition (view);
 	lsm_svg_style_unref (style);
 }
 
diff --git a/src/lsmsvgmaskelement.c b/src/lsmsvgmaskelement.c
index 77ff6a9..bfad28c 100644
--- a/src/lsmsvgmaskelement.c
+++ b/src/lsmsvgmaskelement.c
@@ -56,7 +56,7 @@ lsm_svg_mask_element_render (LsmSvgElement *self, LsmSvgView *view)
 	}
 
 	style = lsm_svg_style_new_inherited (NULL, &self->property_bag);
-	lsm_svg_view_push_style (view, style);
+	lsm_svg_view_push_composition (view, style);
 
 	mask_extents = lsm_svg_view_get_pattern_extents (view);
 
@@ -89,7 +89,7 @@ lsm_svg_mask_element_render (LsmSvgElement *self, LsmSvgView *view)
 	if (viewport.width <= 0.0 || viewport.height <= 0.0) {
 		lsm_debug_render ("[LsmSvgMaskElement::render] Invalid viewport w = %g, h = %g",
 			   viewport.width, viewport.height);
-		lsm_svg_view_pop_style (view);
+		lsm_svg_view_pop_composition (view);
 		lsm_svg_style_unref (style);
 		return;
 	}
@@ -98,7 +98,7 @@ lsm_svg_mask_element_render (LsmSvgElement *self, LsmSvgView *view)
 						  NULL,
 						  LSM_SVG_VIEW_SURFACE_TYPE_IMAGE)) {
 		lsm_debug_render ("[LsmSvgMaskElement::render] Intermediate surface creation failed");
-		lsm_svg_view_pop_style (view);
+		lsm_svg_view_pop_composition (view);
 		lsm_svg_style_unref (style);
 		return;
 	}
@@ -131,7 +131,7 @@ lsm_svg_mask_element_render (LsmSvgElement *self, LsmSvgView *view)
 		lsm_svg_view_pop_viewbox (view);
 	}
 
-	lsm_svg_view_pop_style (view);
+	lsm_svg_view_pop_composition (view);
 	lsm_svg_style_unref (style);
 }
 
diff --git a/src/lsmsvgpatternelement.c b/src/lsmsvgpatternelement.c
index 7b842a8..e26be50 100644
--- a/src/lsmsvgpatternelement.c
+++ b/src/lsmsvgpatternelement.c
@@ -187,7 +187,7 @@ lsm_svg_pattern_element_render (LsmSvgElement *self, LsmSvgView *view)
 		return;
 
 	style = lsm_svg_style_new_inherited (NULL, &self->property_bag);
-	lsm_svg_view_push_style (view, style);
+	lsm_svg_view_push_composition (view, style);
 
 	pattern_extents = lsm_svg_view_get_pattern_extents (view);
 
@@ -222,7 +222,7 @@ lsm_svg_pattern_element_render (LsmSvgElement *self, LsmSvgView *view)
 	if (viewport.width <= 0.0 || viewport.height <= 0.0) {
 		lsm_debug_render ("[LsmSvgPatternElement::render] Invalid viewport w = %g, h = %g",
 			   viewport.width, viewport.height);
-		lsm_svg_view_pop_style (view);
+		lsm_svg_view_pop_composition (view);
 		lsm_svg_style_unref (style);
 		return;
 	}
@@ -234,7 +234,7 @@ lsm_svg_pattern_element_render (LsmSvgElement *self, LsmSvgView *view)
 						  &pattern->transform.matrix,
 						  LSM_SVG_VIEW_SURFACE_TYPE_AUTO)) {
 		lsm_debug_render ("[LsmSvgPatternElement::render] Intermediate surface creation failed");
-		lsm_svg_view_pop_style (view);
+		lsm_svg_view_pop_composition (view);
 		lsm_svg_style_unref (style);
 		return;
 	}
@@ -277,7 +277,7 @@ lsm_svg_pattern_element_render (LsmSvgElement *self, LsmSvgView *view)
 		lsm_svg_view_pop_viewbox (view);
 	}
 
-	lsm_svg_view_pop_style (view);
+	lsm_svg_view_pop_composition (view);
 	lsm_svg_style_unref (style);
 }
 
diff --git a/src/lsmsvgview.c b/src/lsmsvgview.c
index 7f2ac9a..ecb11f5 100644
--- a/src/lsmsvgview.c
+++ b/src/lsmsvgview.c
@@ -2252,7 +2252,7 @@ lsm_svg_view_circular_reference_check (LsmSvgView *view, LsmSvgElement *element)
 }
 
 void
-lsm_svg_view_push_style_only (LsmSvgView *view, LsmSvgStyle *style)
+lsm_svg_view_push_style (LsmSvgView *view, LsmSvgStyle *style)
 {
 	g_return_if_fail (LSM_IS_SVG_VIEW (view));
 	g_return_if_fail (style != NULL);
@@ -2291,12 +2291,14 @@ lsm_svg_view_push_style_only (LsmSvgView *view, LsmSvgStyle *style)
 }
 
 void
-lsm_svg_view_push_style	(LsmSvgView *view, LsmSvgStyle *style)
+lsm_svg_view_push_composition (LsmSvgView *view, LsmSvgStyle *style)
 {
 	g_return_if_fail (LSM_IS_SVG_VIEW (view));
 	g_return_if_fail (style != NULL);
 
-	lsm_svg_view_push_style_only (view, style);
+	lsm_svg_view_push_style (view, style);
+
+	lsm_log_render ("[SvgView::push_composition]");
 
 	if (g_strcmp0 (style->clip_path->value, "none") != 0) {
 		lsm_debug_render ("[LsmSvgView::push_style] Start clip '%s'", style->clip_path->value);
@@ -2314,7 +2316,7 @@ lsm_svg_view_push_style	(LsmSvgView *view, LsmSvgStyle *style)
 	}
 }
 
-void lsm_svg_view_pop_style_only (LsmSvgView *view)
+void lsm_svg_view_pop_style (LsmSvgView *view)
 {
 	g_return_if_fail (LSM_IS_SVG_VIEW (view));
 	g_return_if_fail (view->style_stack != NULL);
@@ -2325,10 +2327,12 @@ void lsm_svg_view_pop_style_only (LsmSvgView *view)
 	lsm_log_render ("[SvgView::pop_style]");
 }
 
-void lsm_svg_view_pop_style (LsmSvgView *view)
+void lsm_svg_view_pop_composition (LsmSvgView *view)
 {
 	g_return_if_fail (LSM_IS_SVG_VIEW (view));
 
+	lsm_log_render ("[SvgView::pop_composition]");
+
 	if (g_strcmp0 (view->style->filter->value, "none") != 0) {
 		lsm_svg_view_pop_filter (view);
 	}
@@ -2339,7 +2343,7 @@ void lsm_svg_view_pop_style (LsmSvgView *view)
 	if (g_strcmp0 (view->style->clip_path->value, "none") != 0)
 		lsm_svg_view_pop_clip (view);
 
-	lsm_svg_view_pop_style_only (view);
+	lsm_svg_view_pop_style (view);
 }
 
 LsmSvgStyle *
diff --git a/src/lsmsvgview.h b/src/lsmsvgview.h
index d48f501..a23ad3f 100644
--- a/src/lsmsvgview.h
+++ b/src/lsmsvgview.h
@@ -147,10 +147,10 @@ void		lsm_svg_view_pop_element		(LsmSvgView *view);
 void 		lsm_svg_view_push_group_opacity 	(LsmSvgView *view);
 void 		lsm_svg_view_pop_group_opacity 		(LsmSvgView *view);
 
-void		lsm_svg_view_push_style_only		(LsmSvgView *view, LsmSvgStyle *style);
-void		lsm_svg_view_pop_style_only		(LsmSvgView *view);
 void		lsm_svg_view_push_style			(LsmSvgView *view, LsmSvgStyle *style);
 void		lsm_svg_view_pop_style			(LsmSvgView *view);
+void		lsm_svg_view_push_composition		(LsmSvgView *view, LsmSvgStyle *style);
+void		lsm_svg_view_pop_composition		(LsmSvgView *view);
 
 LsmSvgStyle *	lsm_svg_view_get_current_style	(LsmSvgView *view);