bonsai/repo
4
0
Fork 0
forked from kiss-community/repo
Code Issues 26 Pull Requests 2 Projects Releases Activity

firefox: [testing] 93.0b3

Browse Source
This commit is contained in:
Dylan Araps 2021-09-10 14:24:19 +03:00
parent f6bc4cd5d0
commit 7b14498aad
No known key found for this signature in database
GPG Key ID: 13295DAC2CF13B5C
3 changed files with 199 additions and 199 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
testing/firefox/checksums
View File

@ -1,4 +1,4 @@
f97be619debd307085d0b941441f579d3f5ae49471a362f87fab97cc7819eca1
2820bba32493df9c5e8f81f77822ae8c02c3fe9ccacbebe269bd53cad9d9225b
f0611136bee505811e9ca11ca7ac188ef5323a8e2ef19cffd3edb3cf08fd791e
3dce6601b495f5b3d45b59f7d2492a340ee7e84b5beca17e48f862502bd5603f
f0e8bb1f9b7eb0b01285495a2699df3a4b766784c1765a8f1aeedf63c0806369
@ -6,5 +6,5 @@ f0e8bb1f9b7eb0b01285495a2699df3a4b766784c1765a8f1aeedf63c0806369
42b3c7a29e61905be0e7425b8786870eb1d1c9e0f74c3f0909521b2ac52ac702
2b5732c15e7eade2a01ad9794de372f25fbb75e4e2f53bce089548bcbbba20d1
4b06181475f667ae2851540552ade56d5257a03cd21da588e2eb1e538bbc8176
85fcbb75cae21c4e73cd14e62b2ff831ca6f5c95afdf5d3703eac2c4a1d62784
45a0db13fd5cf7b4686613fd8096db99633cc260318c6ef002882d8abd1a20c8
47d30d0b73d3174f8ebbb6d686892fa5435beb3355ddacded70194ef0249ba51

110
testing/firefox/patches/no-x11.patch
View File

@ -66,60 +66,6 @@ index 12d1a497b9..bec4cd17f0 100644
#ifndef GL_CONTEXT_PROVIDER_DEFAULT
# define GL_CONTEXT_PROVIDER_DEFAULT GLContextProviderEGL
#endif
diff --git a/gfx/gl/GLContextProviderWayland.cpp b/gfx/gl/GLContextProviderWayland.cpp
index 3f1f926cd9..fa2d0f50ca 100644
--- a/gfx/gl/GLContextProviderWayland.cpp
+++ b/gfx/gl/GLContextProviderWayland.cpp
@@ -14,7 +14,6 @@ namespace mozilla::gl {
using namespace mozilla::gfx;
using namespace mozilla::widget;
-static class GLContextProviderX11 sGLContextProviderX11;
static class GLContextProviderEGL sGLContextProviderEGL;
// Note that if there is no GTK display, `GdkIsX11Display` and
@@ -30,41 +29,25 @@ static class GLContextProviderEGL sGLContextProviderEGL;
already_AddRefed<GLContext> GLContextProviderWayland::CreateForCompositorWidget(
CompositorWidget* aCompositorWidget, bool aHardwareWebRender,
bool aForceAccelerated) {
- if (GdkIsWaylandDisplay()) {
return sGLContextProviderEGL.CreateForCompositorWidget(
aCompositorWidget, aHardwareWebRender, aForceAccelerated);
- } else {
- return sGLContextProviderX11.CreateForCompositorWidget(
- aCompositorWidget, aHardwareWebRender, aForceAccelerated);
}
}
/*static*/
already_AddRefed<GLContext> GLContextProviderWayland::CreateHeadless(
const GLContextCreateDesc& desc, nsACString* const out_failureId) {
- if (GdkIsWaylandDisplay()) {
return sGLContextProviderEGL.CreateHeadless(desc, out_failureId);
- } else {
- return sGLContextProviderX11.CreateHeadless(desc, out_failureId);
- }
}
/*static*/
GLContext* GLContextProviderWayland::GetGlobalContext() {
- if (GdkIsWaylandDisplay()) {
return sGLContextProviderEGL.GetGlobalContext();
- } else {
- return sGLContextProviderX11.GetGlobalContext();
- }
}
/*static*/
void GLContextProviderWayland::Shutdown() {
- if (GdkIsWaylandDisplay()) {
sGLContextProviderEGL.Shutdown();
- } else {
- sGLContextProviderX11.Shutdown();
- }
}
} // namespace mozilla::gl
diff --git a/gfx/gl/moz.build b/gfx/gl/moz.build
index 7ac6b0753a..a817a6fb08 100644
--- a/gfx/gl/moz.build
@ -898,7 +844,7 @@ index 884d52a6ca..077356c974 100644
+static bool sInitialized = false;
static void Initialize() {
+#ifdef
+#ifdef MOZ_X11
if (!mozilla::widget::GdkIsX11Display()) {
return;
}
@ -1428,3 +1374,57 @@ index f5f28d2214..969ab5d003 100644
IPDL_SOURCES = [
"gtk/PCompositorWidget.ipdl",
"gtk/PlatformWidgetTypes.ipdlh",
diff --git a/gfx/gl/GLContextProviderWayland.cpp b/gfx/gl/GLContextProviderWayland.cpp
index 3f1f926..cd49dc5 100644
--- a/gfx/gl/GLContextProviderWayland.cpp
+++ b/gfx/gl/GLContextProviderWayland.cpp
@@ -14,7 +14,6 @@ namespace mozilla::gl {
using namespace mozilla::gfx;
using namespace mozilla::widget;
-static class GLContextProviderX11 sGLContextProviderX11;
static class GLContextProviderEGL sGLContextProviderEGL;
// Note that if there is no GTK display, `GdkIsX11Display` and
@@ -30,41 +29,24 @@ static class GLContextProviderEGL sGLContextProviderEGL;
already_AddRefed<GLContext> GLContextProviderWayland::CreateForCompositorWidget(
CompositorWidget* aCompositorWidget, bool aHardwareWebRender,
bool aForceAccelerated) {
- if (GdkIsWaylandDisplay()) {
return sGLContextProviderEGL.CreateForCompositorWidget(
aCompositorWidget, aHardwareWebRender, aForceAccelerated);
- } else {
- return sGLContextProviderX11.CreateForCompositorWidget(
- aCompositorWidget, aHardwareWebRender, aForceAccelerated);
- }
}
/*static*/
already_AddRefed<GLContext> GLContextProviderWayland::CreateHeadless(
const GLContextCreateDesc& desc, nsACString* const out_failureId) {
- if (GdkIsWaylandDisplay()) {
return sGLContextProviderEGL.CreateHeadless(desc, out_failureId);
- } else {
- return sGLContextProviderX11.CreateHeadless(desc, out_failureId);
- }
}
/*static*/
GLContext* GLContextProviderWayland::GetGlobalContext() {
- if (GdkIsWaylandDisplay()) {
return sGLContextProviderEGL.GetGlobalContext();
- } else {
- return sGLContextProviderX11.GetGlobalContext();
- }
}
/*static*/
void GLContextProviderWayland::Shutdown() {
- if (GdkIsWaylandDisplay()) {
sGLContextProviderEGL.Shutdown();
- } else {
- sGLContextProviderX11.Shutdown();
- }
}
} // namespace mozilla::gl

2
testing/firefox/version
View File

@ -1 +1 @@
93.0b1 1
93.0b3 1