From 11b0aa289f0c0d4751ae073c3164d103bc03f400 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCri=20Valdmann?= Date: Wed, 17 Jun 2020 13:33:36 +0200 Subject: Rename ShareGroupQtQuick to ShareGroupQt It's not really QtQuick specific. Change-Id: I34840004837495154876d38c7c1c994c11ace9ad Reviewed-by: Allan Sandfeld Jensen --- src/core/content_browser_client_qt.cpp | 16 ++++++++-------- src/core/content_browser_client_qt.h | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'src/core') diff --git a/src/core/content_browser_client_qt.cpp b/src/core/content_browser_client_qt.cpp index 05957c26f..c8d34ae73 100644 --- a/src/core/content_browser_client_qt.cpp +++ b/src/core/content_browser_client_qt.cpp @@ -301,16 +301,16 @@ private: void *m_handle; }; -class ShareGroupQtQuick : public gl::GLShareGroup { +class ShareGroupQt : public gl::GLShareGroup { public: - gl::GLContext* GetContext() override { return m_shareContextQtQuick.get(); } + gl::GLContext* GetContext() override { return m_shareContextQt.get(); } void AboutToAddFirstContext() override; private: - scoped_refptr m_shareContextQtQuick; + scoped_refptr m_shareContextQt; }; -void ShareGroupQtQuick::AboutToAddFirstContext() +void ShareGroupQt::AboutToAddFirstContext() { #if QT_CONFIG(opengl) // This currently has to be setup by ::main in all applications using QQuickWebEngineView with delegated rendering. @@ -318,7 +318,7 @@ void ShareGroupQtQuick::AboutToAddFirstContext() if (!shareContext) { qFatal("QWebEngine: OpenGL resource sharing is not set up in QtQuick. Please make sure to call QtWebEngine::initialize() in your main() function before QCoreApplication is created."); } - m_shareContextQtQuick = new QtShareGLContext(shareContext); + m_shareContextQt = new QtShareGLContext(shareContext); #endif } @@ -366,9 +366,9 @@ void ContentBrowserClientQt::RenderProcessWillLaunch(content::RenderProcessHost gl::GLShareGroup *ContentBrowserClientQt::GetInProcessGpuShareGroup() { - if (!m_shareGroupQtQuick.get()) - m_shareGroupQtQuick = new ShareGroupQtQuick; - return m_shareGroupQtQuick.get(); + if (!m_shareGroupQt.get()) + m_shareGroupQt = new ShareGroupQt; + return m_shareGroupQt.get(); } content::MediaObserver *ContentBrowserClientQt::GetMediaObserver() diff --git a/src/core/content_browser_client_qt.h b/src/core/content_browser_client_qt.h index 341564574..f536f2427 100644 --- a/src/core/content_browser_client_qt.h +++ b/src/core/content_browser_client_qt.h @@ -76,7 +76,7 @@ namespace QtWebEngineCore { class BrowserMainPartsQt; class ProfileQt; -class ShareGroupQtQuick; +class ShareGroupQt; class ContentBrowserClientQt : public content::ContentBrowserClient { @@ -261,7 +261,7 @@ public: private: void InitFrameInterfaces(); - scoped_refptr m_shareGroupQtQuick; + scoped_refptr m_shareGroupQt; std::unique_ptr m_frameInterfaces; std::unique_ptr> m_frameInterfacesParameterized; }; -- cgit v1.2.3