From da5b421cba5ae998eb318c6339881621314240d2 Mon Sep 17 00:00:00 2001
From: Michal Klocek <michal.klocek@qt.io>
Date: Wed, 14 Feb 2018 20:11:49 +0100
Subject: [PATCH] Rename GLOzoneQt to GLOzoneEGLQt
Change-Id: I0f88772a0e869de3c7bfd065227b6151558c7408
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
---
src/core/core_chromium.pri | 4 ++--
src/core/ozone/{gl_ozone_qt.cpp => gl_ozone_egl_qt.cpp} | 6 +++---
src/core/ozone/{gl_ozone_qt.h => gl_ozone_egl_qt.h} | 8 ++++----
src/core/ozone/surface_factory_qt.cpp | 4 ++--
4 files changed, 11 insertions(+), 11 deletions(-)
rename src/core/ozone/{gl_ozone_qt.cpp => gl_ozone_egl_qt.cpp} (96%)
rename src/core/ozone/{gl_ozone_qt.h => gl_ozone_egl_qt.h} (95%)
diff --git a/src/core/core_chromium.pri b/src/core/core_chromium.pri
index adc0e1fe0..3d23f44b7 100644
--- a/src/core/core_chromium.pri
+++ b/src/core/core_chromium.pri
@@ -80,7 +80,7 @@ SOURCES = \
net/url_request_custom_job_proxy.cpp \
net/url_request_qrc_job_qt.cpp \
net/webui_controller_factory_qt.cpp \
- ozone/gl_ozone_qt.cpp \
+ ozone/gl_ozone_egl_qt.cpp \
ozone/gl_surface_egl_qt.cpp \
ozone/gl_surface_glx_qt.cpp \
ozone/gl_surface_wgl_qt.cpp \
@@ -167,7 +167,7 @@ HEADERS = \
net/url_request_custom_job_proxy.h \
net/url_request_qrc_job_qt.h \
net/webui_controller_factory_qt.h \
- ozone/gl_ozone_qt.h \
+ ozone/gl_ozone_egl_qt.h \
ozone/gl_surface_egl_qt.h \
ozone/gl_surface_glx_qt.h \
ozone/gl_surface_wgl_qt.h \
diff --git a/src/core/ozone/gl_ozone_qt.cpp b/src/core/ozone/gl_ozone_egl_qt.cpp
similarity index 96%
rename from src/core/ozone/gl_ozone_qt.cpp
rename to src/core/ozone/gl_ozone_egl_qt.cpp
index 81d5ccfa9..a9b3da5e2 100644
--- a/src/core/ozone/gl_ozone_qt.cpp
+++ b/src/core/ozone/gl_ozone_egl_qt.cpp
@@ -42,7 +42,7 @@
#include "base/files/file_path.h"
#include "base/native_library.h"
#include "gl_context_qt.h"
-#include "ozone/gl_ozone_qt.h"
+#include "ozone/gl_ozone_egl_qt.h"
#include "ui/gl/gl_context_egl.h"
#include "ui/gl/gl_implementation.h"
#include "ui/gl/gl_surface.h"
@@ -70,7 +70,7 @@ base::NativeLibrary LoadLibrary(const base::FilePath& filename) {
return library;
}
-bool GLOzoneQt::LoadGLES2Bindings(gl::GLImplementation /*implementation*/)
+bool GLOzoneEGLQt::LoadGLES2Bindings(gl::GLImplementation /*implementation*/)
{
base::NativeLibrary eglgles2Library = dlopen(NULL, RTLD_LAZY);
if (!eglgles2Library) {
@@ -103,7 +103,7 @@ bool GLOzoneQt::LoadGLES2Bindings(gl::GLImplementation /*implementation*/)
return true;
}
-intptr_t GLOzoneQt::GetNativeDisplay()
+intptr_t GLOzoneEGLQt::GetNativeDisplay()
{
static void *display = GLContextHelper::getNativeDisplay();
diff --git a/src/core/ozone/gl_ozone_qt.h b/src/core/ozone/gl_ozone_egl_qt.h
similarity index 95%
rename from src/core/ozone/gl_ozone_qt.h
rename to src/core/ozone/gl_ozone_egl_qt.h
index 8af879748..fc609c51c 100644
--- a/src/core/ozone/gl_ozone_qt.h
+++ b/src/core/ozone/gl_ozone_egl_qt.h
@@ -37,8 +37,8 @@
**
****************************************************************************/
-#ifndef GL_OZONE_QT
-#define GL_OZONE_QT
+#ifndef GL_OZONE_EGL_QT
+#define GL_OZONE_EGL_QT
#if defined(USE_OZONE)
@@ -46,7 +46,7 @@
namespace QtWebEngineCore {
-class GLOzoneQt : public ui::GLOzoneEGL {
+class GLOzoneEGLQt : public ui::GLOzoneEGL {
public:
scoped_refptr<gl::GLSurface> CreateViewGLSurface(gfx::AcceleratedWidget /*window*/) override
{
@@ -70,4 +70,4 @@ protected:
#endif // defined(USE_OZONE)
-#endif // GL_OZONE_QT
+#endif // GL_OZONE_EGL_QT
diff --git a/src/core/ozone/surface_factory_qt.cpp b/src/core/ozone/surface_factory_qt.cpp
index b1db44f65..f21e14c30 100644
--- a/src/core/ozone/surface_factory_qt.cpp
+++ b/src/core/ozone/surface_factory_qt.cpp
@@ -39,7 +39,7 @@
#if defined(USE_OZONE)
-#include "ozone/gl_ozone_qt.h"
+#include "ozone/gl_ozone_egl_qt.h"
#include "ozone/surface_factory_qt.h"
#include "ui/gl/gl_surface.h"
namespace QtWebEngineCore {
@@ -53,7 +53,7 @@ std::vector<gl::GLImplementation> SurfaceFactoryQt::GetAllowedGLImplementations(
ui::GLOzone* SurfaceFactoryQt::GetGLOzone(gl::GLImplementation implementation)
{
- return new GLOzoneQt();
+ return new GLOzoneEGLQt();
}
} // namespace QtWebEngineCore
--
GitLab