[gtk+] rendernode: Remove the renderer from the rendernode
- From: Benjamin Otte <otte src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] rendernode: Remove the renderer from the rendernode
- Date: Tue, 1 Nov 2016 15:34:04 +0000 (UTC)
commit 4129b70b968266b4d84a2d4f43e344499ed40499
Author: Benjamin Otte <otte redhat com>
Date: Tue Nov 1 05:47:35 2016 +0100
rendernode: Remove the renderer from the rendernode
gsk/gskrenderer.c | 3 +--
gsk/gskrendernode.c | 6 +-----
gsk/gskrendernodeprivate.h | 6 +-----
3 files changed, 3 insertions(+), 12 deletions(-)
---
diff --git a/gsk/gskrenderer.c b/gsk/gskrenderer.c
index 21236cf..3bdab32 100644
--- a/gsk/gskrenderer.c
+++ b/gsk/gskrenderer.c
@@ -623,7 +623,6 @@ gsk_renderer_render (GskRenderer *renderer,
g_return_if_fail (context == NULL || GDK_IS_DRAWING_CONTEXT (context));
g_return_if_fail (priv->drawing_context == NULL);
g_return_if_fail (priv->root_node == NULL);
- g_return_if_fail (root->renderer == renderer);
if (context != NULL)
priv->drawing_context = g_object_ref (context);
@@ -683,7 +682,7 @@ gsk_renderer_create_render_node (GskRenderer *renderer)
{
g_return_val_if_fail (GSK_IS_RENDERER (renderer), NULL);
- return gsk_render_node_new (renderer);
+ return gsk_render_node_new ();
}
/*< private >
diff --git a/gsk/gskrendernode.c b/gsk/gskrendernode.c
index c1494cb..2b56b10 100644
--- a/gsk/gskrendernode.c
+++ b/gsk/gskrendernode.c
@@ -247,17 +247,13 @@ gsk_render_node_get_type (void)
* gsk_render_node_new:
* @renderer: a #GskRenderer
*
- * Creates a new #GskRenderNode, to be used with a #GskRenderer.
- *
* Returns: (transfer full): the newly created #GskRenderNode
*/
GskRenderNode *
-gsk_render_node_new (GskRenderer *renderer)
+gsk_render_node_new (void)
{
GskRenderNode *res = (GskRenderNode *) g_type_create_instance (GSK_TYPE_RENDER_NODE);
- res->renderer = renderer;
-
return res;
}
diff --git a/gsk/gskrendernodeprivate.h b/gsk/gskrendernodeprivate.h
index 2a395bf..20e6084 100644
--- a/gsk/gskrendernodeprivate.h
+++ b/gsk/gskrendernodeprivate.h
@@ -2,7 +2,6 @@
#define __GSK_RENDER_NODE_PRIVATE_H__
#include "gskrendernode.h"
-#include "gskrenderer.h"
#include <cairo.h>
G_BEGIN_DECLS
@@ -17,9 +16,6 @@ struct _GskRenderNode
volatile int ref_count;
- /* Back pointer to the renderer that created the node */
- GskRenderer *renderer;
-
/* The graph */
GskRenderNode *parent;
GskRenderNode *first_child;
@@ -77,7 +73,7 @@ struct _GskRenderNodeClass
void (* finalize) (GskRenderNode *node);
};
-GskRenderNode *gsk_render_node_new (GskRenderer *renderer);
+GskRenderNode *gsk_render_node_new (void);
void gsk_render_node_make_immutable (GskRenderNode *node);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]