Move last surface and context classes to ozone

Moves last two remaining classes to ozone.
Now all the context and surface handling is in ozone subdir.

Change-Id: I87d4570f866b905e8f79a73d70f04bd8b21f6e1b
Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>

8 files changed, 7 insertions, 7 deletions

diff --git a/src/core/chromium_overrides.cpp b/src/core/chromium_overrides.cpp
index 3aa554eb6..f3b7d3897 100644
--- a/src/core/chromium_overrides.cpp
+++ b/src/core/chromium_overrides.cpp
@@ -39,7 +39,7 @@
 
 #include "chromium_overrides.h"
 
-#include "gl_context_qt.h"
+#include "ozone/gl_context_qt.h"
 #include "qtwebenginecoreglobal_p.h"
 #include "web_contents_view_qt.h"
 
diff --git a/src/core/core_chromium.pri b/src/core/core_chromium.pri
index a2c22c5d2..ef81988dc 100644
--- a/src/core/core_chromium.pri
+++ b/src/core/core_chromium.pri
@@ -63,8 +63,6 @@ SOURCES = \
         download_manager_delegate_qt.cpp \
         favicon_manager.cpp \
         file_picker_controller.cpp \
-        gl_context_qt.cpp \
-        gl_surface_qt.cpp \
         javascript_dialog_controller.cpp \
         javascript_dialog_manager_qt.cpp \
         login_delegate_qt.cpp \
@@ -82,7 +80,9 @@ SOURCES = \
         net/url_request_custom_job_proxy.cpp \
         net/url_request_qrc_job_qt.cpp \
         net/webui_controller_factory_qt.cpp \
+        ozone/gl_context_qt.cpp \
         ozone/gl_ozone_egl_qt.cpp \
+        ozone/gl_surface_qt.cpp \
         ozone/gl_surface_egl_qt.cpp \
         ozone/gl_surface_wgl_qt.cpp \
         ozone/ozone_platform_qt.cpp \
@@ -152,8 +152,6 @@ HEADERS = \
         chromium_gpu_helper.h \
         favicon_manager.h \
         file_picker_controller.h \
-        gl_context_qt.h \
-        gl_surface_qt.h \
         global_descriptors_qt.h \
         javascript_dialog_controller_p.h \
         javascript_dialog_controller.h \
@@ -171,7 +169,9 @@ HEADERS = \
         net/url_request_custom_job_proxy.h \
         net/url_request_qrc_job_qt.h \
         net/webui_controller_factory_qt.h \
+        ozone/gl_context_qt.h \
         ozone/gl_ozone_egl_qt.h \
+        ozone/gl_surface_qt.h \
         ozone/gl_surface_egl_qt.h \
         ozone/gl_surface_wgl_qt.h \
         ozone/ozone_platform_qt.h \
diff --git a/src/core/delegated_frame_node.cpp b/src/core/delegated_frame_node.cpp
index 5257602cf..736ff1ab7 100644
--- a/src/core/delegated_frame_node.cpp
+++ b/src/core/delegated_frame_node.cpp
@@ -49,7 +49,7 @@
 #include "delegated_frame_node.h"
 
 #include "chromium_gpu_helper.h"
-#include "gl_surface_qt.h"
+#include "ozone/gl_surface_qt.h"
 #include "stream_video_node.h"
 #include "type_conversion.h"
 #include "yuv_video_node.h"
diff --git a/src/core/gl_context_qt.cpp b/src/core/ozone/gl_context_qt.cpp
index ad78b7d2b..ad78b7d2b 100644
--- a/src/core/gl_context_qt.cpp
+++ b/src/core/ozone/gl_context_qt.cpp
diff --git a/src/core/gl_context_qt.h b/src/core/ozone/gl_context_qt.h
index cecceabc9..cecceabc9 100644
--- a/src/core/gl_context_qt.h
+++ b/src/core/ozone/gl_context_qt.h
diff --git a/src/core/gl_surface_qt.cpp b/src/core/ozone/gl_surface_qt.cpp
index 7cde289ae..7cde289ae 100644
--- a/src/core/gl_surface_qt.cpp
+++ b/src/core/ozone/gl_surface_qt.cpp
diff --git a/src/core/gl_surface_qt.h b/src/core/ozone/gl_surface_qt.h
index 514527df9..514527df9 100644
--- a/src/core/gl_surface_qt.h
+++ b/src/core/ozone/gl_surface_qt.h
diff --git a/src/core/web_engine_context.cpp b/src/core/web_engine_context.cpp
index 33a5a5e0d..23302e8d2 100644
--- a/src/core/web_engine_context.cpp
+++ b/src/core/web_engine_context.cpp
@@ -88,10 +88,10 @@
 #include "content_client_qt.h"
 #include "content_main_delegate_qt.h"
 #include "devtools_manager_delegate_qt.h"
-#include "gl_context_qt.h"
 #include "media_capture_devices_dispatcher.h"
 #include "net/webui_controller_factory_qt.h"
 #include "type_conversion.h"
+#include "ozone/gl_context_qt.h"
 #include "ozone/surface_factory_qt.h"
 #include "web_engine_library_info.h"