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

debug: Remove pixel-cache debug categories

Browse Source 
We have no more pixel cache, so they are kind of useless.
This commit is contained in:
Benjamin Otte 2016-12-20 18:30:14 +01:00
parent 2cbe057351
commit 22a657004b
5 changed files with 5 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
docs/reference/gtk/running.sgml
View File

@ -178,18 +178,6 @@ additional environment variables.
<term>no-css-cache</term>
<listitem><para>Bypass caching for CSS style properties</para></listitem>
</varlistentry>
<varlistentry>
<term>no-pixel-cache</term>
<listitem><para>Disable the pixel cache</para></listitem>
</varlistentry>
<varlistentry>
<term>plugsocket</term>
<listitem><para>Cross-process embedding</para></listitem>
</varlistentry>
<varlistentry>
<term>pixel-cache</term>
<listitem><para>Pixel cache</para></listitem>
</varlistentry>
<varlistentry>
<term>printing</term>
<listitem><para>Printing support</para></listitem>

12
gtk/gtkdebug.h
View File

@ -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

2
gtk/gtkmain.c
View File

@ -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 },

22
gtk/inspector/visual.c
View File

@ -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);

35
gtk/inspector/visual.ui
View File

@ -599,40 +599,6 @@
</child>
</object>
</child>
<child>
<object class="GtkListBoxRow">
<property name="visible">True</property>
<property name="activatable">False</property>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="orientation">horizontal</property>
<property name="margin">10</property>
<property name="spacing">40</property>
<child>
<object class="GtkLabel" id="pixelcache_label">
<property name="visible">True</property>
<property name="label" translatable="yes">Show Pixel Cache</property>
<property name="halign">start</property>
<property name="valign">baseline</property>
<property name="xalign">0.0</property>
</object>
</child>
<child>
<object class="GtkSwitch" id="pixelcache_switch">
<property name="visible">True</property>
<property name="halign">end</property>
<property name="valign">baseline</property>
<signal name="notify::active" handler="pixelcache_activate"/>
</object>
<packing>
<property name="expand">True</property>
</packing>
</child>
</object>
</child>
</object>
</child>
<child>
<object class="GtkListBoxRow">
<property name="visible">True</property>
@ -875,7 +841,6 @@
<widget name="updates_label"/>
<widget name="baselines_label"/>
<widget name="layout_label"/>
<widget name="pixelcache_label"/>
<widget name="touchscreen_label"/>
<widget name="gl_label"/>
<widget name="software_gl_label"/>