Merge remote-tracking branch 'upstream/pull/42'

* upstream/pull/42
  ilmCommon: remove draw-, updateCounter
  LayerManagerControl: remove update and redraw counter
  ilmControl: remove redraw/update count
  ivi-controller: implement surface frame counter
  protocol: remove unneeded stats from surface_stats event

  Reviewed-by: Eugen Friedrich <efriedrich@de.adit-jv.com>
  Tested-by: Micheal Teyfel <mteyfel@de.adit-jv.com>

2 files changed, 2 insertions, 8 deletions

diff --git a/ivi-layermanagement-api/ilmCommon/include/ilm_types.h b/ivi-layermanagement-api/ilmCommon/include/ilm_types.h
index c654e7b..a88f2b0 100644
--- a/ivi-layermanagement-api/ilmCommon/include/ilm_types.h
+++ b/ivi-layermanagement-api/ilmCommon/include/ilm_types.h
@@ -197,8 +197,6 @@ struct ilmSurfaceProperties
     t_ilm_uint destHeight;                  /*!< destination height value of the surface */
     t_ilm_bool visibility;                  /*!< visibility value of the surface */
     t_ilm_uint frameCounter;                /*!< already rendered frames of surface */
-    t_ilm_uint drawCounter;                 /*!< content updates of surface */
-    t_ilm_uint updateCounter;               /*!< content updates of surface */
     t_ilm_int  creatorPid;                  /*!< process id of application that created this surface */
     ilmInputDevice focus;                   /*!< bitmask of every type of device that this surface has focus in */
 };
diff --git a/ivi-layermanagement-api/ilmControl/src/ilm_control_wayland_platform.c b/ivi-layermanagement-api/ilmControl/src/ilm_control_wayland_platform.c
index 171928c..7b39ee4 100644
--- a/ivi-layermanagement-api/ilmControl/src/ilm_control_wayland_platform.c
+++ b/ivi-layermanagement-api/ilmControl/src/ilm_control_wayland_platform.c
@@ -493,21 +493,17 @@ wm_listener_surface_destination_rectangle(void *data, struct ivi_wm *controller,
 
 static void
 wm_listener_surface_stats(void *data, struct ivi_wm *controller,
-                          uint32_t surface_id, uint32_t redraw_count,
-                          uint32_t frame_count, uint32_t update_count,
-                          uint32_t pid, const char *process_name)
+                          uint32_t surface_id, uint32_t frame_count,
+                          uint32_t pid)
 {
     struct wayland_context *ctx = data;
     struct surface_context *ctx_surf;
-    (void)process_name;
 
     ctx_surf = get_surface_context(ctx, surface_id);
     if(!ctx_surf)
         return;
 
-    ctx_surf->prop.drawCounter = (t_ilm_uint)redraw_count;
     ctx_surf->prop.frameCounter = (t_ilm_uint)frame_count;
-    ctx_surf->prop.updateCounter = (t_ilm_uint)update_count;
     ctx_surf->prop.creatorPid = (t_ilm_uint)pid;
 }