17 files changed, 16 insertions, 16 deletions
diff --git a/src/core/chromium_gpu_helper.cpp b/src/core/compositor/chromium_gpu_helper.cpp
index 92a8b13ed..92a8b13ed 100644
--- a/src/core/chromium_gpu_helper.cpp
+++ b/src/core/compositor/chromium_gpu_helper.cpp
diff --git a/src/core/chromium_gpu_helper.h b/src/core/compositor/chromium_gpu_helper.h
index 21b764997..21b764997 100644
--- a/src/core/chromium_gpu_helper.h
+++ b/src/core/compositor/chromium_gpu_helper.h
diff --git a/src/core/compositor.cpp b/src/core/compositor/compositor.cpp
index 2d955b917..2d955b917 100644
--- a/src/core/compositor.cpp
+++ b/src/core/compositor/compositor.cpp
diff --git a/src/core/compositor.h b/src/core/compositor/compositor.h
index d34255d26..d34255d26 100644
--- a/src/core/compositor.h
+++ b/src/core/compositor/compositor.h
diff --git a/src/core/compositor_resource.h b/src/core/compositor/compositor_resource.h
index c40ce3d5e..c40ce3d5e 100644
--- a/src/core/compositor_resource.h
+++ b/src/core/compositor/compositor_resource.h
diff --git a/src/core/compositor_resource_fence.cpp b/src/core/compositor/compositor_resource_fence.cpp
index b3f868d43..b3f868d43 100644
--- a/src/core/compositor_resource_fence.cpp
+++ b/src/core/compositor/compositor_resource_fence.cpp
diff --git a/src/core/compositor_resource_fence.h b/src/core/compositor/compositor_resource_fence.h
index 1c2ea3695..1c2ea3695 100644
--- a/src/core/compositor_resource_fence.h
+++ b/src/core/compositor/compositor_resource_fence.h
diff --git a/src/core/compositor_resource_tracker.cpp b/src/core/compositor/compositor_resource_tracker.cpp
index b74075c56..b74075c56 100644
--- a/src/core/compositor_resource_tracker.cpp
+++ b/src/core/compositor/compositor_resource_tracker.cpp
diff --git a/src/core/compositor_resource_tracker.h b/src/core/compositor/compositor_resource_tracker.h
index 887309395..887309395 100644
--- a/src/core/compositor_resource_tracker.h
+++ b/src/core/compositor/compositor_resource_tracker.h
diff --git a/src/core/delegated_frame_node.cpp b/src/core/compositor/delegated_frame_node.cpp
index c4a6d8078..c4a6d8078 100644
--- a/src/core/delegated_frame_node.cpp
+++ b/src/core/compositor/delegated_frame_node.cpp
diff --git a/src/core/delegated_frame_node.h b/src/core/compositor/delegated_frame_node.h
index a39ae864b..a39ae864b 100644
--- a/src/core/delegated_frame_node.h
+++ b/src/core/compositor/delegated_frame_node.h
diff --git a/src/core/stream_video_node.cpp b/src/core/compositor/stream_video_node.cpp
index 29922f866..29922f866 100644
--- a/src/core/stream_video_node.cpp
+++ b/src/core/compositor/stream_video_node.cpp
diff --git a/src/core/stream_video_node.h b/src/core/compositor/stream_video_node.h
index 9d937791f..9d937791f 100644
--- a/src/core/stream_video_node.h
+++ b/src/core/compositor/stream_video_node.h
diff --git a/src/core/yuv_video_node.cpp b/src/core/compositor/yuv_video_node.cpp
index 4a436d952..4a436d952 100644
--- a/src/core/yuv_video_node.cpp
+++ b/src/core/compositor/yuv_video_node.cpp
diff --git a/src/core/yuv_video_node.h b/src/core/compositor/yuv_video_node.h
index dca8fa5e2..dca8fa5e2 100644
--- a/src/core/yuv_video_node.h
+++ b/src/core/compositor/yuv_video_node.h
diff --git a/src/core/core_chromium.pri b/src/core/core_chromium.pri
index f8f99e5fc..05324ec6b 100644
--- a/src/core/core_chromium.pri
+++ b/src/core/core_chromium.pri
@@ -46,7 +46,6 @@ SOURCES = \
         browser_main_parts_qt.cpp \
         browser_message_filter_qt.cpp \
         certificate_error_controller.cpp \
-        chromium_gpu_helper.cpp \
         chromium_overrides.cpp \
         client_cert_select_controller.cpp \
         clipboard_qt.cpp \
@@ -55,13 +54,14 @@ SOURCES = \
         common/qt_ipc_logging.cpp \
         common/qt_messages.cpp \
         common/user_script_data.cpp \
-        compositor.cpp \
-        compositor_resource_tracker.cpp \
+        compositor/chromium_gpu_helper.cpp \
+        compositor/compositor.cpp \
+        compositor/compositor_resource_tracker.cpp \
+        compositor/delegated_frame_node.cpp \
         content_client_qt.cpp \
         content_browser_client_qt.cpp \
         content_main_delegate_qt.cpp \
         content_utility_client_qt.cpp \
-        delegated_frame_node.cpp \
         desktop_screen_qt.cpp \
         devtools_frontend_qt.cpp \
         devtools_manager_delegate_qt.cpp \
@@ -144,19 +144,19 @@ HEADERS = \
         color_chooser_controller.h \
         common/qt_messages.h \
         common/user_script_data.h \
-        compositor.h \
-        compositor_resource.h \
-        compositor_resource_tracker.h \
+        compositor/chromium_gpu_helper.h \
+        compositor/compositor.h \
+        compositor/compositor_resource.h \
+        compositor/compositor_resource_tracker.h \
+        compositor/delegated_frame_node.h \
         content_client_qt.h \
         content_browser_client_qt.h \
         content_main_delegate_qt.h \
         content_utility_client_qt.h \
-        delegated_frame_node.h \
         desktop_screen_qt.h \
         devtools_frontend_qt.h \
         devtools_manager_delegate_qt.h \
         download_manager_delegate_qt.h \
-        chromium_gpu_helper.h \
         favicon_manager.h \
         file_picker_controller.h \
         global_descriptors_qt.h \
@@ -268,14 +268,14 @@ qtConfig(webengine-printing-and-pdf) {
 
 contains(QT_CONFIG, opengl) {
     SOURCES += \
-        compositor_resource_fence.cpp \
-        yuv_video_node.cpp \
-        stream_video_node.cpp
+        compositor/compositor_resource_fence.cpp \
+        compositor/stream_video_node.cpp \
+        compositor/yuv_video_node.cpp
 
     HEADERS += \
-        compositor_resource_fence.h \
-        yuv_video_node.h \
-        stream_video_node.h
+        compositor/compositor_resource_fence.h \
+        compositor/stream_video_node.h \
+        compositor/yuv_video_node.h
 }
 
 qtConfig(webengine-geolocation) {
diff --git a/src/core/render_widget_host_view_qt.cpp b/src/core/render_widget_host_view_qt.cpp
index 792ed1d88..bac9dd6cf 100644
--- a/src/core/render_widget_host_view_qt.cpp
+++ b/src/core/render_widget_host_view_qt.cpp
@@ -41,7 +41,7 @@
 
 #include "browser_accessibility_manager_qt.h"
 #include "chromium_overrides.h"
-#include "compositor.h"
+#include "compositor/compositor.h"
 #include "qtwebenginecoreglobal_p.h"
 #include "render_widget_host_view_qt_delegate.h"
 #include "type_conversion.h"