diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 01:14:29 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 01:14:29 +0000 |
| commit | fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8 (patch) | |
| tree | 4c1ccaf5486d4f2009f9a338a98a83e886e29c97 /gfx/gl/SharedSurface.cpp | |
| parent | Releasing progress-linux version 124.0.1-1~progress7.99u1. (diff) | |
| download | firefox-fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8.tar.xz firefox-fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8.zip | |
Merging upstream version 125.0.1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'gfx/gl/SharedSurface.cpp')
| -rw-r--r-- | gfx/gl/SharedSurface.cpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/gfx/gl/SharedSurface.cpp b/gfx/gl/SharedSurface.cpp index 2fbfd3f625..0465926521 100644 --- a/gfx/gl/SharedSurface.cpp +++ b/gfx/gl/SharedSurface.cpp @@ -89,13 +89,13 @@ UniquePtr<SurfaceFactory> SurfaceFactory::Create( return SurfaceFactory_D3D11Interop::Create(gl); } #endif - return nullptr; + break; case layers::TextureType::MacIOSurface: #ifdef XP_MACOSX return MakeUnique<SurfaceFactory_IOSurface>(gl); #else - return nullptr; + break; #endif case layers::TextureType::DMABUF: @@ -105,13 +105,13 @@ UniquePtr<SurfaceFactory> SurfaceFactory::Create( return SurfaceFactory_DMABUF::Create(gl); } #endif - return nullptr; + break; case layers::TextureType::AndroidNativeWindow: #ifdef MOZ_WIDGET_ANDROID return MakeUnique<SurfaceFactory_SurfaceTexture>(gl); #else - return nullptr; + break; #endif case layers::TextureType::AndroidHardwareBuffer: @@ -121,7 +121,7 @@ UniquePtr<SurfaceFactory> SurfaceFactory::Create( return SurfaceFactory_AndroidHardwareBuffer::Create(gl); } #endif - return nullptr; + break; case layers::TextureType::EGLImage: #ifdef MOZ_WIDGET_ANDROID @@ -129,17 +129,15 @@ UniquePtr<SurfaceFactory> SurfaceFactory::Create( return SurfaceFactory_EGLImage::Create(gl); } #endif - return nullptr; + break; case layers::TextureType::Unknown: case layers::TextureType::Last: break; } -#ifdef MOZ_X11 // Silence a warning. Unused << gl; -#endif return nullptr; } |