1 files changed, 14 insertions, 10 deletions
diff --git a/src/core/compositor/display_gl_output_surface.cpp b/src/core/compositor/display_gl_output_surface.cpp
index 05653149e..9467d6ea0 100644
--- a/src/core/compositor/display_gl_output_surface.cpp
+++ b/src/core/compositor/display_gl_output_surface.cpp
@@ -49,7 +49,7 @@
 #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"
+#include "ui/gfx/buffer_format_util.h"
 
 namespace QtWebEngineCore {
 
@@ -113,12 +113,13 @@ void DisplayGLOutputSurface::DiscardBackbuffer()
 void DisplayGLOutputSurface::Reshape(const gfx::Size &sizeInPixels,
                                      float devicePixelRatio,
                                      const gfx::ColorSpace &colorSpace,
-                                     bool hasAlpha,
+                                     gfx::BufferFormat format,
                                      bool /*useStencil*/)
 {
+    bool hasAlpha = gfx::AlphaBitsForBufferFormat(format) > 0;
     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)
@@ -250,13 +251,6 @@ unsigned DisplayGLOutputSurface::GetOverlayTextureId() const
     return 0;
 }
 
-// Only used if IsDisplayedAsOverlayPlane was true (called from
-// viz::DirectRender::DrawFrame).
-gfx::BufferFormat DisplayGLOutputSurface::GetOverlayBufferFormat() const
-{
-    return gfx::BufferFormat();
-}
-
 // Called by viz::GLRenderer but always false in all implementations except for
 // android_webview::ParentOutputSurface.
 bool DisplayGLOutputSurface::HasExternalStencilTest() const
@@ -284,6 +278,16 @@ unsigned DisplayGLOutputSurface::UpdateGpuFence()
     return 0;
 }
 
+scoped_refptr<gpu::GpuTaskSchedulerHelper> DisplayGLOutputSurface::GetGpuTaskSchedulerHelper()
+{
+    return m_vizContextProvider->GetGpuTaskSchedulerHelper();
+}
+
+gpu::MemoryTracker *DisplayGLOutputSurface::GetMemoryTracker()
+{
+    return m_vizContextProvider->GetMemoryTracker();
+}
+
 void DisplayGLOutputSurface::SetUpdateVSyncParametersCallback(viz::UpdateVSyncParametersCallback callback)
 {
     m_vizContextProvider->SetUpdateVSyncParametersCallback(std::move(callback));