From 4144406df5bb4a0062e95de24eba03ee90e05576 Mon Sep 17 00:00:00 2001
From: Szabolcs David <davidsz@inf.u-szeged.hu>
Date: Mon, 27 Apr 2015 01:30:19 -0700
Subject: [PATCH] Widgets: Use overridden show()
Notify client about the show() after RWHVQD creation. The
WasShown(...) hack is not necessary anymore in the core layer.
Change-Id: I221b2d027ee83d81d70191419bc4fa8d41231674
Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
---
src/core/web_contents_delegate_qt.cpp | 3 ---
.../render_widget_host_view_qt_delegate_widget.cpp | 2 +-
2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/src/core/web_contents_delegate_qt.cpp b/src/core/web_contents_delegate_qt.cpp
index 581a16adb..f9db91b3e 100644
--- a/src/core/web_contents_delegate_qt.cpp
+++ b/src/core/web_contents_delegate_qt.cpp
@@ -121,9 +121,6 @@ void WebContentsDelegateQt::AddNewContents(content::WebContents* source, content
WebContentsAdapter *newAdapter = createWindow(new_contents, disposition, initial_pos, user_gesture);
if (was_blocked)
*was_blocked = !newAdapter;
-
- if (content::RenderWidgetHostImpl *impl = content::RenderWidgetHostImpl::From(new_contents->GetRenderViewHost()))
- impl->WasShown(ui::LatencyInfo());
}
void WebContentsDelegateQt::CloseContents(content::WebContents *source)
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 d615b0f9c..dba37cea7 100644
--- a/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp
+++ b/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp
@@ -81,7 +81,7 @@ void RenderWidgetHostViewQtDelegateWidget::initAsChild(WebContentsAdapterClient*
if (pagePrivate->view) {
pagePrivate->view->layout()->addWidget(this);
pagePrivate->view->setFocusProxy(this);
- QOpenGLWidget::show();
+ show();
} else
setParent(0);
}
--
GitLab