Adaptations for Chromium 77

Fixes: QTBUG-77267
Change-Id: I181e24cf80ebee6991b95dde6c636f0d169b40a4
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>

1 files changed, 20 insertions, 12 deletions

diff --git a/src/core/compositor/display_gl_output_surface.cpp b/src/core/compositor/display_gl_output_surface.cpp
index 5a78b8322..0077af112 100644
--- a/src/core/compositor/display_gl_output_surface.cpp
+++ b/src/core/compositor/display_gl_output_surface.cpp
@@ -53,20 +53,19 @@
 
 namespace QtWebEngineCore {
 
-DisplayGLOutputSurface::DisplayGLOutputSurface(
-        scoped_refptr<viz::VizProcessContextProvider> contextProvider,
-        viz::UpdateVSyncParametersCallback callback)
+DisplayGLOutputSurface::DisplayGLOutputSurface(scoped_refptr<viz::VizProcessContextProvider> contextProvider)
     : OutputSurface(contextProvider)
     , m_commandBuffer(contextProvider->command_buffer())
     , m_gl(contextProvider->ContextGL())
+    , m_vizContextProvider(contextProvider)
 {
     capabilities_.uses_default_gl_framebuffer = false;
     m_gl->GenFramebuffers(1, &m_fboId);
-    contextProvider->SetUpdateVSyncParametersCallback(std::move(callback));
 }
 
 DisplayGLOutputSurface::~DisplayGLOutputSurface()
 {
+    m_vizContextProvider->SetUpdateVSyncParametersCallback(viz::UpdateVSyncParametersCallback());
     m_gl->DeleteFramebuffers(1, &m_fboId);
     if (m_sink)
         m_sink->disconnect(this);
@@ -224,9 +223,10 @@ void DisplayGLOutputSurface::swapBuffersOnVizThread()
         m_backBuffer = std::move(m_middleBuffer);
     }
 
-    m_display->DidReceiveSwapBuffersAck();
+    const auto now = base::TimeTicks::Now();
+    m_display->DidReceiveSwapBuffersAck(gfx::SwapTimings{now, now});
     m_display->DidReceivePresentationFeedback(
-            gfx::PresentationFeedback(base::TimeTicks::Now(), base::TimeDelta(),
+            gfx::PresentationFeedback(now, base::TimeDelta(),
                                       gfx::PresentationFeedback::Flags::kVSync));
 }
 
@@ -234,12 +234,6 @@ void DisplayGLOutputSurface::SetDrawRectangle(const gfx::Rect &)
 {
 }
 
-// Returning nullptr here effectively disables viz::OverlayProcessor.
-viz::OverlayCandidateValidator *DisplayGLOutputSurface::GetOverlayCandidateValidator() const
-{
-    return nullptr;
-}
-
 // Returning true here will cause viz::GLRenderer to try to render the output
 // surface as an overlay plane (see viz::DirectRenderer::DrawFrame and
 // viz::GLRenderer::ScheduleOverlays).
@@ -289,4 +283,18 @@ unsigned DisplayGLOutputSurface::UpdateGpuFence()
     return 0;
 }
 
+void DisplayGLOutputSurface::SetUpdateVSyncParametersCallback(viz::UpdateVSyncParametersCallback callback)
+{
+    m_vizContextProvider->SetUpdateVSyncParametersCallback(std::move(callback));
+}
+
+void DisplayGLOutputSurface::SetDisplayTransformHint(gfx::OverlayTransform)
+{
+}
+
+gfx::OverlayTransform DisplayGLOutputSurface::GetDisplayTransform()
+{
+    return gfx::OVERLAY_TRANSFORM_NONE;
+}
+
 } // namespace QtWebEngineCore