AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

drawcontext: Guard begin/end_frame() against non-surface contexts

Browse Source 
This can happen now with gdk_display_create_gl_context().
This commit is contained in:
Benjamin Otte 2021-10-20 20:07:37 +02:00
parent 2601c39cb2
commit ea14e94eaf
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gdk/gdkdrawcontext.c
View File

@ -276,7 +276,8 @@ gdk_draw_context_get_surface (GdkDrawContext *context)
/** /**
* gdk_draw_context_begin_frame: * gdk_draw_context_begin_frame:
* @context: the `GdkDrawContext` used to draw the frame * @context: the `GdkDrawContext` used to draw the frame. The context must
* have a surface.
* @region: minimum region that should be drawn * @region: minimum region that should be drawn
* *
* Indicates that you are beginning the process of redrawing @region * Indicates that you are beginning the process of redrawing @region
@ -308,7 +309,10 @@ void
gdk_draw_context_begin_frame (GdkDrawContext *context, gdk_draw_context_begin_frame (GdkDrawContext *context,
const cairo_region_t *region) const cairo_region_t *region)
{ {
GdkDrawContextPrivate *priv = gdk_draw_context_get_instance_private (context);
g_return_if_fail (GDK_IS_DRAW_CONTEXT (context)); g_return_if_fail (GDK_IS_DRAW_CONTEXT (context));
g_return_if_fail (priv->surface != NULL);
g_return_if_fail (region != NULL); g_return_if_fail (region != NULL);
gdk_draw_context_begin_frame_full (context, FALSE, region); gdk_draw_context_begin_frame_full (context, FALSE, region);
@ -411,6 +415,7 @@ gdk_draw_context_end_frame (GdkDrawContext *context)
GdkDrawContextPrivate *priv = gdk_draw_context_get_instance_private (context); GdkDrawContextPrivate *priv = gdk_draw_context_get_instance_private (context);
g_return_if_fail (GDK_IS_DRAW_CONTEXT (context)); g_return_if_fail (GDK_IS_DRAW_CONTEXT (context));
g_return_if_fail (priv->surface != NULL);
if (GDK_SURFACE_DESTROYED (priv->surface)) if (GDK_SURFACE_DESTROYED (priv->surface))
return; return;