1 files changed, 11 insertions, 7 deletions
diff --git a/src/core/compositor/display_gl_output_surface.h b/src/core/compositor/display_gl_output_surface.h
index 67d987263..6b1b2e043 100644
--- a/src/core/compositor/display_gl_output_surface.h
+++ b/src/core/compositor/display_gl_output_surface.h
@@ -41,7 +41,7 @@
 #define DISPLAY_GL_OUTPUT_SURFACE_H
 
 #include "compositor_resource_fence.h"
-#include "display_frame_sink.h"
+#include "compositor.h"
 
 #include "components/viz/common/display/update_vsync_parameters_callback.h"
 #include "components/viz/service/display/output_surface.h"
@@ -49,6 +49,8 @@
 #include "gpu/command_buffer/common/mailbox.h"
 #include "gpu/command_buffer/common/sync_token.h"
 
+#include <QMutex>
+
 namespace viz {
 class Display;
 class SyntheticBeginFrameSource;
@@ -56,9 +58,7 @@ class SyntheticBeginFrameSource;
 
 namespace QtWebEngineCore {
 
-// NOTE: Some methods are defined in display_gl_output_surface_qsg.cpp due
-// to conflicts between Qt & Chromium OpenGL APIs.
-class DisplayGLOutputSurface final : public viz::OutputSurface, public DisplayProducer
+class DisplayGLOutputSurface final : public viz::OutputSurface, public Compositor
 {
 public:
     DisplayGLOutputSurface(scoped_refptr<viz::VizProcessContextProvider> contextProvider);
@@ -87,8 +87,13 @@ public:
     void SetDisplayTransformHint(gfx::OverlayTransform transform) override;
     gfx::OverlayTransform GetDisplayTransform() override;
 
-    // Overridden from DisplayProducer.
-    QSGNode *updatePaintNode(QSGNode *oldNode, RenderWidgetHostViewQtDelegate *delegate) override;
+    // Overridden from Compositor.
+    void swapFrame() override;
+    void waitForTexture() override;
+    int textureId() override;
+    QSize size() override;
+    bool hasAlphaChannel() override;
+    float devicePixelRatio() override;
 
 private:
     struct Shape
@@ -135,7 +140,6 @@ private:
     mutable QMutex m_mutex;
     uint32_t m_fboId = 0;
     viz::Display *m_display = nullptr;
-    scoped_refptr<DisplayFrameSink> m_sink;
     Shape m_currentShape;
     std::unique_ptr<Buffer> m_backBuffer;
     std::unique_ptr<Buffer> m_middleBuffer;