[gtk+: 7/7] Merge branch 'wip/cssvalue'

[Alexander Larsson <alexl src gnome org>]

commit a253d4cfec7c6e130b3dddee6cdfaff5ceb7cbe1
Merge: a122925 ec65270
Author: Alexander Larsson <alexl redhat com>
Date:   Thu Mar 8 17:33:18 2012 +0100

    Merge branch 'wip/cssvalue'

 gtk/Makefile.am                      |    2 +
 gtk/gtkborderimage.c                 |    9 +-
 gtk/gtkcsscomputedvalues.c           |   60 +---
 gtk/gtkcsscomputedvaluesprivate.h    |   11 +-
 gtk/gtkcsscustomproperty.c           |   37 +-
 gtk/gtkcsslookup.c                   |    8 +-
 gtk/gtkcsslookupprivate.h            |    4 +-
 gtk/gtkcssprovider.c                 |   32 +-
 gtk/gtkcssshorthandproperty.c        |    5 +-
 gtk/gtkcssshorthandpropertyimpl.c    |   54 ++--
 gtk/gtkcssshorthandpropertyprivate.h |    3 +-
 gtk/gtkcssstylefuncs.c               |  106 +++---
 gtk/gtkcssstylefuncsprivate.h        |    7 +-
 gtk/gtkcssstyleproperty.c            |   90 +++---
 gtk/gtkcssstylepropertyimpl.c        |  137 ++++----
 gtk/gtkcssstylepropertyprivate.h     |   16 +-
 gtk/gtkcsstypes.c                    |    8 +-
 gtk/gtkcsstypesprivate.h             |    2 +-
 gtk/gtkcssvalue.c                    |  635 ++++++++++++++++++++++++++++++++++
 gtk/gtkcssvalueprivate.h             |   96 +++++
 gtk/gtkstylecontext.c                |   49 ++-
 gtk/gtkstylecontextprivate.h         |    5 +-
 gtk/gtkstyleproperties.c             |   92 ++---
 gtk/gtkstylepropertiesprivate.h      |    4 +-
 gtk/gtkstyleproperty.c               |   12 +-
 gtk/gtkstylepropertyprivate.h        |   11 +-
 gtk/gtksymboliccolor.c               |  184 +++++++----
 gtk/gtksymboliccolorprivate.h        |    6 +-
 gtk/gtkthemingbackground.c           |    4 +-
 gtk/gtkthemingengine.c               |   10 +-
 gtk/gtkthemingengineprivate.h        |    3 +-
 31 files changed, 1235 insertions(+), 467 deletions(-)
---