3 files changed, 7 insertions, 6 deletions
diff --git a/src/core/compositor/compositor_resource_fence.cpp b/src/core/compositor/compositor_resource_fence.cpp
index e7bf2fea7..42528469d 100644
--- a/src/core/compositor/compositor_resource_fence.cpp
+++ b/src/core/compositor/compositor_resource_fence.cpp
@@ -62,7 +62,8 @@ void CompositorResourceFence::wait()
         return;
 
     QOpenGLContext *context = QOpenGLContext::currentContext();
-    Q_ASSERT(context);
+    if (!context)
+        return;
 
     // Chromium uses its own GL bindings and stores in in thread local storage.
     // For that reason, let chromium_gpu_helper.cpp contain the producing code that will run in the Chromium
diff --git a/src/core/compositor/display_skia_output_device.cpp b/src/core/compositor/display_skia_output_device.cpp
index 7107f00d4..69cb65eeb 100644
--- a/src/core/compositor/display_skia_output_device.cpp
+++ b/src/core/compositor/display_skia_output_device.cpp
@@ -161,12 +161,12 @@ bool DisplaySkiaOutputDevice::Reshape(const gfx::Size& sizeInPixels,
 }
 
 void DisplaySkiaOutputDevice::SwapBuffers(BufferPresentedCallback feedback,
-                                          std::vector<ui::LatencyInfo> latencyInfo)
+                                          viz::OutputSurfaceFrame frame)
 {
     DCHECK(m_backBuffer);
 
     StartSwapBuffers(std::move(feedback));
-    m_latencyInfo = std::move(latencyInfo);
+    m_frame = std::move(frame);
     m_backBuffer->createFence();
 
     {
@@ -254,7 +254,7 @@ void DisplaySkiaOutputDevice::SwapBuffersFinished()
 
     FinishSwapBuffers(gfx::SwapCompletionResult(gfx::SwapResult::SWAP_ACK),
                       gfx::Size(m_shape.sizeInPixels.width(), m_shape.sizeInPixels.height()),
-                      std::move(m_latencyInfo));
+                      std::move(m_frame));
 }
 
 } // namespace QtWebEngineCore
diff --git a/src/core/compositor/display_skia_output_device.h b/src/core/compositor/display_skia_output_device.h
index a4225b047..2993e9147 100644
--- a/src/core/compositor/display_skia_output_device.h
+++ b/src/core/compositor/display_skia_output_device.h
@@ -67,7 +67,7 @@ public:
                  gfx::BufferFormat format,
                  gfx::OverlayTransform transform) override;
     void SwapBuffers(BufferPresentedCallback feedback,
-                     std::vector<ui::LatencyInfo> latencyInfo) override;
+                     viz::OutputSurfaceFrame frame) override;
     void EnsureBackbuffer() override;
     void DiscardBackbuffer() override;
     SkSurface *BeginPaint(std::vector<GrBackendSemaphore> *semaphores) override;
@@ -109,7 +109,7 @@ private:
     std::unique_ptr<Buffer> m_frontBuffer;
     std::unique_ptr<Buffer> m_middleBuffer;
     std::unique_ptr<Buffer> m_backBuffer;
-    std::vector<ui::LatencyInfo> m_latencyInfo;
+    viz::OutputSurfaceFrame m_frame;
     bool m_readyToUpdate = false;
     scoped_refptr<base::SingleThreadTaskRunner> m_taskRunner;
 };