callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

css lookup: Replace g_return by gtk_internal return

Browse Source 
These functions are called in an inner loop in
gtk_css_style_provider_lookup.
This commit is contained in:
Matthias Clasen
2015-09-10 22:02:03 -04:00
parent 83d68ea107
commit 60ccda0597
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
gtk/gtkcsslookup.c
View File

@ -22,6 +22,7 @@
#include "gtkcssstylepropertyprivate.h" #include "gtkcssstylepropertyprivate.h"
#include "gtkcsstypesprivate.h" #include "gtkcsstypesprivate.h"
#include "gtkprivatetypebuiltins.h" #include "gtkprivatetypebuiltins.h"
#include "gtkprivate.h"
GtkCssLookup * GtkCssLookup *
_gtk_css_lookup_new (const GtkBitmask *relevant) _gtk_css_lookup_new (const GtkBitmask *relevant)
@ -47,7 +48,7 @@ _gtk_css_lookup_new (const GtkBitmask *relevant)
void void
_gtk_css_lookup_free (GtkCssLookup *lookup) _gtk_css_lookup_free (GtkCssLookup *lookup)
{ {
g_return_if_fail (lookup != NULL); gtk_internal_return_if_fail (lookup != NULL);
_gtk_bitmask_free (lookup->missing); _gtk_bitmask_free (lookup->missing);
g_free (lookup); g_free (lookup);
@ -57,7 +58,7 @@ gboolean
_gtk_css_lookup_is_missing (const GtkCssLookup *lookup, _gtk_css_lookup_is_missing (const GtkCssLookup *lookup,
guint id) guint id)
{ {
g_return_val_if_fail (lookup != NULL, FALSE); gtk_internal_return_val_if_fail (lookup != NULL, FALSE);
return _gtk_bitmask_get (lookup->missing, id); return _gtk_bitmask_get (lookup->missing, id);
} }
@ -81,9 +82,9 @@ _gtk_css_lookup_set (GtkCssLookup *lookup,
GtkCssSection *section, GtkCssSection *section,
GtkCssValue *value) GtkCssValue *value)
{ {
g_return_if_fail (lookup != NULL); gtk_internal_return_if_fail (lookup != NULL);
g_return_if_fail (_gtk_bitmask_get (lookup->missing, id)); gtk_internal_return_if_fail (_gtk_bitmask_get (lookup->missing, id));
g_return_if_fail (value != NULL); gtk_internal_return_if_fail (value != NULL);
lookup->missing = _gtk_bitmask_set (lookup->missing, id, FALSE); lookup->missing = _gtk_bitmask_set (lookup->missing, id, FALSE);
lookup->values[id].value = value; lookup->values[id].value = value;
@ -110,10 +111,10 @@ _gtk_css_lookup_resolve (GtkCssLookup *lookup,
{ {
guint i, n; guint i, n;
g_return_if_fail (lookup != NULL); gtk_internal_return_if_fail (lookup != NULL);
g_return_if_fail (GTK_IS_STYLE_PROVIDER_PRIVATE (provider)); gtk_internal_return_if_fail (GTK_IS_STYLE_PROVIDER_PRIVATE (provider));
g_return_if_fail (GTK_IS_CSS_STATIC_STYLE (style)); gtk_internal_return_if_fail (GTK_IS_CSS_STATIC_STYLE (style));
g_return_if_fail (parent_style == NULL || GTK_IS_CSS_STYLE (parent_style)); gtk_internal_return_if_fail (parent_style == NULL || GTK_IS_CSS_STYLE (parent_style));
n = _gtk_css_style_property_get_n_properties (); n = _gtk_css_style_property_get_n_properties ();