QNX: remove mmrenderer overlay window support

QtMultimedia no longer supports overlay windows. The QNX multimedia
plugin now relies on the canonical rendering codepath via QVideoWindow.

Change-Id: Ic3bb14865f147a47200554e4791c191540e5bb75
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: James McDonnell <jmcdonnell@blackberry.com>

1 files changed, 20 insertions, 82 deletions

diff --git a/src/plugins/platforms/qnx/qqnxscreen.cpp b/src/plugins/platforms/qnx/qqnxscreen.cpp
index 010ae37ac9..7b33eed3ab 100644
--- a/src/plugins/platforms/qnx/qqnxscreen.cpp
+++ b/src/plugins/platforms/qnx/qqnxscreen.cpp
@@ -62,13 +62,9 @@
 #error Please define QQNX_PHYSICAL_SCREEN_WIDTH and QQNX_PHYSICAL_SCREEN_HEIGHT to values greater than zero
 #endif
 
-// The default z-order of a window (intended to be overlain) created by
-// mmrender.
-static const int MMRENDER_DEFAULT_ZORDER = -1;
-
 // The maximum z-order at which a foreign window will be considered
 // an underlay.
-static const int MAX_UNDERLAY_ZORDER = MMRENDER_DEFAULT_ZORDER - 1;
+static const int MAX_UNDERLAY_ZORDER = -1;
 
 QT_BEGIN_NAMESPACE
 
@@ -118,38 +114,6 @@ static QSize determineScreenSize(screen_display_t display, bool primaryScreen) {
 #endif
 }
 
-static QQnxWindow *findMultimediaWindow(const QList<QQnxWindow*> &windows,
-                                                    const QByteArray &mmWindowId)
-{
-    Q_FOREACH (QQnxWindow *sibling, windows) {
-        if (sibling->mmRendererWindowName() == mmWindowId)
-            return sibling;
-
-        QQnxWindow *mmWindow = findMultimediaWindow(sibling->children(), mmWindowId);
-
-        if (mmWindow)
-            return mmWindow;
-    }
-
-    return 0;
-}
-
-static QQnxWindow *findMultimediaWindow(const QList<QQnxWindow*> &windows,
-                                                    screen_window_t mmWindowId)
-{
-    Q_FOREACH (QQnxWindow *sibling, windows) {
-        if (sibling->mmRendererWindow() == mmWindowId)
-            return sibling;
-
-        QQnxWindow *mmWindow = findMultimediaWindow(sibling->children(), mmWindowId);
-
-        if (mmWindow)
-            return mmWindow;
-    }
-
-    return 0;
-}
-
 QQnxScreen::QQnxScreen(screen_context_t screenContext, screen_display_t display, bool primaryScreen)
     : m_screenContext(screenContext),
       m_display(display),
@@ -714,19 +678,6 @@ void QQnxScreen::addUnderlayWindow(screen_window_t window)
     updateHierarchy();
 }
 
-void QQnxScreen::addMultimediaWindow(const QByteArray &id, screen_window_t window)
-{
-    // find the QnxWindow this mmrenderer window is related to
-    QQnxWindow *mmWindow = findMultimediaWindow(m_childWindows, id);
-
-    if (!mmWindow)
-        return;
-
-    mmWindow->setMMRendererWindow(window);
-
-    updateHierarchy();
-}
-
 void QQnxScreen::removeOverlayOrUnderlayWindow(screen_window_t window)
 {
     const int numRemoved = m_overlays.removeAll(window) + m_underlays.removeAll(window);
@@ -762,32 +713,24 @@ void QQnxScreen::newWindowCreated(void *window)
 
     windowName = QByteArray(windowNameBuffer);
 
-    if (display == nativeDisplay()) {
-        // A window was created on this screen. If we don't know about this window yet, it means
-        // it was not created by Qt, but by some foreign library like the multimedia renderer, which
-        // creates an overlay window when playing a video.
-        //
-        // Treat all foreign windows as overlays, underlays or as windows
-        // created by the BlackBerry QtMultimedia plugin.
-        //
-        // In the case of the BlackBerry QtMultimedia plugin, we need to
-        // "attach" the foreign created mmrenderer window to the correct
-        // platform window (usually the one belonging to QVideoWidget) to
-        // ensure proper z-ordering.
-        //
-        // Otherwise, assume that if a foreign window already has a Z-Order both negative and
-        // less than the default Z-Order installed by mmrender on windows it creates,
-        // the windows should be treated as an underlay. Otherwise, we treat it as an overlay.
-        if (!windowName.isEmpty() && windowName.startsWith("MmRendererVideoWindowControl")) {
-            addMultimediaWindow(windowName, windowHandle);
-        } else if (!findWindow(windowHandle)) {
-            if (zorder <= MAX_UNDERLAY_ZORDER)
-                addUnderlayWindow(windowHandle);
-            else
-                addOverlayWindow(windowHandle);
-            Q_EMIT foreignWindowCreated(windowHandle);
-        }
-    }
+    if (display != nativeDisplay())
+        return;
+
+    // A window was created on this screen. If we don't know about this window yet, it means
+    // it was not created by Qt, but by some foreign library.
+    //
+    // Treat all foreign windows as overlays or underlays. A window will
+    // be treated as an underlay if its Z-order is less or equal than
+    // MAX_UNDERLAY_ZORDER. Otherwise, it will be treated as an overlay.
+    if (findWindow(windowHandle))
+        return;
+
+    if (zorder <= MAX_UNDERLAY_ZORDER)
+        addUnderlayWindow(windowHandle);
+    else
+        addOverlayWindow(windowHandle);
+
+    Q_EMIT foreignWindowCreated(windowHandle);
 }
 
 void QQnxScreen::windowClosed(void *window)
@@ -795,12 +738,7 @@ void QQnxScreen::windowClosed(void *window)
     Q_ASSERT(thread() == QThread::currentThread());
     const screen_window_t windowHandle = reinterpret_cast<screen_window_t>(window);
 
-    QQnxWindow *mmWindow = findMultimediaWindow(m_childWindows, windowHandle);
-
-    if (mmWindow)
-        mmWindow->clearMMRendererWindow();
-    else
-        removeOverlayOrUnderlayWindow(windowHandle);
+    removeOverlayOrUnderlayWindow(windowHandle);
 }
 
 void QQnxScreen::windowGroupStateChanged(const QByteArray &id, Qt::WindowState state)