summaryrefslogtreecommitdiff
path: root/user/thunderbird/webrender.patch
diff options
context:
space:
mode:
Diffstat (limited to 'user/thunderbird/webrender.patch')
-rw-r--r--user/thunderbird/webrender.patch26
1 files changed, 14 insertions, 12 deletions
diff --git a/user/thunderbird/webrender.patch b/user/thunderbird/webrender.patch
index a2457e576..1c0d381ac 100644
--- a/user/thunderbird/webrender.patch
+++ b/user/thunderbird/webrender.patch
@@ -6,10 +6,9 @@
# Parent 20d81e68da033746bf81acbb08490f16679853da
Bug 1716707 [s390x] Software WebRender does not support big endian
-diff -r 20d81e68da03 -r 903e5f164c0e gfx/webrender_bindings/RenderCompositorSWGL.cpp
---- a/gfx/webrender_bindings/RenderCompositorSWGL.cpp Thu Mar 24 06:57:58 2022 +0000
-+++ b/gfx/webrender_bindings/RenderCompositorSWGL.cpp Thu Mar 24 02:36:16 2022 -0700
-@@ -7,6 +7,7 @@
+--- firefox-128.0/gfx/webrender_bindings/RenderCompositorSWGL.cpp
++++ firefox-128.0/gfx/webrender_bindings/RenderCompositorSWGL.cpp
+@@ -7,6 +7,7 @@ * file, You can obtain one at http://moz
#include "RenderCompositorSWGL.h"
#include "mozilla/gfx/Logging.h"
@@ -17,24 +16,27 @@ diff -r 20d81e68da03 -r 903e5f164c0e gfx/webrender_bindings/RenderCompositorSWGL
#include "mozilla/widget/CompositorWidget.h"
#ifdef MOZ_WIDGET_GTK
-@@ -235,6 +237,13 @@
+@@ -242,6 +243,17 @@ mDT->ReleaseBits(mMappedData);
}
mDT->Flush();
+#if MOZ_BIG_ENDIAN()
+ // One swizzle to rule them all.
-+ gfx::SwizzleData(mMappedData, mMappedStride, gfx::SurfaceFormat::B8G8R8A8,
-+ mMappedData, mMappedStride, gfx::SurfaceFormat::A8R8G8B8,
-+ mDT->GetSize());
++ // With exception to certain text boxes with 1 line (46 pixels) and 2 lines
++ // (64 pixels) in Firefox 115. Per following bug:
++ // https://bugzilla.mozilla.org/show_bug.cgi?id=1900574
++ if ((int)mDT->GetSize().height != 46 && mDT->GetSize().height != 64)
++ gfx::SwizzleData(mMappedData, mMappedStride, gfx::SurfaceFormat::B8G8R8A8,
++ mMappedData, mMappedStride, gfx::SurfaceFormat::A8R8G8B8,
++ mDT->GetSize());
+#endif
+
// Done with the DT. Hand it back to the widget and clear out any trace of it.
mWidget->EndRemoteDrawingInRegion(mDT, mDirtyRegion);
mDirtyRegion.SetEmpty();
-diff -r 20d81e68da03 -r 903e5f164c0e image/imgFrame.cpp
---- a/image/imgFrame.cpp Thu Mar 24 06:57:58 2022 +0000
-+++ b/image/imgFrame.cpp Thu Mar 24 02:36:16 2022 -0700
-@@ -372,6 +372,17 @@
+--- firefox-128.0/image/imgFrame.cpp
++++ firefox-128.0/image/imgFrame.cpp
+@@ -372,6 +372,17 @@ mAborted = true;
return NS_ERROR_OUT_OF_MEMORY;
}