[gtk/gtk-3-24: 2/2] Merge branch 'wip/chergert/gdkprofiler-gtk3' into 'gtk-3-24'

[Matthias Clasen <matthiasc src gnome org>]

commit dcdab5b85c737cc45dfcc5d90ee200fbbdeccfe4
Merge: 3db1681c76 ef67eb0b3c
Author: Matthias Clasen <mclasen redhat com>
Date:   Fri Jun 7 03:49:40 2019 +0000

    Merge branch 'wip/chergert/gdkprofiler-gtk3' into 'gtk-3-24'
    
    gdk: backport GdkProfiler
    
    See merge request GNOME/gtk!918

 config.h.meson                  |   3 +
 configure.ac                    |  24 ++++-
 gdk/Makefile.am                 |   2 +
 gdk/gdk-private.c               |   4 +
 gdk/gdk-private.h               |   4 +
 gdk/gdk.c                       |   5 +
 gdk/gdkframeclock.c             | 112 +++++++++++++++++++
 gdk/gdkframeclockidle.c         |  32 +++++-
 gdk/gdkframeclockprivate.h      |   2 +
 gdk/gdkprofiler.c               | 230 ++++++++++++++++++++++++++++++++++++++++
 gdk/gdkprofilerprivate.h        |  46 ++++++++
 gdk/meson.build                 |   7 ++
 gdk/wayland/gdkwindow-wayland.c |   4 +
 gdk/x11/gdkdisplay-x11.c        |   4 +
 gtk/gtkapplication.c            | 155 +++++++++++++++++++++++++++
 meson.build                     |  11 ++
 meson_options.txt               |   2 +
 17 files changed, 643 insertions(+), 4 deletions(-)
---