Adaptations for Chromium 83

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

2 files changed, 11 insertions, 11 deletions

diff --git a/src/core/compositor/display_gl_output_surface.cpp b/src/core/compositor/display_gl_output_surface.cpp
index 139015938..a75daf222 100644
--- a/src/core/compositor/display_gl_output_surface.cpp
+++ b/src/core/compositor/display_gl_output_surface.cpp
@@ -47,6 +47,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/gfx/buffer_format_util.h"
 
 namespace QtWebEngineCore {
 
@@ -110,9 +111,10 @@ 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,
                          colorSpace.AsGLColorSpace(), hasAlpha);
@@ -246,13 +248,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
@@ -282,7 +277,12 @@ unsigned DisplayGLOutputSurface::UpdateGpuFence()
 
 scoped_refptr<gpu::GpuTaskSchedulerHelper> DisplayGLOutputSurface::GetGpuTaskSchedulerHelper()
 {
-    return nullptr;
+    return m_vizContextProvider->GetGpuTaskSchedulerHelper();
+}
+
+gpu::MemoryTracker *DisplayGLOutputSurface::GetMemoryTracker()
+{
+    return m_vizContextProvider->GetMemoryTracker();
 }
 
 void DisplayGLOutputSurface::SetUpdateVSyncParametersCallback(viz::UpdateVSyncParametersCallback callback)
diff --git a/src/core/compositor/display_gl_output_surface.h b/src/core/compositor/display_gl_output_surface.h
index 3755a294f..c9c9343ae 100644
--- a/src/core/compositor/display_gl_output_surface.h
+++ b/src/core/compositor/display_gl_output_surface.h
@@ -72,11 +72,10 @@ public:
     void SetDrawRectangle(const gfx::Rect &drawRect) override;
     bool IsDisplayedAsOverlayPlane() const override;
     unsigned GetOverlayTextureId() const override;
-    gfx::BufferFormat GetOverlayBufferFormat() const override;
     void Reshape(const gfx::Size &size,
                  float devicePixelRatio,
                  const gfx::ColorSpace &colorSpace,
-                 bool hasAlpha,
+                 gfx::BufferFormat format,
                  bool useStencil) override;
     bool HasExternalStencilTest() const override;
     void ApplyExternalStencil() override;
@@ -87,6 +86,7 @@ public:
     void SetDisplayTransformHint(gfx::OverlayTransform transform) override;
     gfx::OverlayTransform GetDisplayTransform() override;
     scoped_refptr<gpu::GpuTaskSchedulerHelper> GetGpuTaskSchedulerHelper() override;
+    gpu::MemoryTracker *GetMemoryTracker() override;
 
     // Overridden from DisplayProducer.
     QSGNode *updatePaintNode(QSGNode *oldNode, RenderWidgetHostViewQtDelegate *delegate) override;