From dcf135e2a5ddbb2322a3cfb7b6ffd2921c408b36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADctor=20Manuel=20J=C3=A1quez=20Leal?=
 <vjaquez@igalia.com>
Date: Thu, 28 Sep 2017 16:12:23 +0200
Subject: [PATCH] libs: display: remove parent member

Parent was a crumb left from display cache.

https://bugzilla.gnome.org/show_bug.cgi?id=782212
---
 gst-libs/gst/vaapi/gstvaapidisplay.c      | 15 +++------------
 gst-libs/gst/vaapi/gstvaapidisplay_priv.h |  1 -
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/gst-libs/gst/vaapi/gstvaapidisplay.c b/gst-libs/gst/vaapi/gstvaapidisplay.c
index 1d34434abc..d8c2c58b5e 100644
--- a/gst-libs/gst/vaapi/gstvaapidisplay.c
+++ b/gst-libs/gst/vaapi/gstvaapidisplay.c
@@ -813,8 +813,7 @@ gst_vaapi_display_destroy (GstVaapiDisplay * display)
   }
 
   if (priv->display) {
-    if (!priv->parent)
-      vaTerminate (priv->display);
+    vaTerminate (priv->display);
     priv->display = NULL;
   }
 
@@ -829,8 +828,6 @@ gst_vaapi_display_destroy (GstVaapiDisplay * display)
 
   g_free (priv->vendor_string);
   priv->vendor_string = NULL;
-
-  gst_vaapi_display_replace_internal (&priv->parent, NULL);
 }
 
 static gboolean
@@ -885,10 +882,8 @@ gst_vaapi_display_create_unlocked (GstVaapiDisplay * display,
   if (!priv->display)
     return FALSE;
 
-  if (!priv->parent) {
-    if (!vaapi_initialize (priv->display))
-      return FALSE;
-  }
+  if (!vaapi_initialize (priv->display))
+    return FALSE;
 
   GST_INFO_OBJECT (display, "new display addr=%p", display);
   g_free (priv->display_name);
@@ -908,8 +903,6 @@ gst_vaapi_display_lock_default (GstVaapiDisplay * display)
 {
   GstVaapiDisplayPrivate *priv = GST_VAAPI_DISPLAY_GET_PRIVATE (display);
 
-  if (priv->parent)
-    priv = GST_VAAPI_DISPLAY_GET_PRIVATE (priv->parent);
   g_rec_mutex_lock (&priv->mutex);
 }
 
@@ -918,8 +911,6 @@ gst_vaapi_display_unlock_default (GstVaapiDisplay * display)
 {
   GstVaapiDisplayPrivate *priv = GST_VAAPI_DISPLAY_GET_PRIVATE (display);
 
-  if (priv->parent)
-    priv = GST_VAAPI_DISPLAY_GET_PRIVATE (priv->parent);
   g_rec_mutex_unlock (&priv->mutex);
 }
 
diff --git a/gst-libs/gst/vaapi/gstvaapidisplay_priv.h b/gst-libs/gst/vaapi/gstvaapidisplay_priv.h
index c4ef59fed7..4d8e01ea72 100644
--- a/gst-libs/gst/vaapi/gstvaapidisplay_priv.h
+++ b/gst-libs/gst/vaapi/gstvaapidisplay_priv.h
@@ -109,7 +109,6 @@ typedef enum _GstVaapiDisplayInitType           GstVaapiDisplayInitType;
 
 struct _GstVaapiDisplayPrivate
 {
-  GstVaapiDisplay *parent;
   GRecMutex mutex;
   GstVaapiDisplayType display_type;
   gchar *display_name;