2
0
mirror of https://codeberg.org/kiss-community/repo synced 2024-07-07 16:32:28 +00:00

firefox: 99.0 (#54)

This commit is contained in:
Owen Rafferty 2022-04-04 20:41:10 -07:00 committed by GitHub
parent e8d36b279e
commit 6cbc6ac0aa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 38 deletions

View File

@ -1,4 +1,4 @@
fd0a4c11d007d9045706667eb0f99f9b7422945188424cb937bfef530cb6f4dd 513f8d2cafa39a2d50f2c4a25cc48093e89f715a706b941170fa48e397976327
f0611136bee505811e9ca11ca7ac188ef5323a8e2ef19cffd3edb3cf08fd791e f0611136bee505811e9ca11ca7ac188ef5323a8e2ef19cffd3edb3cf08fd791e
3dce6601b495f5b3d45b59f7d2492a340ee7e84b5beca17e48f862502bd5603f 3dce6601b495f5b3d45b59f7d2492a340ee7e84b5beca17e48f862502bd5603f
f0e8bb1f9b7eb0b01285495a2699df3a4b766784c1765a8f1aeedf63c0806369 f0e8bb1f9b7eb0b01285495a2699df3a4b766784c1765a8f1aeedf63c0806369
@ -6,4 +6,4 @@ f0e8bb1f9b7eb0b01285495a2699df3a4b766784c1765a8f1aeedf63c0806369
ba6e380bc3d2cbd1b3a505ab97687498335c334d8a4be7f465ad30ee366806c7 ba6e380bc3d2cbd1b3a505ab97687498335c334d8a4be7f465ad30ee366806c7
86ce49e650dd117f0f2928a7f810a58df526b1087c274d35eeb9c5bbf09eac5b 86ce49e650dd117f0f2928a7f810a58df526b1087c274d35eeb9c5bbf09eac5b
4a232e3aa3973894a58c126b9e901c924d4e1ca3e00c4fc82d08de4b880183a9 4a232e3aa3973894a58c126b9e901c924d4e1ca3e00c4fc82d08de4b880183a9
c7d4d817541c1ee689a909b83758c8c5caee2223122a3756b8dee0619e2ee570 b70872a93fb765a14ea9f8c539ee7713cb211f0f76fde29f21e4d52e43ae6816

View File

@ -63,7 +63,7 @@ index 03434957cc..c4727d79a1 100644
UNIFIED_SOURCES += [ UNIFIED_SOURCES += [
"AndroidSurfaceTexture.cpp", "AndroidSurfaceTexture.cpp",
diff --git a/gfx/layers/client/TextureClient.cpp b/gfx/layers/client/TextureClient.cpp diff --git a/gfx/layers/client/TextureClient.cpp b/gfx/layers/client/TextureClient.cpp
index aaec3c3510..65bee9f869 100644 index 3861d3a..8dcad53 100644
--- a/gfx/layers/client/TextureClient.cpp --- a/gfx/layers/client/TextureClient.cpp
+++ b/gfx/layers/client/TextureClient.cpp +++ b/gfx/layers/client/TextureClient.cpp
@@ -48,8 +48,6 @@ @@ -48,8 +48,6 @@
@ -79,7 +79,7 @@ diff --git a/gfx/thebes/gfxPlatformGtk.cpp b/gfx/thebes/gfxPlatformGtk.cpp
index 1b46a2aab8..4a487e0b78 100644 index 1b46a2aab8..4a487e0b78 100644
--- a/gfx/thebes/gfxPlatformGtk.cpp --- a/gfx/thebes/gfxPlatformGtk.cpp
+++ b/gfx/thebes/gfxPlatformGtk.cpp +++ b/gfx/thebes/gfxPlatformGtk.cpp
@@ -31,11 +31,11 @@ @@ -31,12 +31,12 @@
#include "mozilla/FontPropertyTypes.h" #include "mozilla/FontPropertyTypes.h"
#include "mozilla/gfx/2D.h" #include "mozilla/gfx/2D.h"
#include "mozilla/gfx/Logging.h" #include "mozilla/gfx/Logging.h"
@ -88,11 +88,12 @@ index 1b46a2aab8..4a487e0b78 100644
#include "mozilla/Preferences.h" #include "mozilla/Preferences.h"
#include "mozilla/StaticPrefs_gfx.h" #include "mozilla/StaticPrefs_gfx.h"
#include "mozilla/StaticPrefs_layers.h" #include "mozilla/StaticPrefs_layers.h"
#include "mozilla/StaticPrefs_media.h"
+#include "mozilla/WidgetUtilsGtk.h" +#include "mozilla/WidgetUtilsGtk.h"
#include "nsAppRunner.h" #include "nsAppRunner.h"
#include "nsIGfxInfo.h" #include "nsIGfxInfo.h"
#include "nsMathUtils.h" #include "nsMathUtils.h"
@@ -52,6 +52,7 @@ @@ -53,6 +53,7 @@
# include "GLXLibrary.h" # include "GLXLibrary.h"
# include "mozilla/X11Util.h" # include "mozilla/X11Util.h"
# include "SoftwareVsyncSource.h" # include "SoftwareVsyncSource.h"
@ -673,11 +674,11 @@ index 38c07bd812..8f2c10894a 100644
Classes += [ Classes += [
{ {
diff --git a/widget/gtk/moz.build b/widget/gtk/moz.build diff --git a/widget/gtk/moz.build b/widget/gtk/moz.build
index 320318b..d83a256 100644 index 4832cac..dfe7adb 100644
--- a/widget/gtk/moz.build --- a/widget/gtk/moz.build
+++ b/widget/gtk/moz.build +++ b/widget/gtk/moz.build
@@ -34,16 +34,24 @@ EXPORTS += [ @@ -38,16 +38,24 @@ EXPORTS.mozilla += [
EXPORTS.mozilla += ["WidgetUtilsGtk.h"] ]
EXPORTS.mozilla.widget += [ EXPORTS.mozilla.widget += [
+ "CompositorWidgetChild.h", + "CompositorWidgetChild.h",
@ -701,7 +702,7 @@ index 320318b..d83a256 100644
"MozContainer.cpp", "MozContainer.cpp",
"MPRISServiceHandler.cpp", "MPRISServiceHandler.cpp",
"NativeKeyBindings.cpp", "NativeKeyBindings.cpp",
@@ -59,6 +67,7 @@ UNIFIED_SOURCES += [ @@ -65,6 +73,7 @@ UNIFIED_SOURCES += [
"nsLookAndFeel.cpp", "nsLookAndFeel.cpp",
"nsSound.cpp", "nsSound.cpp",
"nsToolkit.cpp", "nsToolkit.cpp",
@ -709,7 +710,7 @@ index 320318b..d83a256 100644
"nsWidgetFactory.cpp", "nsWidgetFactory.cpp",
"ScreenHelperGTK.cpp", "ScreenHelperGTK.cpp",
"TaskbarProgress.cpp", "TaskbarProgress.cpp",
@@ -101,22 +110,12 @@ if CONFIG["MOZ_WAYLAND"]: @@ -115,22 +124,12 @@ if CONFIG["MOZ_WAYLAND"]:
if CONFIG["MOZ_X11"]: if CONFIG["MOZ_X11"]:
UNIFIED_SOURCES += [ UNIFIED_SOURCES += [
@ -1067,25 +1068,6 @@ index 8fb56543b7..9a562eb124 100644
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <fcntl.h> #include <fcntl.h>
@@ -527,6 +528,7 @@ static void wayland_window_handle_exported(GdkWindow* window,
static gboolean window_export_handle(GtkWindow* window,
GtkWindowHandleExported callback,
gpointer user_data) {
+#ifdef MOZ_X11
if (GdkIsX11Display()) {
GdkWindow* gdk_window = gtk_widget_get_window(GTK_WIDGET(window));
char* handle_str;
@@ -537,8 +539,9 @@ static gboolean window_export_handle(GtkWindow* window,
g_free(handle_str);
return true;
}
+#endif
#ifdef MOZ_WAYLAND
- else if (GdkIsWaylandDisplay()) {
+ if (GdkIsWaylandDisplay()) {
GdkWindow* gdk_window = gtk_widget_get_window(GTK_WIDGET(window));
WaylandWindowHandleExportedData* data;
diff --git a/widget/gtk/nsUserIdleServiceGTK.cpp b/widget/gtk/nsUserIdleServiceGTK.cpp diff --git a/widget/gtk/nsUserIdleServiceGTK.cpp b/widget/gtk/nsUserIdleServiceGTK.cpp
index 884d52a6ca..4b2b04f09a 100644 index 884d52a6ca..4b2b04f09a 100644
--- a/widget/gtk/nsUserIdleServiceGTK.cpp --- a/widget/gtk/nsUserIdleServiceGTK.cpp
@ -1599,20 +1581,20 @@ index 59e01f0fea..12bdda1cd4 100644
// FIXME: It would be nice to have the widget position at the time // FIXME: It would be nice to have the widget position at the time
// of the event, but it's relatively unlikely that the widget has // of the event, but it's relatively unlikely that the widget has
diff --git a/widget/gtk/nsWindow.h b/widget/gtk/nsWindow.h diff --git a/widget/gtk/nsWindow.h b/widget/gtk/nsWindow.h
index 9baa034477..cfd4a6c178 100644 index 48cfd89..669060f 100644
--- a/widget/gtk/nsWindow.h --- a/widget/gtk/nsWindow.h
+++ b/widget/gtk/nsWindow.h +++ b/widget/gtk/nsWindow.h
@@ -98,7 +98,9 @@ typedef struct _GdkEventTouchpadPinch GdkEventTouchpadPinch; @@ -89,7 +89,9 @@ namespace mozilla {
enum class NativeKeyBindingsType : uint8_t;
namespace mozilla {
class TimeStamp; class TimeStamp;
+#ifdef MOZ_X11 +#ifdef MOZ_X11
class CurrentX11TimeGetter; class CurrentX11TimeGetter;
+#endif +#endif
} // namespace mozilla } // namespace mozilla
@@ -278,7 +280,9 @@ class nsWindow final : public nsBaseWidget { class nsWindow final : public nsBaseWidget {
@@ -267,7 +269,9 @@ class nsWindow final : public nsBaseWidget {
WidgetEventTime GetWidgetEventTime(guint32 aEventTime); WidgetEventTime GetWidgetEventTime(guint32 aEventTime);
mozilla::TimeStamp GetEventTimeStamp(guint32 aEventTime); mozilla::TimeStamp GetEventTimeStamp(guint32 aEventTime);
@ -1622,7 +1604,7 @@ index 9baa034477..cfd4a6c178 100644
void SetInputContext(const InputContext& aContext, void SetInputContext(const InputContext& aContext,
const InputContextAction& aAction) override; const InputContextAction& aAction) override;
@@ -473,7 +477,7 @@ class nsWindow final : public nsBaseWidget { @@ -465,7 +469,7 @@ class nsWindow final : public nsBaseWidget {
void DestroyChildWindows(); void DestroyChildWindows();
GtkWidget* GetToplevelWidget(); GtkWidget* GetToplevelWidget();
nsWindow* GetContainerWindow(); nsWindow* GetContainerWindow();
@ -1631,7 +1613,7 @@ index 9baa034477..cfd4a6c178 100644
bool GetShapedState(); bool GetShapedState();
void EnsureGdkWindow(); void EnsureGdkWindow();
void SetUrgencyHint(GtkWidget* top_window, bool state); void SetUrgencyHint(GtkWidget* top_window, bool state);
@@ -835,7 +839,9 @@ class nsWindow final : public nsBaseWidget { @@ -819,7 +823,9 @@ class nsWindow final : public nsBaseWidget {
*/ */
RefPtr<mozilla::widget::IMContextWrapper> mIMContext; RefPtr<mozilla::widget::IMContextWrapper> mIMContext;

View File

@ -1 +1 @@
98.0 2 99.0 1