diff --git a/gfx/config/gfxVars.h b/gfx/config/gfxVars.h index 2ee43b62071a..6da6639ed0e0 100644 --- a/gfx/config/gfxVars.h +++ b/gfx/config/gfxVars.h @@ -31,7 +31,6 @@ class gfxVarReceiver; _(ContentBackend, BackendType, BackendType::NONE) \ _(SoftwareBackend, BackendType, BackendType::NONE) \ _(TileSize, IntSize, IntSize(-1, -1)) \ - _(UseXRender, bool, false) \ _(OffscreenFormat, gfxImageFormat, \ mozilla::gfx::SurfaceFormat::X8R8G8B8_UINT32) \ _(RequiresAcceleratedGLContextForCompositorOGL, bool, false) \ diff --git a/gfx/layers/BufferTexture.cpp b/gfx/layers/BufferTexture.cpp index 8af200668874..e8c32cebf188 100644 --- a/gfx/layers/BufferTexture.cpp +++ b/gfx/layers/BufferTexture.cpp @@ -99,13 +99,6 @@ class ShmemTextureData : public BufferTextureData { mozilla::ipc::Shmem mShmem; }; -static bool UsingX11Compositor() { -#ifdef MOZ_WIDGET_GTK - return gfx::gfxVars::UseXRender(); -#endif - return false; -} - bool ComputeHasIntermediateBuffer(gfx::SurfaceFormat aFormat, LayersBackend aLayersBackend, bool aSupportsTextureDirectMapping) { @@ -114,7 +107,7 @@ bool ComputeHasIntermediateBuffer(gfx::SurfaceFormat aFormat, } return aLayersBackend != LayersBackend::LAYERS_BASIC || - UsingX11Compositor() || aFormat == gfx::SurfaceFormat::UNKNOWN; + aFormat == gfx::SurfaceFormat::UNKNOWN; } BufferTextureData* BufferTextureData::Create( diff --git a/gfx/layers/basic/X11BasicCompositor.cpp b/gfx/layers/basic/X11BasicCompositor.cpp deleted file mode 100644 index 0d86c46c61a0..000000000000 --- a/gfx/layers/basic/X11BasicCompositor.cpp +++ /dev/null @@ -1,118 +0,0 @@ -/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* vim: set ts=8 sts=2 et sw=2 tw=80: */ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -#include "X11BasicCompositor.h" -#include "gfxPlatform.h" -#include "gfx2DGlue.h" -#include "gfxXlibSurface.h" -#include "gfxImageSurface.h" -#include "mozilla/X11Util.h" - -namespace mozilla { -using namespace mozilla::gfx; - -namespace layers { - -bool X11DataTextureSourceBasic::Update(gfx::DataSourceSurface* aSurface, - nsIntRegion* aDestRegion, - gfx::IntPoint* aSrcOffset, - gfx::IntPoint* aDstOffset) { - MOZ_RELEASE_ASSERT(aDstOffset == nullptr); - // Reallocate our internal X11 surface if we don't have a DrawTarget yet, - // or if we changed surface size or format since last update. - if (!mBufferDrawTarget || - (aSurface->GetSize() != mBufferDrawTarget->GetSize()) || - (aSurface->GetFormat() != mBufferDrawTarget->GetFormat())) { - RefPtr surf; - gfxImageFormat imageFormat = - SurfaceFormatToImageFormat(aSurface->GetFormat()); - Display* display = DefaultXDisplay(); - Screen* screen = DefaultScreenOfDisplay(display); - XRenderPictFormat* xrenderFormat = - gfxXlibSurface::FindRenderFormat(display, imageFormat); - - if (xrenderFormat) { - surf = gfxXlibSurface::Create(screen, xrenderFormat, aSurface->GetSize()); - } - - if (!surf) { - NS_WARNING("Couldn't create native surface, fallback to image surface"); - surf = new gfxImageSurface(aSurface->GetSize(), imageFormat); - } - - mBufferDrawTarget = - gfxPlatform::CreateDrawTargetForSurface(surf, aSurface->GetSize()); - } - - // Image contents have changed, upload to our DrawTarget - // If aDestRegion is null, means we're updating the whole surface - // Note : Incremental update with a source offset is only used on Mac. - NS_ASSERTION(!aSrcOffset, - "SrcOffset should not be used with linux OMTC basic"); - - if (aDestRegion) { - for (auto iter = aDestRegion->RectIter(); !iter.Done(); iter.Next()) { - const IntRect& rect = iter.Get(); - IntRect srcRect(rect.X(), rect.Y(), rect.Width(), rect.Height()); - IntPoint dstPoint(rect.X(), rect.Y()); - - // We're uploading regions to our buffer, so let's just copy contents over - mBufferDrawTarget->CopySurface(aSurface, srcRect, dstPoint); - } - } else { - // We're uploading the whole buffer, so let's just copy the full surface - IntSize size = aSurface->GetSize(); - mBufferDrawTarget->CopySurface( - aSurface, IntRect(0, 0, size.width, size.height), IntPoint(0, 0)); - } - - return true; -} - -TextureSourceBasic* X11DataTextureSourceBasic::AsSourceBasic() { return this; } - -IntSize X11DataTextureSourceBasic::GetSize() const { - if (!mBufferDrawTarget) { - NS_WARNING("Trying to query the size of an uninitialized TextureSource"); - return IntSize(0, 0); - } - return mBufferDrawTarget->GetSize(); -} - -gfx::SurfaceFormat X11DataTextureSourceBasic::GetFormat() const { - if (!mBufferDrawTarget) { - NS_WARNING("Trying to query the format of an uninitialized TextureSource"); - return gfx::SurfaceFormat::UNKNOWN; - } - return mBufferDrawTarget->GetFormat(); -} - -SourceSurface* X11DataTextureSourceBasic::GetSurface(DrawTarget* aTarget) { - RefPtr surface; - if (mBufferDrawTarget) { - surface = mBufferDrawTarget->Snapshot(); - return surface.get(); - } - return nullptr; -} - -void X11DataTextureSourceBasic::DeallocateDeviceData() { - mBufferDrawTarget = nullptr; -} - -already_AddRefed X11BasicCompositor::CreateDataTextureSource( - TextureFlags aFlags) { - RefPtr result = new X11DataTextureSourceBasic(); - return result.forget(); -} - -void X11BasicCompositor::EndFrame() { - BasicCompositor::EndFrame(); - XFlush(DefaultXDisplay()); -} - -} // namespace layers -} // namespace mozilla diff --git a/gfx/layers/basic/X11BasicCompositor.h b/gfx/layers/basic/X11BasicCompositor.h deleted file mode 100644 index edc43455627f..000000000000 --- a/gfx/layers/basic/X11BasicCompositor.h +++ /dev/null @@ -1,67 +0,0 @@ -/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* vim: set ts=8 sts=2 et sw=2 tw=80: */ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -#ifndef MOZILLA_GFX_X11BASICCOMPOSITOR_H -#define MOZILLA_GFX_X11BASICCOMPOSITOR_H - -#include "mozilla/layers/BasicCompositor.h" -#include "mozilla/layers/X11TextureSourceBasic.h" -#include "mozilla/layers/TextureHostBasic.h" -#include "gfxXlibSurface.h" -#include "mozilla/gfx/2D.h" - -namespace mozilla { -namespace layers { - -// TextureSource for Image-backed surfaces. -class X11DataTextureSourceBasic : public DataTextureSource, - public TextureSourceBasic { - public: - X11DataTextureSourceBasic() = default; - - const char* Name() const override { return "X11DataTextureSourceBasic"; } - - bool Update(gfx::DataSourceSurface* aSurface, - nsIntRegion* aDestRegion = nullptr, - gfx::IntPoint* aSrcOffset = nullptr, - gfx::IntPoint* aDstOffset = nullptr) override; - - TextureSourceBasic* AsSourceBasic() override; - - gfx::SourceSurface* GetSurface(gfx::DrawTarget* aTarget) override; - - void DeallocateDeviceData() override; - - gfx::IntSize GetSize() const override; - - gfx::SurfaceFormat GetFormat() const override; - - private: - // We are going to buffer layer content on this xlib draw target - RefPtr mBufferDrawTarget; -}; - -class X11BasicCompositor : public BasicCompositor { - public: - explicit X11BasicCompositor(CompositorBridgeParent* aParent, - widget::CompositorWidget* aWidget) - : BasicCompositor(aParent, aWidget) {} - - already_AddRefed CreateDataTextureSource( - TextureFlags aFlags = TextureFlags::NO_FLAGS) override; - - already_AddRefed CreateDataTextureSourceAround( - gfx::DataSourceSurface* aSurface) override { - return nullptr; - } - - void EndFrame() override; -}; - -} // namespace layers -} // namespace mozilla - -#endif /* MOZILLA_GFX_X11BASICCOMPOSITOR_H */ diff --git a/gfx/layers/client/ContentClient.cpp b/gfx/layers/client/ContentClient.cpp index 833da262c078..d7efa08782f5 100644 --- a/gfx/layers/client/ContentClient.cpp +++ b/gfx/layers/client/ContentClient.cpp @@ -92,11 +92,6 @@ already_AddRefed ContentClient::CreateContentClient( useDoubleBuffering = true; } else # endif - // We can't use double buffering when using image content with - // Xrender support on Linux, as ContentHostDoubleBuffered is not - // suited for direct uploads to the server. - if (!gfxPlatformGtk::GetPlatform()->UseImageOffscreenSurfaces() || - !gfxVars::UseXRender()) #endif { useDoubleBuffering = backend == LayersBackend::LAYERS_BASIC; diff --git a/gfx/layers/ipc/CompositorBridgeParent.cpp b/gfx/layers/ipc/CompositorBridgeParent.cpp index 5130dbe65d7c..14889396fa7d 100644 --- a/gfx/layers/ipc/CompositorBridgeParent.cpp +++ b/gfx/layers/ipc/CompositorBridgeParent.cpp @@ -72,9 +72,6 @@ #include "mozilla/ProfilerLabels.h" #include "mozilla/ProfilerMarkers.h" #include "mozilla/Telemetry.h" -#ifdef MOZ_WIDGET_GTK -# include "basic/X11BasicCompositor.h" // for X11BasicCompositor -#endif #include "nsCOMPtr.h" // for already_AddRefed #include "nsDebug.h" // for NS_ASSERTION, etc #include "nsISupportsImpl.h" // for MOZ_COUNT_CTOR, etc @@ -1394,14 +1391,7 @@ RefPtr CompositorBridgeParent::NewCompositor( new CompositorOGL(this, mWidget, mEGLSurfaceSize.width, mEGLSurfaceSize.height, mUseExternalSurfaceSize); } else if (aBackendHints[i] == LayersBackend::LAYERS_BASIC) { -#ifdef MOZ_WIDGET_GTK - if (gfxVars::UseXRender()) { - compositor = new X11BasicCompositor(this, mWidget); - } else -#endif - { - compositor = new BasicCompositor(this, mWidget); - } + compositor = new BasicCompositor(this, mWidget); #ifdef XP_WIN } else if (aBackendHints[i] == LayersBackend::LAYERS_D3D11) { compositor = new CompositorD3D11(this, mWidget); diff --git a/gfx/layers/moz.build b/gfx/layers/moz.build index ddb3fe143420..df61fea4bd2a 100755 --- a/gfx/layers/moz.build +++ b/gfx/layers/moz.build @@ -272,7 +272,6 @@ if CONFIG["MOZ_X11"]: ] SOURCES += [ "basic/TextureClientX11.cpp", - "basic/X11BasicCompositor.cpp", "basic/X11TextureSourceBasic.cpp", "composite/X11TextureHost.cpp", "ipc/ShadowLayerUtilsX11.cpp", diff --git a/gfx/thebes/gfxPlatform.h b/gfx/thebes/gfxPlatform.h index 8c71690a00ae..c2b36b1ca2b1 100644 --- a/gfx/thebes/gfxPlatform.h +++ b/gfx/thebes/gfxPlatform.h @@ -312,7 +312,7 @@ class gfxPlatform : public mozilla::layers::MemoryPressureListener { const char* GetAzureCanvasBackend() const; const char* GetAzureContentBackend() const; - virtual void GetAzureBackendInfo(mozilla::widget::InfoObject& aObj); + void GetAzureBackendInfo(mozilla::widget::InfoObject& aObj); void GetApzSupportInfo(mozilla::widget::InfoObject& aObj); void GetTilesSupportInfo(mozilla::widget::InfoObject& aObj); void GetFrameStats(mozilla::widget::InfoObject& aObj); diff --git a/gfx/thebes/gfxPlatformGtk.cpp b/gfx/thebes/gfxPlatformGtk.cpp index ff09228ddbc5..edae722791e4 100644 --- a/gfx/thebes/gfxPlatformGtk.cpp +++ b/gfx/thebes/gfxPlatformGtk.cpp @@ -222,16 +222,6 @@ void gfxPlatformGtk::InitWebRenderConfig() { return; } -#ifdef MOZ_X11 - // We only support XRender if the user has disabled both WebRender and - // Software WebRender. - if (mIsX11Display && mozilla::Preferences::GetBool("gfx.xrender.enabled") && - !(gfxConfig::IsEnabled(Feature::WEBRENDER) || - gfxConfig::IsEnabled(Feature::WEBRENDER_SOFTWARE))) { - gfxVars::SetUseXRender(true); - } -#endif - FeatureState& feature = gfxConfig::GetFeature(Feature::WEBRENDER_COMPOSITOR); if (feature.IsEnabled()) { if (!(gfxConfig::IsEnabled(Feature::WEBRENDER) || @@ -287,24 +277,10 @@ already_AddRefed gfxPlatformGtk::CreateOffscreenSurface( // we should try to match GdkScreen* gdkScreen = gdk_screen_get_default(); if (gdkScreen) { - // When forcing PaintedLayers to use image surfaces for content, - // force creation of gfxImageSurface surfaces. - if (gfxVars::UseXRender() && !UseImageOffscreenSurfaces()) { - Screen* screen = gdk_x11_screen_get_xscreen(gdkScreen); - XRenderPictFormat* xrenderFormat = - gfxXlibSurface::FindRenderFormat(DisplayOfScreen(screen), aFormat); - - if (xrenderFormat) { - newSurface = gfxXlibSurface::Create(screen, xrenderFormat, aSize); - } - } else { - // We're not going to use XRender, so we don't need to - // search for a render format - newSurface = new gfxImageSurface(aSize, aFormat); - // The gfxImageSurface ctor zeroes this for us, no need to - // waste time clearing again - needsClear = false; - } + newSurface = new gfxImageSurface(aSize, aFormat); + // The gfxImageSurface ctor zeroes this for us, no need to + // waste time clearing again + needsClear = false; } #endif diff --git a/gfx/thebes/gfxPlatformGtk.h b/gfx/thebes/gfxPlatformGtk.h index 5ebbcab48485..3d3ca0dcd9e4 100644 --- a/gfx/thebes/gfxPlatformGtk.h +++ b/gfx/thebes/gfxPlatformGtk.h @@ -42,13 +42,6 @@ class gfxPlatformGtk final : public gfxPlatform { static int32_t GetFontScaleDPI(); static double GetFontScaleFactor(); -#ifdef MOZ_X11 - void GetAzureBackendInfo(mozilla::widget::InfoObject& aObj) override { - gfxPlatform::GetAzureBackendInfo(aObj); - aObj.DefineProperty("CairoUseXRender", mozilla::gfx::gfxVars::UseXRender()); - } -#endif - bool UseImageOffscreenSurfaces(); gfxImageFormat GetOffscreenFormat() override; diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js index 8de8ac449618..5f83c75db40b 100644 --- a/modules/libpref/init/all.js +++ b/modules/libpref/init/all.js @@ -3712,7 +3712,6 @@ pref("network.tcp.keepalive.idle_time", 600); // seconds; 10 mins pref("network.psl.onUpdate_notify", false); #ifdef MOZ_WIDGET_GTK - pref("gfx.xrender.enabled",false); pref("widget.content.gtk-theme-override", ""); pref("widget.disable-workspace-management", false); pref("widget.titlebar-x11-use-shape-mask", false); diff --git a/widget/gtk/WindowSurfaceProvider.cpp b/widget/gtk/WindowSurfaceProvider.cpp index b2b6c9ee542a..2b3899dcc444 100644 --- a/widget/gtk/WindowSurfaceProvider.cpp +++ b/widget/gtk/WindowSurfaceProvider.cpp @@ -20,7 +20,6 @@ # include "mozilla/X11Util.h" # include "WindowSurfaceX11Image.h" # include "WindowSurfaceX11SHM.h" -# include "WindowSurfaceXRender.h" #endif #undef LOG @@ -93,15 +92,8 @@ RefPtr WindowSurfaceProvider::CreateWindowSurface() { #ifdef MOZ_X11 if (GdkIsX11Display()) { // Blit to the window with the following priority: - // 1. XRender (iff XRender is enabled && we are in-process) - // 2. MIT-SHM - // 3. XPutImage - if (!mIsShaped && gfx::gfxVars::UseXRender()) { - LOG(("Drawing to Window 0x%lx will use XRender\n", mXWindow)); - return MakeRefPtr(DefaultXDisplay(), mXWindow, - mXVisual, mXDepth); - } - + // 1. MIT-SHM + // 2. XPutImage # ifdef MOZ_HAVE_SHMIMAGE if (!mIsShaped && nsShmImage::UseShm()) { LOG(("Drawing to Window 0x%lx will use MIT-SHM\n", mXWindow)); diff --git a/widget/gtk/WindowSurfaceXRender.cpp b/widget/gtk/WindowSurfaceXRender.cpp deleted file mode 100644 index 9f040d9ce362..000000000000 --- a/widget/gtk/WindowSurfaceXRender.cpp +++ /dev/null @@ -1,75 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -#include "WindowSurfaceXRender.h" - -#include "mozilla/gfx/2D.h" -#include "mozilla/gfx/Types.h" -#include "gfxPlatform.h" - -namespace mozilla { -namespace widget { - -WindowSurfaceXRender::WindowSurfaceXRender(Display* aDisplay, Window aWindow, - Visual* aVisual, unsigned int aDepth) - : WindowSurfaceX11(aDisplay, aWindow, aVisual, aDepth), - mXlibSurface(nullptr), - mGC(X11None) {} - -WindowSurfaceXRender::~WindowSurfaceXRender() { - if (mGC != X11None) { - XFreeGC(mDisplay, mGC); - } -} - -already_AddRefed WindowSurfaceXRender::Lock( - const LayoutDeviceIntRegion& aRegion) { - gfx::IntRect bounds = aRegion.GetBounds().ToUnknownRect(); - gfx::IntSize size(bounds.XMost(), bounds.YMost()); - if (!mXlibSurface || mXlibSurface->CairoStatus() || - !(size <= mXlibSurface->GetSize())) { - mXlibSurface = gfxXlibSurface::Create(DefaultScreenOfDisplay(mDisplay), - mVisual, size, mWindow); - } - if (!mXlibSurface || mXlibSurface->CairoStatus()) { - return nullptr; - } - - return gfxPlatform::CreateDrawTargetForSurface(mXlibSurface, size); -} - -void WindowSurfaceXRender::Commit(const LayoutDeviceIntRegion& aInvalidRegion) { - AutoTArray xrects; - xrects.SetCapacity(aInvalidRegion.GetNumRects()); - - for (auto iter = aInvalidRegion.RectIter(); !iter.Done(); iter.Next()) { - const LayoutDeviceIntRect& r = iter.Get(); - XRectangle xrect = {(short)r.x, (short)r.y, (unsigned short)r.width, - (unsigned short)r.height}; - xrects.AppendElement(xrect); - } - - if (!mGC) { - mGC = XCreateGC(mDisplay, mWindow, 0, nullptr); - if (!mGC) { - NS_WARNING("Couldn't create X11 graphics context for window!"); - return; - } - } - - XSetClipRectangles(mDisplay, mGC, 0, 0, xrects.Elements(), xrects.Length(), - YXBanded); - - MOZ_ASSERT(mXlibSurface && mXlibSurface->CairoStatus() == 0, - "Attempted to commit invalid surface!"); - gfx::IntRect bounds = aInvalidRegion.GetBounds().ToUnknownRect(); - gfx::IntSize size(bounds.XMost(), bounds.YMost()); - XCopyArea(mDisplay, mXlibSurface->XDrawable(), mWindow, mGC, bounds.x, - bounds.y, size.width, size.height, bounds.x, bounds.y); -} - -} // namespace widget -} // namespace mozilla diff --git a/widget/gtk/WindowSurfaceXRender.h b/widget/gtk/WindowSurfaceXRender.h deleted file mode 100644 index 8c8e2745eb89..000000000000 --- a/widget/gtk/WindowSurfaceXRender.h +++ /dev/null @@ -1,37 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -#ifndef _MOZILLA_WIDGET_GTK_WINDOW_SURFACE_XRENDER_H -#define _MOZILLA_WIDGET_GTK_WINDOW_SURFACE_XRENDER_H - -#ifdef MOZ_X11 - -# include "WindowSurfaceX11.h" -# include "gfxXlibSurface.h" - -namespace mozilla { -namespace widget { - -class WindowSurfaceXRender : public WindowSurfaceX11 { - public: - WindowSurfaceXRender(Display* aDisplay, Window aWindow, Visual* aVisual, - unsigned int aDepth); - ~WindowSurfaceXRender(); - - already_AddRefed Lock( - const LayoutDeviceIntRegion& aRegion) override; - void Commit(const LayoutDeviceIntRegion& aInvalidRegion) override; - - private: - RefPtr mXlibSurface; - GC mGC; -}; - -} // namespace widget -} // namespace mozilla - -#endif // MOZ_X11 -#endif // _MOZILLA_WIDGET_GTK_WINDOW_SURFACE_XRENDER_H diff --git a/widget/gtk/moz.build b/widget/gtk/moz.build index efe3bb6c2015..d7216a692756 100644 --- a/widget/gtk/moz.build +++ b/widget/gtk/moz.build @@ -111,7 +111,6 @@ if CONFIG["MOZ_X11"]: "WindowSurfaceX11.cpp", "WindowSurfaceX11Image.cpp", "WindowSurfaceX11SHM.cpp", - "WindowSurfaceXRender.cpp", ] EXPORTS.mozilla.widget += [ "CompositorWidgetChild.h", diff --git a/widget/gtk/nsClipboardWaylandAsync.cpp b/widget/gtk/nsClipboardWaylandAsync.cpp index eab46e687ffb..080b25dc5915 100644 --- a/widget/gtk/nsClipboardWaylandAsync.cpp +++ b/widget/gtk/nsClipboardWaylandAsync.cpp @@ -46,9 +46,9 @@ struct AsyncClipboardData { ClipboardDataType mDataType; }; -static void wayland_clipboard_contents_received( +static void wayland_clipboard_contents_received_async( GtkClipboard* clipboard, GtkSelectionData* selection_data, gpointer data) { - LOGCLIP(("wayland_clipboard_contents_received() selection_data = %p\n", + LOGCLIP(("wayland_clipboard_contents_received_async() selection_data = %p\n", selection_data)); AsyncClipboardData* fastTrack = static_cast(data); fastTrack->mRetrievalContex->TransferAsyncClipboardData( @@ -157,7 +157,7 @@ GdkAtom* nsRetrievalContextWaylandAsync::GetTargets(int32_t aWhichClipboard, mClipboardRequestNumber++; gtk_clipboard_request_contents( gtk_clipboard_get(selection), gdk_atom_intern("TARGETS", FALSE), - wayland_clipboard_contents_received, + wayland_clipboard_contents_received_async, new AsyncClipboardData(CLIPBOARD_TARGETS, mClipboardRequestNumber, this)); if (!WaitForClipboardContent()) { @@ -196,7 +196,7 @@ const char* nsRetrievalContextWaylandAsync::GetClipboardData( mClipboardRequestNumber++; gtk_clipboard_request_contents( gtk_clipboard_get(selection), gdk_atom_intern(aMimeType, FALSE), - wayland_clipboard_contents_received, + wayland_clipboard_contents_received_async, new AsyncClipboardData(CLIPBOARD_DATA, mClipboardRequestNumber, this)); if (!WaitForClipboardContent()) { diff --git a/widget/gtk/nsLookAndFeel.cpp b/widget/gtk/nsLookAndFeel.cpp index 6818ae2458f7..cb17dc008d7a 100644 --- a/widget/gtk/nsLookAndFeel.cpp +++ b/widget/gtk/nsLookAndFeel.cpp @@ -874,7 +874,7 @@ nsresult nsLookAndFeel::NativeGetInt(IntID aID, int32_t& aResult) { break; } case IntID::TouchDeviceSupportPresent: - aResult = WidgetUtilsGTK::IsTouchDeviceSupportPresent() ? 1 : 0; + aResult = widget::WidgetUtilsGTK::IsTouchDeviceSupportPresent() ? 1 : 0; break; default: aResult = 0; diff --git a/widget/gtk/nsWindow.cpp b/widget/gtk/nsWindow.cpp index 1d1a42b71c18..a3f5db9d2df1 100644 --- a/widget/gtk/nsWindow.cpp +++ b/widget/gtk/nsWindow.cpp @@ -108,7 +108,6 @@ # include "GLContextEGL.h" // for GLContextEGL::FindVisual() # include "WindowSurfaceX11Image.h" # include "WindowSurfaceX11SHM.h" -# include "WindowSurfaceXRender.h" #endif #ifdef MOZ_WAYLAND # include "nsIClipboard.h"