From e201c4dc926dd21cd99b9442b8aebf235a33142a Mon Sep 17 00:00:00 2001
From: Benjamin Otte <otte@redhat.com>
Date: Tue, 1 Nov 2016 04:58:29 +0100
Subject: [PATCH] gsk: Remove gsk_render_node_get_scale_factor()

Scale factors belong to the renderers, not the nodes. The nodes should
just use whatever scale factor the renderer tells them to when
rendering.
---
 docs/reference/gsk/gsk4-sections.txt |  1 -
 gsk/gskglrenderer.c                  |  2 +-
 gsk/gskrendernode.c                  | 18 ------------------
 gsk/gskrendernodeprivate.h           |  2 --
 4 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/docs/reference/gsk/gsk4-sections.txt b/docs/reference/gsk/gsk4-sections.txt
index a8d953840d..30adf194fd 100644
--- a/docs/reference/gsk/gsk4-sections.txt
+++ b/docs/reference/gsk/gsk4-sections.txt
@@ -54,7 +54,6 @@ GskBlendMode
 gsk_render_node_set_blend_mode
 GskScalingFilter
 gsk_render_node_set_scaling_filters
-gsk_render_node_get_scale_factor
 gsk_render_node_set_name
 gsk_value_set_render_node
 gsk_value_take_render_node
diff --git a/gsk/gskglrenderer.c b/gsk/gskglrenderer.c
index 0808caab67..8f849a7a8f 100644
--- a/gsk/gskglrenderer.c
+++ b/gsk/gskglrenderer.c
@@ -625,7 +625,7 @@ gsk_gl_renderer_add_render_item (GskGLRenderer           *self,
 
   gsk_renderer_get_viewport (GSK_RENDERER (self), &viewport);
 
-  scale_factor = gsk_render_node_get_scale_factor (node);
+  scale_factor = gsk_renderer_get_scale_factor (GSK_RENDERER (self));
   if (scale_factor < 1)
     scale_factor = 1;
 
diff --git a/gsk/gskrendernode.c b/gsk/gskrendernode.c
index adca902deb..6a1625dc22 100644
--- a/gsk/gskrendernode.c
+++ b/gsk/gskrendernode.c
@@ -1293,24 +1293,6 @@ gsk_render_node_get_world_matrix (GskRenderNode     *node,
   *mv = node->world_matrix;
 }
 
-/*
- * gsk_render_node_get_scale_factor:
- * @node: a #GskRenderNode
- *
- * Retrieves the scale factor used when rendering.
- *
- * See also: gsk_renderer_get_scale_factor()
- *
- * Returns: the scale factor
- */
-int
-gsk_render_node_get_scale_factor (GskRenderNode *node)
-{
-  g_return_val_if_fail (GSK_IS_RENDER_NODE (node), 1);
-
-  return gsk_renderer_get_scale_factor (node->renderer);
-}
-
 /**
  * gsk_render_node_set_name:
  * @node: a #GskRenderNode
diff --git a/gsk/gskrendernodeprivate.h b/gsk/gskrendernodeprivate.h
index 5c0f4bd0cb..2a395bfe6f 100644
--- a/gsk/gskrendernodeprivate.h
+++ b/gsk/gskrendernodeprivate.h
@@ -98,8 +98,6 @@ GskBlendMode gsk_render_node_get_blend_mode (GskRenderNode *node);
 
 GskRenderNode *gsk_render_node_get_toplevel (GskRenderNode *node);
 
-int gsk_render_node_get_scale_factor (GskRenderNode *node);
-
 void gsk_render_node_update_world_matrix (GskRenderNode *node,
                                           gboolean       force);