Chromium 81-based adaptations

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

2 files changed, 7 insertions, 2 deletions

diff --git a/src/core/compositor/display_gl_output_surface.cpp b/src/core/compositor/display_gl_output_surface.cpp
index 4f63e5b69..139015938 100644
--- a/src/core/compositor/display_gl_output_surface.cpp
+++ b/src/core/compositor/display_gl_output_surface.cpp
@@ -47,7 +47,6 @@
 #include "gpu/command_buffer/service/mailbox_manager.h"
 #include "gpu/command_buffer/service/texture_base.h"
 #include "gpu/ipc/in_process_command_buffer.h"
-#include "ui/gl/color_space_utils.h"
 
 namespace QtWebEngineCore {
 
@@ -116,7 +115,7 @@ void DisplayGLOutputSurface::Reshape(const gfx::Size &sizeInPixels,
 {
     m_currentShape = Shape{sizeInPixels, devicePixelRatio, colorSpace, hasAlpha};
     m_gl->ResizeCHROMIUM(sizeInPixels.width(), sizeInPixels.height(), devicePixelRatio,
-                         gl::ColorSpaceUtils::GetGLColorSpace(colorSpace), hasAlpha);
+                         colorSpace.AsGLColorSpace(), hasAlpha);
 }
 
 std::unique_ptr<DisplayGLOutputSurface::Buffer> DisplayGLOutputSurface::makeBuffer(const Shape &shape)
@@ -281,6 +280,11 @@ unsigned DisplayGLOutputSurface::UpdateGpuFence()
     return 0;
 }
 
+scoped_refptr<gpu::GpuTaskSchedulerHelper> DisplayGLOutputSurface::GetGpuTaskSchedulerHelper()
+{
+    return nullptr;
+}
+
 void DisplayGLOutputSurface::SetUpdateVSyncParametersCallback(viz::UpdateVSyncParametersCallback callback)
 {
     m_vizContextProvider->SetUpdateVSyncParametersCallback(std::move(callback));
diff --git a/src/core/compositor/display_gl_output_surface.h b/src/core/compositor/display_gl_output_surface.h
index 67d987263..3755a294f 100644
--- a/src/core/compositor/display_gl_output_surface.h
+++ b/src/core/compositor/display_gl_output_surface.h
@@ -86,6 +86,7 @@ public:
     void SetUpdateVSyncParametersCallback(viz::UpdateVSyncParametersCallback callback) override;
     void SetDisplayTransformHint(gfx::OverlayTransform transform) override;
     gfx::OverlayTransform GetDisplayTransform() override;
+    scoped_refptr<gpu::GpuTaskSchedulerHelper> GetGpuTaskSchedulerHelper() override;
 
     // Overridden from DisplayProducer.
     QSGNode *updatePaintNode(QSGNode *oldNode, RenderWidgetHostViewQtDelegate *delegate) override;