Diff
Modified: trunk/ChangeLog (284151 => 284152)
--- trunk/ChangeLog 2021-10-14 10:22:09 UTC (rev 284151)
+++ trunk/ChangeLog 2021-10-14 11:23:55 UTC (rev 284152)
@@ -1,3 +1,13 @@
+2021-10-14 Carlos Garcia Campos <[email protected]>
+
+ [GTK][WPE] Bump GLib version to 2.58.3
+ https://bugs.webkit.org/show_bug.cgi?id=231726
+
+ Reviewed by Philippe Normand.
+
+ * Source/cmake/OptionsGTK.cmake:
+ * Source/cmake/OptionsWPE.cmake:
+
2021-10-14 Enrique Ocaña González <[email protected]>
[contributors.json] Add eocanha github account and canonicalize
Modified: trunk/Source/WTF/ChangeLog (284151 => 284152)
--- trunk/Source/WTF/ChangeLog 2021-10-14 10:22:09 UTC (rev 284151)
+++ trunk/Source/WTF/ChangeLog 2021-10-14 11:23:55 UTC (rev 284152)
@@ -1,3 +1,16 @@
+2021-10-14 Carlos Garcia Campos <[email protected]>
+
+ [GTK][WPE] Bump GLib version to 2.58.3
+ https://bugs.webkit.org/show_bug.cgi?id=231726
+
+ Reviewed by Philippe Normand.
+
+ Remove enumToString() since we can use g_enum_to_string().
+
+ * wtf/glib/GLibUtilities.cpp:
+ (enumToString): Deleted.
+ * wtf/glib/GLibUtilities.h:
+
2021-10-13 Megan Gardner <[email protected]>
Scroll To Text Fragment directive parsing
Modified: trunk/Source/WTF/wtf/glib/GLibUtilities.cpp (284151 => 284152)
--- trunk/Source/WTF/wtf/glib/GLibUtilities.cpp 2021-10-14 10:22:09 UTC (rev 284151)
+++ trunk/Source/WTF/wtf/glib/GLibUtilities.cpp 2021-10-14 11:23:55 UTC (rev 284152)
@@ -77,18 +77,3 @@
return g_get_prgname();
}
-
-CString enumToString(GType type, guint value)
-{
-#if GLIB_CHECK_VERSION(2, 54, 0)
- GUniquePtr<char> result(g_enum_to_string(type, value));
- return result.get();
-#else
- GEnumClass* enumClass = reinterpret_cast<GEnumClass*>(g_type_class_ref(type));
- GEnumValue* enumValue = g_enum_get_value(enumClass, value);
- char* representation = enumValue ? g_strdup(enumValue->value_nick) : nullptr;
- g_type_class_unref(enumClass);
- GUniquePtr<char> result(representation);
- return result.get();
-#endif
-}
Modified: trunk/Source/WTF/wtf/glib/GLibUtilities.h (284151 => 284152)
--- trunk/Source/WTF/wtf/glib/GLibUtilities.h 2021-10-14 10:22:09 UTC (rev 284151)
+++ trunk/Source/WTF/wtf/glib/GLibUtilities.h 2021-10-14 11:23:55 UTC (rev 284152)
@@ -26,15 +26,5 @@
WTF_EXPORT_PRIVATE CString getCurrentExecutablePath();
WTF_EXPORT_PRIVATE CString getCurrentExecutableName();
-WTF_EXPORT_PRIVATE CString enumToString(GType, guint value);
-// These might be added to glib in the future, but in the meantime they're defined here.
-#ifndef GULONG_TO_POINTER
-#define GULONG_TO_POINTER(ul) ((gpointer) (gulong) (ul))
#endif
-
-#ifndef GPOINTER_TO_ULONG
-#define GPOINTER_TO_ULONG(p) ((gulong) (p))
-#endif
-
-#endif
Modified: trunk/Source/WebCore/ChangeLog (284151 => 284152)
--- trunk/Source/WebCore/ChangeLog 2021-10-14 10:22:09 UTC (rev 284151)
+++ trunk/Source/WebCore/ChangeLog 2021-10-14 11:23:55 UTC (rev 284152)
@@ -1,3 +1,15 @@
+2021-10-14 Carlos Garcia Campos <[email protected]>
+
+ [GTK][WPE] Bump GLib version to 2.58.3
+ https://bugs.webkit.org/show_bug.cgi?id=231726
+
+ Reviewed by Philippe Normand.
+
+ Use g_enum_to_string().
+
+ * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
+ (WebCore::MediaPlayerPrivateGStreamer::updateBufferingStatus):
+
2021-10-14 Tim Nguyen <[email protected]>
Remove useless isConnected() check from HTMLDialogElement::close()
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp (284151 => 284152)
--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2021-10-14 10:22:09 UTC (rev 284151)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2021-10-14 11:23:55 UTC (rev 284152)
@@ -1976,7 +1976,10 @@
{
bool wasBuffering = m_isBuffering;
- GST_DEBUG_OBJECT(pipeline(), "[Buffering] mode: %s, status: %f%%", enumToString(GST_TYPE_BUFFERING_MODE, mode).data(), percentage);
+#ifndef GST_DISABLE_GST_DEBUG
+ GUniquePtr<char> modeString(g_enum_to_string(GST_TYPE_BUFFERING_MODE, mode));
+ GST_DEBUG_OBJECT(pipeline(), "[Buffering] mode: %s, status: %f%%", modeString.get(), percentage);
+#endif
m_didDownloadFinish = percentage == 100;
m_isBuffering = !m_didDownloadFinish;
@@ -2003,7 +2006,9 @@
break;
}
default:
- GST_DEBUG_OBJECT(pipeline(), "Unhandled buffering mode: %s", enumToString(GST_TYPE_BUFFERING_MODE, mode).data());
+#ifndef GST_DISABLE_GST_DEBUG
+ GST_DEBUG_OBJECT(pipeline(), "Unhandled buffering mode: %s", modeString.get());
+#endif
break;
}
}
Modified: trunk/Source/cmake/OptionsGTK.cmake (284151 => 284152)
--- trunk/Source/cmake/OptionsGTK.cmake 2021-10-14 10:22:09 UTC (rev 284151)
+++ trunk/Source/cmake/OptionsGTK.cmake 2021-10-14 11:23:55 UTC (rev 284152)
@@ -12,7 +12,7 @@
find_package(Fontconfig 2.8.0 REQUIRED)
find_package(Freetype 2.4.2 REQUIRED)
find_package(LibGcrypt 1.6.0 REQUIRED)
-find_package(GLIB 2.44.0 REQUIRED COMPONENTS gio gio-unix gobject gthread gmodule)
+find_package(GLIB 2.58.3 REQUIRED COMPONENTS gio gio-unix gobject gthread gmodule)
find_package(HarfBuzz 0.9.18 REQUIRED COMPONENTS ICU)
find_package(ICU 61.2 REQUIRED COMPONENTS data i18n uc)
find_package(JPEG REQUIRED)
Modified: trunk/Source/cmake/OptionsWPE.cmake (284151 => 284152)
--- trunk/Source/cmake/OptionsWPE.cmake 2021-10-14 10:22:09 UTC (rev 284151)
+++ trunk/Source/cmake/OptionsWPE.cmake 2021-10-14 11:23:55 UTC (rev 284152)
@@ -8,7 +8,7 @@
find_package(Cairo 1.14.0 REQUIRED)
find_package(Fontconfig 2.8.0 REQUIRED)
find_package(Freetype 2.4.2 REQUIRED)
-find_package(GLIB 2.44.0 REQUIRED COMPONENTS gio gio-unix gobject gthread gmodule)
+find_package(GLIB 2.58.3 REQUIRED COMPONENTS gio gio-unix gobject gthread gmodule)
find_package(HarfBuzz 0.9.18 REQUIRED COMPONENTS ICU)
find_package(ICU 61.2 REQUIRED COMPONENTS data i18n uc)
find_package(JPEG REQUIRED)
