[gtk/wip/otte/for-master] rendernode: Write the whole node
- From: Benjamin Otte <otte src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/wip/otte/for-master] rendernode: Write the whole node
- Date: Sat, 11 Sep 2021 20:29:12 +0000 (UTC)
commit 9f2b847835b1cf6f14239b71f17a51368a809907
Author: Benjamin Otte <otte redhat com>
Date: Sat Sep 11 06:06:02 2021 +0200
rendernode: Write the whole node
It turns out g_output_stream_write_bytes() does not write the bytes.
It should be renamed to g_output_stream_write_some_of_the_bytes() maybe.
gsk/gskrendernodeimpl.c | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)
---
diff --git a/gsk/gskrendernodeimpl.c b/gsk/gskrendernodeimpl.c
index 4b85fa60c1..fd2a9e5d44 100644
--- a/gsk/gskrendernodeimpl.c
+++ b/gsk/gskrendernodeimpl.c
@@ -5674,7 +5674,7 @@ gsk_render_node_content_serializer_finish (GObject *source,
GOutputStream *stream = G_OUTPUT_STREAM (source);
GError *error = NULL;
- if (!g_output_stream_write_bytes_finish (stream, result, &error))
+ if (g_output_stream_splice_finish (stream, result, &error) < 0)
gdk_content_serializer_return_error (serializer, error);
else
gdk_content_serializer_return_success (serializer);
@@ -5683,6 +5683,7 @@ gsk_render_node_content_serializer_finish (GObject *source,
static void
gsk_render_node_content_serializer (GdkContentSerializer *serializer)
{
+ GInputStream *input;
const GValue *value;
GskRenderNode *node;
GBytes *bytes;
@@ -5690,13 +5691,16 @@ gsk_render_node_content_serializer (GdkContentSerializer *serializer)
value = gdk_content_serializer_get_value (serializer);
node = gsk_value_get_render_node (value);
bytes = gsk_render_node_serialize (node);
-
- g_output_stream_write_bytes_async (gdk_content_serializer_get_output_stream (serializer),
- bytes,
- gdk_content_serializer_get_priority (serializer),
- gdk_content_serializer_get_cancellable (serializer),
- gsk_render_node_content_serializer_finish,
- serializer);
+ input = g_memory_input_stream_new_from_bytes (bytes);
+
+ g_output_stream_splice_async (gdk_content_serializer_get_output_stream (serializer),
+ input,
+ G_OUTPUT_STREAM_SPLICE_CLOSE_SOURCE,
+ gdk_content_serializer_get_priority (serializer),
+ gdk_content_serializer_get_cancellable (serializer),
+ gsk_render_node_content_serializer_finish,
+ serializer);
+ g_object_unref (input);
g_bytes_unref (bytes);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]