diff --git a/docs/reference/gtk/running.sgml b/docs/reference/gtk/running.sgml index 8f48d3dd1b..3bc8f35714 100644 --- a/docs/reference/gtk/running.sgml +++ b/docs/reference/gtk/running.sgml @@ -178,18 +178,6 @@ additional environment variables. no-css-cache Bypass caching for CSS style properties - - no-pixel-cache - Disable the pixel cache - - - plugsocket - Cross-process embedding - - - pixel-cache - Pixel cache - printing Printing support diff --git a/gtk/gtkdebug.h b/gtk/gtkdebug.h index ec806dc784..3f624a9110 100644 --- a/gtk/gtkdebug.h +++ b/gtk/gtkdebug.h @@ -49,13 +49,11 @@ typedef enum { GTK_DEBUG_SIZE_REQUEST = 1 << 11, GTK_DEBUG_NO_CSS_CACHE = 1 << 12, GTK_DEBUG_BASELINES = 1 << 13, - GTK_DEBUG_PIXEL_CACHE = 1 << 14, - GTK_DEBUG_NO_PIXEL_CACHE = 1 << 15, - GTK_DEBUG_INTERACTIVE = 1 << 16, - GTK_DEBUG_TOUCHSCREEN = 1 << 17, - GTK_DEBUG_ACTIONS = 1 << 18, - GTK_DEBUG_RESIZE = 1 << 19, - GTK_DEBUG_LAYOUT = 1 << 20 + GTK_DEBUG_INTERACTIVE = 1 << 14, + GTK_DEBUG_TOUCHSCREEN = 1 << 15, + GTK_DEBUG_ACTIONS = 1 << 16, + GTK_DEBUG_RESIZE = 1 << 17, + GTK_DEBUG_LAYOUT = 1 << 18 } GtkDebugFlag; #ifdef G_ENABLE_DEBUG diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c index 25e2047b13..21d1870894 100644 --- a/gtk/gtkmain.c +++ b/gtk/gtkmain.c @@ -167,8 +167,6 @@ static const GDebugKey gtk_debug_keys[] = { { "size-request", GTK_DEBUG_SIZE_REQUEST }, { "no-css-cache", GTK_DEBUG_NO_CSS_CACHE }, { "baselines", GTK_DEBUG_BASELINES }, - { "pixel-cache", GTK_DEBUG_PIXEL_CACHE }, - { "no-pixel-cache", GTK_DEBUG_NO_PIXEL_CACHE }, { "interactive", GTK_DEBUG_INTERACTIVE }, { "touchscreen", GTK_DEBUG_TOUCHSCREEN }, { "actions", GTK_DEBUG_ACTIONS }, diff --git a/gtk/inspector/visual.c b/gtk/inspector/visual.c index 718043a4d9..400a75104b 100644 --- a/gtk/inspector/visual.c +++ b/gtk/inspector/visual.c @@ -269,27 +269,6 @@ layout_activate (GtkSwitch *sw) redraw_everything (); } -static void -pixelcache_activate (GtkSwitch *sw) -{ - guint flags; - - flags = gtk_get_debug_flags (); - - if (gtk_switch_get_active (sw)) - flags |= GTK_DEBUG_PIXEL_CACHE; - else - flags &= ~GTK_DEBUG_PIXEL_CACHE; - - gtk_set_debug_flags (flags); - /* FIXME: this doesn't work, because it is redrawing - * _from_ the cache. We need to recurse over the tree - * and invalidate the pixel cache of every widget that - * has one. - */ - redraw_everything (); -} - static void widget_resize_activate (GtkSwitch *sw) { @@ -940,7 +919,6 @@ gtk_inspector_visual_class_init (GtkInspectorVisualClass *klass) gtk_widget_class_bind_template_callback (widget_class, rendering_mode_changed); gtk_widget_class_bind_template_callback (widget_class, baselines_activate); gtk_widget_class_bind_template_callback (widget_class, layout_activate); - gtk_widget_class_bind_template_callback (widget_class, pixelcache_activate); gtk_widget_class_bind_template_callback (widget_class, widget_resize_activate); gtk_widget_class_bind_template_callback (widget_class, software_gl_activate); gtk_widget_class_bind_template_callback (widget_class, software_surface_activate); diff --git a/gtk/inspector/visual.ui b/gtk/inspector/visual.ui index 4bf1867042..7e28451811 100644 --- a/gtk/inspector/visual.ui +++ b/gtk/inspector/visual.ui @@ -599,40 +599,6 @@ - - - True - False - - - True - horizontal - 10 - 40 - - - True - Show Pixel Cache - start - baseline - 0.0 - - - - - True - end - baseline - - - - True - - - - - - True @@ -875,7 +841,6 @@ -