diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-06-10 13:57:42 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-09-09 15:19:10 +0200 |
commit | 455619d3875e0e0e7a03734806d61c7998735cd4 (patch) | |
tree | 3e2558da4525819ad9bd5e46ee9f471c73aa8d5f /src/core/compositor/display_gl_output_surface.cpp | |
parent | cd61343ceb4a3de8ce16082917a2f197b2481d08 (diff) |
Adaptations for Chromium 83
Change-Id: I63ed851426b18623d549ceaf87f1b6eeec527966
Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
Diffstat (limited to 'src/core/compositor/display_gl_output_surface.cpp')
-rw-r--r-- | src/core/compositor/display_gl_output_surface.cpp | 18 |
1 files changed, 9 insertions, 9 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) |