diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 01:13:33 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 01:13:33 +0000 |
| commit | 086c044dc34dfc0f74fbe41f4ecb402b2cd34884 (patch) | |
| tree | a4f824bd33cb075dd5aa3eb5a0a94af221bbe83a /widget/gtk/GtkCompositorWidget.h | |
| parent | Adding debian version 124.0.1-1. (diff) | |
| download | firefox-086c044dc34dfc0f74fbe41f4ecb402b2cd34884.tar.xz firefox-086c044dc34dfc0f74fbe41f4ecb402b2cd34884.zip | |
Merging upstream version 125.0.1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'widget/gtk/GtkCompositorWidget.h')
| -rw-r--r-- | widget/gtk/GtkCompositorWidget.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/widget/gtk/GtkCompositorWidget.h b/widget/gtk/GtkCompositorWidget.h index 5bf89835d7..bde88bde6c 100644 --- a/widget/gtk/GtkCompositorWidget.h +++ b/widget/gtk/GtkCompositorWidget.h @@ -84,7 +84,7 @@ class GtkCompositorWidget : public CompositorWidget, bool SetEGLNativeWindowSize(const LayoutDeviceIntSize& aEGLWindowSize); #if defined(MOZ_X11) - Window XWindow() const { return mXWindow; } + Window XWindow() const { return mProvider.GetXWindow(); } #endif #if defined(MOZ_WAYLAND) RefPtr<mozilla::layers::NativeLayerRoot> GetNativeLayerRoot() override; @@ -123,11 +123,9 @@ class GtkCompositorWidget : public CompositorWidget, // of the two. DataMutex<LayoutDeviceIntSize> mClientSize; + // Holds rendering resources WindowSurfaceProvider mProvider; -#if defined(MOZ_X11) - Window mXWindow = {}; -#endif #ifdef MOZ_WAYLAND RefPtr<mozilla::layers::NativeLayerRootWayland> mNativeLayerRoot; #endif |