From b3cd624bdbcc88f4533278fcd4274443b087c23a Mon Sep 17 00:00:00 2001 From: Rmys Date: Sat, 13 Jul 2019 20:52:42 +0300 Subject: [PATCH] qt5-webengine --- .../qt5/qt5-webengine/files/qtbug-76913.patch | 29 +++++++++++++++++++ desktop/toolkit/qt5/qt5-webengine/pspec.xml | 2 +- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 desktop/toolkit/qt5/qt5-webengine/files/qtbug-76913.patch diff --git a/desktop/toolkit/qt5/qt5-webengine/files/qtbug-76913.patch b/desktop/toolkit/qt5/qt5-webengine/files/qtbug-76913.patch new file mode 100644 index 0000000000..4e902e0c87 --- /dev/null +++ b/desktop/toolkit/qt5/qt5-webengine/files/qtbug-76913.patch @@ -0,0 +1,29 @@ +From 4746bb904bf6841137d5b50357bf79c852bf5d06 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=BCri=20Valdmann?= +Date: Thu, 4 Jul 2019 15:38:05 +0200 +Subject: Null check result of consuming mailbox texture + +Fixes: QTBUG-76913 +Change-Id: Ib036121f366d037d507f59bf31c3ab9c79bfea5e +Reviewed-by: Allan Sandfeld Jensen +--- + src/core/compositor/compositor_resource_tracker.cpp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/core/compositor/compositor_resource_tracker.cpp b/src/core/compositor/compositor_resource_tracker.cpp +index 73242c69..741c2717 100644 +--- a/src/core/compositor/compositor_resource_tracker.cpp ++++ b/src/core/compositor/compositor_resource_tracker.cpp +@@ -174,7 +174,8 @@ quint32 CompositorResourceTracker::consumeMailbox(const gpu::MailboxHolder &mail + DCHECK(mailboxManager); + if (mailboxHolder.sync_token.HasData()) + mailboxManager->PullTextureUpdates(mailboxHolder.sync_token); +- return service_id(mailboxManager->ConsumeTexture(mailboxHolder.mailbox)); ++ gpu::TextureBase *tex = mailboxManager->ConsumeTexture(mailboxHolder.mailbox); ++ return tex ? service_id(tex) : 0; + #else + NOTREACHED(); + #endif // QT_CONFIG(OPENGL) +-- +cgit v1.2.1 + diff --git a/desktop/toolkit/qt5/qt5-webengine/pspec.xml b/desktop/toolkit/qt5/qt5-webengine/pspec.xml index c7e466f8d0..ef194e3692 100755 --- a/desktop/toolkit/qt5/qt5-webengine/pspec.xml +++ b/desktop/toolkit/qt5/qt5-webengine/pspec.xml @@ -74,7 +74,7 @@ poppler-cpp-devel - + qtbug-76913.patch