[gtk: 14/14] Merge branch 'cleanup-profiler-marks' into 'master'

[Matthias Clasen <matthiasc src gnome org>]

commit d702c159d57ea465798ac4a05e26f25145dc6612
Merge: c2dcd1bf94 6e3dd6dd62
Author: Matthias Clasen <mclasen redhat com>
Date:   Wed Feb 12 14:31:40 2020 +0000

    Merge branch 'cleanup-profiler-marks' into 'master'
    
    Cleanup profiler marks
    
    See merge request GNOME/gtk!1417

 gdk/broadway/gdksurface-broadway.c |   2 +-
 gdk/gdkdrawcontext.c               |   4 +-
 gdk/gdkframeclock.c                |  57 +++-----------------
 gdk/gdkframeclockidle.c            |  14 +++--
 gdk/gdkprofiler.c                  | 104 +++++++++++++++++++++++++++++++++++--
 gdk/gdkprofilerprivate.h           |  27 ++++++++++
 gdk/gdksurface.c                   |  12 ++---
 gdk/wayland/gdkdisplay-wayland.c   |   6 +--
 gdk/wayland/gdkglcontext-wayland.c |   2 +-
 gdk/wayland/gdksurface-wayland.c   |  10 ++--
 gdk/x11/gdkdisplay-x11.c           |  11 +++-
 gdk/x11/gdksurface-x11.c           |   9 +++-
 gdk/x11/gdksurface-x11.h           |   2 +
 gsk/gl/gskglprofiler.c             |   2 +-
 gsk/gl/gskglrenderer.c             |   6 +--
 gsk/gskprofiler.c                  |  17 +++---
 gsk/vulkan/gskvulkanrenderer.c     |   2 +-
 gtk/gtkapplication.c               |  12 ++---
 gtk/gtkbuilderparser.c             |   7 ++-
 gtk/gtkcssnode.c                   |   8 +--
 gtk/gtkcssprovider.c               |   8 +--
 gtk/gtkemojichooser.c              |  11 ++--
 gtk/gtkicontheme.c                 |  14 ++---
 gtk/gtkwidget.c                    |  18 +++----
 gtk/gtkwindow.c                    |   7 +--
 25 files changed, 229 insertions(+), 143 deletions(-)
---