From a92ee8265185de61e350e63ae96c3d5a45355f07 Mon Sep 17 00:00:00 2001 From: Axel Spoerl Date: Fri, 4 Aug 2023 07:35:31 +0200 Subject: [PATCH] Fix link to platform window in QAndroidPlatformBackingStore::flush() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The Android QPA implementation requires a 1:1 link between a platform window and a platform backing store, to correctly flush a backing store to the screen. QAndroidPlatformBackingStore has a bool member m_backingStoreSet, to remember if this link exists. It defaults to false and is set to true, when setBackingStore() is called in the constructor. It falsely remains true, when a platform window is deleted, e.g. because a QWindow has been hidden. When the QWindow is shown again, a new Android platform window is created. With m_backingStoreSet still being true, this new platform window will never be associated with a backing store. As a consequence, it will never be displayed on the screen. The 1:1 relationship of an Android platform window and an Android backing store is neither ideal, nor in line with other QPA layers (e.g. XCB). Changing the Android QPA implementation is complex and a short term fix is necessary. This patch removes the member m_backingStoreSet. Instead of it, QAndroidPlatformBackingStore::flush() directly checks, if the platform window corresponding to the QWindow argument is associated to a backing store. If that is not the case, setBackingStore() is called. QTBUG-97482 has been fixed with another approach, which this patch reverts. The following commits are effectively reverted by this patch: 9a39ad8dfb4e6d1a179bd0fa38026886f8f7cb8e f91588923b1e7b68f1bd79b38af44d024df85996 a4ca9e80658bca7dad1529f03c1b59173a6ecf62 dbb072eb2838a04e89e34dad686394a496d5de87 959a8b3967ac3b6315f5b458628ec5661dfc367e Fixes: QTBUG-97482 Change-Id: Ic4344f8df2e954c057dd2705340f11dfd2d4c6fe Reviewed-by: Tor Arne Vestbø (cherry picked from commit 86fe84f5f7fd9a55e0f26a9572996caf443ff834) Reviewed-by: Qt Cherry-pick Bot --- src/gui/kernel/qplatformwindow.h | 3 --- src/platformsupport/fbconvenience/qfbscreen.cpp | 1 - src/platformsupport/fbconvenience/qfbwindow.cpp | 10 +--------- src/platformsupport/fbconvenience/qfbwindow_p.h | 2 +- .../android/qandroidplatformbackingstore.cpp | 6 +++--- .../platforms/android/qandroidplatformbackingstore.h | 1 - .../platforms/android/qandroidplatformscreen.cpp | 2 +- .../platforms/android/qandroidplatformwindow.cpp | 12 ++---------- .../platforms/android/qandroidplatformwindow.h | 2 +- src/plugins/platforms/eglfs/api/qeglfswindow.cpp | 6 +----- src/plugins/platforms/eglfs/api/qeglfswindow_p.h | 2 +- src/plugins/platforms/wasm/qwasmwindow.cpp | 8 -------- src/plugins/platforms/wasm/qwasmwindow.h | 2 +- src/widgets/kernel/qwidget.cpp | 5 ----- 14 files changed, 12 insertions(+), 50 deletions(-) diff --git a/src/gui/kernel/qplatformwindow.h b/src/gui/kernel/qplatformwindow.h index 517dd1ea421..b6e96a457ef 100644 --- a/src/gui/kernel/qplatformwindow.h +++ b/src/gui/kernel/qplatformwindow.h @@ -32,7 +32,6 @@ class QScreen; class QWindow; class QIcon; class QRegion; -class QPlatformBackingStore; class Q_GUI_EXPORT QPlatformWindow : public QPlatformSurface { @@ -118,8 +117,6 @@ public: virtual void requestUpdate(); bool hasPendingUpdateRequest() const; virtual void deliverUpdateRequest(); -#define QT_PLATFORM_WINDOW_HAS_VIRTUAL_SET_BACKING_STORE // remove when all modules have migrated - virtual void setBackingStore(QPlatformBackingStore *) {} // Window property accessors. Platform plugins should use these // instead of accessing QWindow directly. diff --git a/src/platformsupport/fbconvenience/qfbscreen.cpp b/src/platformsupport/fbconvenience/qfbscreen.cpp index a5d87fec041..e804488005f 100644 --- a/src/platformsupport/fbconvenience/qfbscreen.cpp +++ b/src/platformsupport/fbconvenience/qfbscreen.cpp @@ -47,7 +47,6 @@ bool QFbScreen::event(QEvent *event) void QFbScreen::addWindow(QFbWindow *window) { - Q_ASSERT(window->backingStore()); mWindowStack.prepend(window); if (!mPendingBackingStores.isEmpty()) { //check if we have a backing store for this window diff --git a/src/platformsupport/fbconvenience/qfbwindow.cpp b/src/platformsupport/fbconvenience/qfbwindow.cpp index 8df50a14dac..54716cc4976 100644 --- a/src/platformsupport/fbconvenience/qfbwindow.cpp +++ b/src/platformsupport/fbconvenience/qfbwindow.cpp @@ -3,11 +3,9 @@ #include "qfbwindow_p.h" #include "qfbscreen_p.h" -#include "qfbbackingstore_p.h" #include #include -#include QT_BEGIN_NAMESPACE @@ -113,11 +111,5 @@ void QFbWindow::repaint(const QRegion ®ion) for (auto rect : region) platformScreen()->setDirty(rect.translated(topLeft)); } -void QFbWindow::setBackingStore(QPlatformBackingStore *store) -{ - Q_ASSERT(store); - Q_ASSERT_X(dynamic_cast(store), __FUNCTION__, - "Argument is not a QFbBackingStore."); - mBackingStore = static_cast(store); -} + QT_END_NAMESPACE diff --git a/src/platformsupport/fbconvenience/qfbwindow_p.h b/src/platformsupport/fbconvenience/qfbwindow_p.h index 8848e9dcf85..8367a10bcef 100644 --- a/src/platformsupport/fbconvenience/qfbwindow_p.h +++ b/src/platformsupport/fbconvenience/qfbwindow_p.h @@ -41,7 +41,7 @@ public: WId winId() const override { return mWindowId; } - void setBackingStore(QPlatformBackingStore *store) override; + void setBackingStore(QFbBackingStore *store) { mBackingStore = store; } QFbBackingStore *backingStore() const { return mBackingStore; } QFbScreen *platformScreen() const; diff --git a/src/plugins/platforms/android/qandroidplatformbackingstore.cpp b/src/plugins/platforms/android/qandroidplatformbackingstore.cpp index 33c422bb1ec..09cc9ce8c6b 100644 --- a/src/plugins/platforms/android/qandroidplatformbackingstore.cpp +++ b/src/plugins/platforms/android/qandroidplatformbackingstore.cpp @@ -25,10 +25,11 @@ void QAndroidPlatformBackingStore::flush(QWindow *window, const QRegion ®ion, { Q_UNUSED(offset); - if (!m_backingStoreSet) + auto *platformWindow = static_cast(window->handle()); + if (!platformWindow->backingStore()) setBackingStore(window); - (static_cast(window->handle()))->repaint(region); + platformWindow->repaint(region); } void QAndroidPlatformBackingStore::resize(const QSize &size, const QRegion &staticContents) @@ -42,7 +43,6 @@ void QAndroidPlatformBackingStore::resize(const QSize &size, const QRegion &stat void QAndroidPlatformBackingStore::setBackingStore(QWindow *window) { (static_cast(window->handle()))->setBackingStore(this); - m_backingStoreSet = true; } QT_END_NAMESPACE diff --git a/src/plugins/platforms/android/qandroidplatformbackingstore.h b/src/plugins/platforms/android/qandroidplatformbackingstore.h index 810305ac452..b64a9f27bb7 100644 --- a/src/plugins/platforms/android/qandroidplatformbackingstore.h +++ b/src/plugins/platforms/android/qandroidplatformbackingstore.h @@ -21,7 +21,6 @@ public: void setBackingStore(QWindow *window); protected: QImage m_image; - bool m_backingStoreSet = false; }; QT_END_NAMESPACE diff --git a/src/plugins/platforms/android/qandroidplatformscreen.cpp b/src/plugins/platforms/android/qandroidplatformscreen.cpp index 6c61306d021..45b73d3cf19 100644 --- a/src/plugins/platforms/android/qandroidplatformscreen.cpp +++ b/src/plugins/platforms/android/qandroidplatformscreen.cpp @@ -43,7 +43,7 @@ public: } private: - QElapsedTimer m_timer; + QTime m_timer; QString m_msg; }; diff --git a/src/plugins/platforms/android/qandroidplatformwindow.cpp b/src/plugins/platforms/android/qandroidplatformwindow.cpp index 1bc4a04b989..b1eba17d040 100644 --- a/src/plugins/platforms/android/qandroidplatformwindow.cpp +++ b/src/plugins/platforms/android/qandroidplatformwindow.cpp @@ -5,9 +5,9 @@ #include "qandroidplatformwindow.h" #include "qandroidplatformopenglcontext.h" #include "qandroidplatformscreen.h" -#include "qandroidplatformbackingstore.h" + #include "androidjnimain.h" -#include "qpa/qplatformbackingstore.h" + #include #include #include @@ -169,12 +169,4 @@ void QAndroidPlatformWindow::applicationStateChanged(Qt::ApplicationState) QWindowSystemInterface::flushWindowSystemEvents(); } -void QAndroidPlatformWindow::setBackingStore(QPlatformBackingStore *store) -{ - Q_ASSERT(store); - Q_ASSERT_X(dynamic_cast(store), __FUNCTION__, - "Argument is not a QAndroidPlatformBackingStore."); - m_backingStore = static_cast(store); -} - QT_END_NAMESPACE diff --git a/src/plugins/platforms/android/qandroidplatformwindow.h b/src/plugins/platforms/android/qandroidplatformwindow.h index ee2771ee110..6fccc2e7fea 100644 --- a/src/plugins/platforms/android/qandroidplatformwindow.h +++ b/src/plugins/platforms/android/qandroidplatformwindow.h @@ -50,7 +50,7 @@ public: virtual void applicationStateChanged(Qt::ApplicationState); - void setBackingStore(QPlatformBackingStore *store) override; + void setBackingStore(QAndroidPlatformBackingStore *store) { m_backingStore = store; } QAndroidPlatformBackingStore *backingStore() const { return m_backingStore; } virtual void repaint(const QRegion &) { } diff --git a/src/plugins/platforms/eglfs/api/qeglfswindow.cpp b/src/plugins/platforms/eglfs/api/qeglfswindow.cpp index 6210ef16a8e..1a31f97d7b8 100644 --- a/src/plugins/platforms/eglfs/api/qeglfswindow.cpp +++ b/src/plugins/platforms/eglfs/api/qeglfswindow.cpp @@ -108,12 +108,8 @@ void QEglFSWindow::create() #endif } -void QEglFSWindow::setBackingStore(QPlatformBackingStore *store) +void QEglFSWindow::setBackingStore(QOpenGLCompositorBackingStore *backingStore) { - Q_ASSERT(store); - Q_ASSERT_X(dynamic_cast(store), __FUNCTION__, - "Argument is not a QOpenGLCompositorBackingStore."); - auto *backingStore = static_cast(store); #ifndef QT_NO_OPENGL if (!m_rasterCompositingContext) { m_rasterCompositingContext = new QOpenGLContext; diff --git a/src/plugins/platforms/eglfs/api/qeglfswindow_p.h b/src/plugins/platforms/eglfs/api/qeglfswindow_p.h index d8e0a4a7359..d111042040a 100644 --- a/src/plugins/platforms/eglfs/api/qeglfswindow_p.h +++ b/src/plugins/platforms/eglfs/api/qeglfswindow_p.h @@ -71,7 +71,7 @@ public: #ifndef QT_NO_OPENGL QOpenGLCompositorBackingStore *backingStore() { return m_backingStore; } - void setBackingStore(QPlatformBackingStore *backingStore) override; + void setBackingStore(QOpenGLCompositorBackingStore *backingStore); QWindow *sourceWindow() const override; const QPlatformTextureList *textures() const override; void endCompositing() override; diff --git a/src/plugins/platforms/wasm/qwasmwindow.cpp b/src/plugins/platforms/wasm/qwasmwindow.cpp index 9ec15d631ad..8986db682a0 100644 --- a/src/plugins/platforms/wasm/qwasmwindow.cpp +++ b/src/plugins/platforms/wasm/qwasmwindow.cpp @@ -232,14 +232,6 @@ QWasmScreen *QWasmWindow::platformScreen() const return static_cast(window()->screen()->handle()); } -void QWasmWindow::setBackingStore(QPlatformBackingStore *store) -{ - Q_ASSERT(store); - Q_ASSERT_X(dynamic_cast(store), __FUNCTION__, - "Argument is not a QWasmBackingStore."); - m_backingStore = static_cast(store); -} - void QWasmWindow::paint() { if (!m_backingStore || !isVisible() || m_context2d.isUndefined()) diff --git a/src/plugins/platforms/wasm/qwasmwindow.h b/src/plugins/platforms/wasm/qwasmwindow.h index 8f8e41a4979..aaf319c6cb6 100644 --- a/src/plugins/platforms/wasm/qwasmwindow.h +++ b/src/plugins/platforms/wasm/qwasmwindow.h @@ -85,7 +85,7 @@ public: void setMask(const QRegion ®ion) final; QWasmScreen *platformScreen() const; - void setBackingStore(QPlatformBackingStore *store) override; + void setBackingStore(QWasmBackingStore *store) { m_backingStore = store; } QWasmBackingStore *backingStore() const { return m_backingStore; } QWindow *window() const { return m_window; } diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp index 5e25d63eae8..e3d78864e6f 100644 --- a/src/widgets/kernel/qwidget.cpp +++ b/src/widgets/kernel/qwidget.cpp @@ -1338,11 +1338,6 @@ void QWidgetPrivate::create() #endif usesRhiFlush = false; - // Re-use backing store, in case a new platform window was created and doesn't know about it. - // (e.g. QAndroidPlatformWindow) - if (store && q->windowHandle()) - q->windowHandle()->handle()->setBackingStore(store->handle()); - if (!store) { if (q->windowType() != Qt::Desktop) { if (q->isWindow()) {