diff options
| author | Benjamin Otte <otte@redhat.com> | 2010-10-07 21:32:05 +0200 |
|---|---|---|
| committer | Benjamin Otte <otte@redhat.com> | 2010-12-02 20:17:28 +0100 |
| commit | 18a6976e5a1e899b62280fbbeb6df9c2c9191bcc (patch) | |
| tree | f751ae9edc1b01d2664aeff93153336702415aaa /gdk | |
| parent | fe6f76a5a2f33f9873b482c397b22a9ae5cda300 (diff) | |
| download | gtk+-18a6976e5a1e899b62280fbbeb6df9c2c9191bcc.tar.gz | |
API: gdk: Don't track outstanding surfaces
You are not allowed to track surfaces from GDK or draw outside of expose
events. So we can remove ugly hacks needed previously. See
https://bugzilla.gnome.org/show_bug.cgi?id=606009 for the introduction
of this workaround.
Diffstat (limited to 'gdk')
| -rw-r--r-- | gdk/gdkinternals.h | 1 | ||||
| -rw-r--r-- | gdk/gdkwindow.c | 12 |
2 files changed, 1 insertions, 12 deletions
diff --git a/gdk/gdkinternals.h b/gdk/gdkinternals.h index c425447871..f25672fd58 100644 --- a/gdk/gdkinternals.h +++ b/gdk/gdkinternals.h @@ -267,7 +267,6 @@ struct _GdkWindowObject cairo_region_t *input_shape; cairo_surface_t *cairo_surface; - guint outstanding_surfaces; /* only set on impl window */ GList *devices_inside; GHashTable *device_events; diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c index e3d401368f..776a03bf10 100644 --- a/gdk/gdkwindow.c +++ b/gdk/gdkwindow.c @@ -2784,9 +2784,6 @@ gdk_window_begin_implicit_paint (GdkWindow *window, GdkRectangle *rect) private->implicit_paint != NULL) return FALSE; /* Don't stack implicit paints */ - if (private->outstanding_surfaces != 0) - return FALSE; /* May conflict with direct drawing to cairo surface */ - /* Never do implicit paints for foreign windows, they don't need * double buffer combination since they have no client side children, * and creating surfaces for them is risky since they could disappear @@ -3393,11 +3390,7 @@ move_region_on_impl (GdkWindowObject *impl_window, cairo_region_destroy (exposing); } - if (impl_window->outstanding_surfaces == 0) /* Enable flicker free handling of moves. */ - append_move_region (impl_window, region, dx, dy); - else - do_move_region_bits_on_impl (impl_window, - region, dx, dy); + append_move_region (impl_window, region, dx, dy); cairo_region_destroy (region); } @@ -3702,7 +3695,6 @@ gdk_window_cairo_surface_destroy (void *data) GdkWindowObject *private = (GdkWindowObject*) data; private->cairo_surface = NULL; - private->impl_window->outstanding_surfaces--; } static cairo_surface_t * @@ -3754,8 +3746,6 @@ gdk_window_ref_cairo_surface (GdkDrawable *drawable) if (private->cairo_surface) { - private->impl_window->outstanding_surfaces++; - cairo_surface_set_user_data (private->cairo_surface, &gdk_window_cairo_key, drawable, gdk_window_cairo_surface_destroy); } |