[gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/, dev-qt/qtwebengine/files/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     f50ddb7b79edf05472d8a9852c6c76d939391177
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 16 11:06:24 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jun 16 11:06:24 2018 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=f50ddb7b

dev-qt/qtwebengine: Fix page rendering

See also: https://bugreports.qt.io/browse/QTBUG-68224

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 .../files/qtwebengine-5.11.0-fix-page-render.patch | 29 ++++++++++++++++++++++
 dev-qt/qtwebengine/qtwebengine-5.11.0.ebuild       |  5 +++-
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.11.0-fix-page-render.patch b/dev-qt/qtwebengine/files/qtwebengine-5.11.0-fix-page-render.patch
new file mode 100644
index 00000000..7bfaf322
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.11.0-fix-page-render.patch
@@ -0,0 +1,29 @@
+From ce01bf795b5a50e28e119d1925b395b8bfcf419b Mon Sep 17 00:00:00 2001
+From: =?utf8?q?J=C3=BCri=20Valdmann?= <juri.valdmann@qt.io>
+Date: Tue, 15 May 2018 16:21:04 +0200
+Subject: [PATCH] Remove old focusProxy widget from layout in
+ RWHVQDW::initAsChild
+
+Task-number: QTBUG-68224
+Change-Id: I317915f0c81531e5858dfa3a76365b16266ce919
+Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
+---
+ src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp b/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp
+index 16ea216f2..56f04d424 100644
+--- a/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp
++++ b/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp
+@@ -198,6 +198,9 @@ void RenderWidgetHostViewQtDelegateWidget::initAsChild(WebContentsAdapterClient*
+             disconnect(parentWidget(), &QObject::destroyed,
+                 this, &RenderWidgetHostViewQtDelegateWidget::removeParentBeforeParentDelete);
+         pagePrivate->view->layout()->addWidget(this);
++        if (QWidget *focusProxy = pagePrivate->view->focusProxy())
++            if (focusProxy != this)
++                pagePrivate->view->layout()->removeWidget(focusProxy);
+         pagePrivate->view->setFocusProxy(this);
+         show();
+     } else
+-- 
+2.16.3

diff --git a/dev-qt/qtwebengine/qtwebengine-5.11.0.ebuild b/dev-qt/qtwebengine/qtwebengine-5.11.0.ebuild
index df8f0ed1..46f6eac4 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.11.0.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.11.0.ebuild
@@ -77,7 +77,10 @@ DEPEND="${RDEPEND}
 	pax_kernel? ( sys-apps/elfix )
 "
 
-PATCHES+=( "${FILESDIR}/${PN}-5.11.0-fix-build-w-o-qtlocation.patch" )
+PATCHES+=(
+	"${FILESDIR}/${P}-fix-build-w-o-qtlocation.patch"
+	"${FILESDIR}/${P}-fix-page-render.patch"
+)
 
 src_prepare() {
 	use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" )