diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-15 03:35:49 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-15 03:35:49 +0000 |
| commit | d8bbc7858622b6d9c278469aab701ca0b609cddf (patch) | |
| tree | eff41dc61d9f714852212739e6b3738b82a2af87 /third_party/libwebrtc/api/rtc_event_log | |
| parent | Releasing progress-linux version 125.0.3-1~progress7.99u1. (diff) | |
| download | firefox-d8bbc7858622b6d9c278469aab701ca0b609cddf.tar.xz firefox-d8bbc7858622b6d9c278469aab701ca0b609cddf.zip | |
Merging upstream version 126.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'third_party/libwebrtc/api/rtc_event_log')
| -rw-r--r-- | third_party/libwebrtc/api/rtc_event_log/rtc_event_log_factory.cc | 7 | ||||
| -rw-r--r-- | third_party/libwebrtc/api/rtc_event_log/rtc_event_log_factory.h | 5 |
2 files changed, 3 insertions, 9 deletions
diff --git a/third_party/libwebrtc/api/rtc_event_log/rtc_event_log_factory.cc b/third_party/libwebrtc/api/rtc_event_log/rtc_event_log_factory.cc index 30fc6f126f..bfe272d2a8 100644 --- a/third_party/libwebrtc/api/rtc_event_log/rtc_event_log_factory.cc +++ b/third_party/libwebrtc/api/rtc_event_log/rtc_event_log_factory.cc @@ -31,12 +31,7 @@ absl::Nonnull<std::unique_ptr<RtcEventLog>> RtcEventLogFactory::Create( if (env.field_trials().IsEnabled("WebRTC-RtcEventLogKillSwitch")) { return std::make_unique<RtcEventLogNull>(); } - RtcEventLog::EncodingType encoding_type = - env.field_trials().IsDisabled("WebRTC-RtcEventLogNewFormat") - ? RtcEventLog::EncodingType::Legacy - : RtcEventLog::EncodingType::NewFormat; - return std::make_unique<RtcEventLogImpl>( - RtcEventLogImpl::CreateEncoder(encoding_type), &env.task_queue_factory()); + return std::make_unique<RtcEventLogImpl>(env); #endif } diff --git a/third_party/libwebrtc/api/rtc_event_log/rtc_event_log_factory.h b/third_party/libwebrtc/api/rtc_event_log/rtc_event_log_factory.h index 21a670e1a7..1deb0612bf 100644 --- a/third_party/libwebrtc/api/rtc_event_log/rtc_event_log_factory.h +++ b/third_party/libwebrtc/api/rtc_event_log/rtc_event_log_factory.h @@ -26,10 +26,9 @@ class RTC_EXPORT RtcEventLogFactory : public RtcEventLogFactoryInterface { public: RtcEventLogFactory() = default; - // TODO(bugs.webrtc.org/15656): deprecate and delete constructor taking - // task queue factory in favor of using task queue factory provided through - // the Environment parameter in Create function. + [[deprecated("Use default constructor")]] // explicit RtcEventLogFactory(TaskQueueFactory* task_queue_factory) {} + ~RtcEventLogFactory() override = default; absl::Nonnull<std::unique_ptr<RtcEventLog>> Create( |