commit e027f000e1003f9b28e8855331c2c59986d2f96e parent 0496eb8bf9acedf859ff6d2e13446475e1f245d6 Author: Michael Froman <mfroman@mozilla.com> Date: Thu, 9 Oct 2025 15:05:12 -0500 Bug 1993083 - Vendor libwebrtc from da3b3240cb Upstream commit: https://webrtc.googlesource.com/src/+/da3b3240cbcd8765a34cf92d2f6ec53758a11ca8 IWYU modules/portal using find modules/portal/ -name "*.h" -o -name "*.cc" | xargs tools_webrtc/iwyu/apply-include-cleaner followed by tools_webrtc/gn_check_autofix.py -C out/Default followed by git cl format Also revert some glib includes in video_capture based on feedback from https://webrtc-review.googlesource.com/c/src/+/399061 Bug: webrtc:42226242 Change-Id: I7790ad8f97b947fd0b1f04665d20442a9ed3913d Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/399820 Reviewed-by: Jan Grulich <grulja@gmail.com> Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org> Reviewed-by: Sergey Silkin <ssilkin@webrtc.org> Reviewed-by: Harald Alvestrand <hta@webrtc.org> Commit-Queue: Philipp Hancke <phancke@meta.com> Cr-Commit-Position: refs/heads/main@{#45174} Diffstat:
9 files changed, 21 insertions(+), 16 deletions(-)
diff --git a/third_party/libwebrtc/README.mozilla.last-vendor b/third_party/libwebrtc/README.mozilla.last-vendor @@ -1,4 +1,4 @@ # ./mach python dom/media/webrtc/third_party_build/vendor-libwebrtc.py --from-local /home/mfroman/mozilla/elm/.moz-fast-forward/moz-libwebrtc --commit mozpatches libwebrtc -libwebrtc updated from /home/mfroman/mozilla/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2025-10-09T20:03:58.440946+00:00. +libwebrtc updated from /home/mfroman/mozilla/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2025-10-09T20:05:02.894973+00:00. # base of lastest vendoring -ad04aa1b2a +da3b3240cb diff --git a/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_portal.cc b/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_portal.cc @@ -12,9 +12,7 @@ #include <gio/gio.h> #include <gio/gunixfdlist.h> -#include <glib-object.h> #include <glib.h> -#include <glibconfig.h> #include <unistd.h> #include <cstdint> diff --git a/third_party/libwebrtc/modules/portal/pipewire_utils.h b/third_party/libwebrtc/modules/portal/pipewire_utils.h @@ -11,11 +11,13 @@ #ifndef MODULES_PORTAL_PIPEWIRE_UTILS_H_ #define MODULES_PORTAL_PIPEWIRE_UTILS_H_ -#include <errno.h> -#include <stdint.h> +#include <asm-generic/ioctl.h> #include <sys/ioctl.h> #include <sys/mman.h> +#include <cerrno> +#include <cstdint> + // static struct dma_buf_sync { uint64_t flags; diff --git a/third_party/libwebrtc/modules/portal/scoped_glib.cc b/third_party/libwebrtc/modules/portal/scoped_glib.cc @@ -10,6 +10,11 @@ #include "modules/portal/scoped_glib.h" +#include <gio/gio.h> + +#include "rtc_base/system/rtc_export.h" +#include "rtc_base/system/rtc_export_template.h" + namespace webrtc { template class RTC_EXPORT_TEMPLATE_DEFINE(RTC_EXPORT) Scoped<GError>; diff --git a/third_party/libwebrtc/modules/portal/scoped_glib.h b/third_party/libwebrtc/modules/portal/scoped_glib.h @@ -14,6 +14,7 @@ #include <gio/gio.h> #include "rtc_base/checks.h" +#include "rtc_base/system/rtc_export.h" #include "rtc_base/system/rtc_export_template.h" namespace webrtc { diff --git a/third_party/libwebrtc/modules/portal/xdg_desktop_portal_utils.cc b/third_party/libwebrtc/modules/portal/xdg_desktop_portal_utils.cc @@ -9,10 +9,13 @@ */ #include "modules/portal/xdg_desktop_portal_utils.h" +#include <cstdint> #include <string> +#include <vector> #include "absl/strings/str_replace.h" #include "absl/strings/string_view.h" +#include "modules/portal/portal_request_response.h" #include "modules/portal/scoped_glib.h" #include "rtc_base/logging.h" #include "rtc_base/strings/str_join.h" diff --git a/third_party/libwebrtc/modules/portal/xdg_desktop_portal_utils.h b/third_party/libwebrtc/modules/portal/xdg_desktop_portal_utils.h @@ -12,17 +12,13 @@ #define MODULES_PORTAL_XDG_DESKTOP_PORTAL_UTILS_H_ #include <gio/gio.h> -#include <stdint.h> +#include <cstdint> #include <string> -#include <vector> #include "absl/strings/string_view.h" #include "modules/portal/portal_request_response.h" -#include "modules/portal/scoped_glib.h" -#include "modules/portal/xdg_session_details.h" -#include "rtc_base/checks.h" -#include "rtc_base/logging.h" +#include "rtc_base/system/rtc_export.h" namespace webrtc { namespace xdg_portal { diff --git a/third_party/libwebrtc/modules/video_capture/linux/camera_portal.cc b/third_party/libwebrtc/modules/video_capture/linux/camera_portal.cc @@ -10,11 +10,7 @@ #include "modules/video_capture/linux/camera_portal.h" -#include <gio/gio.h> #include <gio/gunixfdlist.h> -#include <glib-object.h> -#include <glib.h> -#include <glibconfig.h> #include <cstdint> #include <memory> diff --git a/third_party/libwebrtc/tools_webrtc/iwyu/apply_include_cleaner.py b/third_party/libwebrtc/tools_webrtc/iwyu/apply_include_cleaner.py @@ -75,6 +75,10 @@ _IGNORED_HEADERS = [ "\\.pb\\.h", # generated protobuf files. "pipewire\\/.*\\.h", # pipewire. "spa\\/.*\\.h", # pipewire. + "glib\\.h", # glib. + "glibconfig\\.h", # glib. + "glib-object\\.h", # glib. + "gio\\/.*\\.h", # glib. "openssl\\/.*\\.h", # openssl/boringssl. "alsa\\/.*\\.h", # ALSA. "pulse\\/.*\\.h", # PulseAudio.