commit 9e09a1f327018143723c330069b51b16613a6f11
author Danil Chapovalov <danilchap@webrtc.org> Thu Sep 08 18:38:10 2022 +0200
committer WebRTC LUCI CQ <webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com> Fri Sep 09 10:44:17 2022 +0000
tree 215ae9689fe99ccaecc5a29eef570a6fd0c52165
parent b190ca9e70ca448e36ec9951c46faedd5cd1dbb9

Replace Thread::Invoke with Thread::BlockingCall

BlockingCall doesn't take rtc::Location parameter and thus most of the dependencies on location can be removed

Bug: webrtc:11318
Change-Id: I91a17e342dd9a9e3e2c8f7fbe267474c98a8d0e5
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/274620
Reviewed-by: Tomas Gunnarsson <tommi@webrtc.org>
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#38045}

sdk/objc/api/peerconnection/RTCMediaStream.mm

diff --git a/sdk/objc/api/peerconnection/RTCMediaStream.mm b/sdk/objc/api/peerconnection/RTCMediaStream.mm
index beb4a7a..0018dd6 100644
--- a/sdk/objc/api/peerconnection/RTCMediaStream.mm
+++ b/sdk/objc/api/peerconnection/RTCMediaStream.mm
@@ -36,16 +36,14 @@
 
 - (NSArray<RTC_OBJC_TYPE(RTCAudioTrack) *> *)audioTracks {
   if (!_signalingThread->IsCurrent()) {
-    return _signalingThread->Invoke<NSArray<RTC_OBJC_TYPE(RTCAudioTrack) *> *>(
-        RTC_FROM_HERE, [self]() { return self.audioTracks; });
+    return _signalingThread->BlockingCall([self]() { return self.audioTracks; });
   }
   return [_audioTracks copy];
 }
 
 - (NSArray<RTC_OBJC_TYPE(RTCVideoTrack) *> *)videoTracks {
   if (!_signalingThread->IsCurrent()) {
-    return _signalingThread->Invoke<NSArray<RTC_OBJC_TYPE(RTCVideoTrack) *> *>(
-        RTC_FROM_HERE, [self]() { return self.videoTracks; });
+    return _signalingThread->BlockingCall([self]() { return self.videoTracks; });
   }
   return [_videoTracks copy];
 }
@@ -56,8 +54,8 @@
 
 - (void)addAudioTrack:(RTC_OBJC_TYPE(RTCAudioTrack) *)audioTrack {
   if (!_signalingThread->IsCurrent()) {
-    return _signalingThread->Invoke<void>(
-        RTC_FROM_HERE, [audioTrack, self]() { return [self addAudioTrack:audioTrack]; });
+    return _signalingThread->BlockingCall(
+        [audioTrack, self]() { return [self addAudioTrack:audioTrack]; });
   }
   if (_nativeMediaStream->AddTrack(audioTrack.nativeAudioTrack)) {
     [_audioTracks addObject:audioTrack];
@@ -66,8 +64,8 @@
 
 - (void)addVideoTrack:(RTC_OBJC_TYPE(RTCVideoTrack) *)videoTrack {
   if (!_signalingThread->IsCurrent()) {
-    return _signalingThread->Invoke<void>(
-        RTC_FROM_HERE, [videoTrack, self]() { return [self addVideoTrack:videoTrack]; });
+    return _signalingThread->BlockingCall(
+        [videoTrack, self]() { return [self addVideoTrack:videoTrack]; });
   }
   if (_nativeMediaStream->AddTrack(videoTrack.nativeVideoTrack)) {
     [_videoTracks addObject:videoTrack];
@@ -76,8 +74,8 @@
 
 - (void)removeAudioTrack:(RTC_OBJC_TYPE(RTCAudioTrack) *)audioTrack {
   if (!_signalingThread->IsCurrent()) {
-    return _signalingThread->Invoke<void>(
-        RTC_FROM_HERE, [audioTrack, self]() { return [self removeAudioTrack:audioTrack]; });
+    return _signalingThread->BlockingCall(
+        [audioTrack, self]() { return [self removeAudioTrack:audioTrack]; });
   }
   NSUInteger index = [_audioTracks indexOfObjectIdenticalTo:audioTrack];
   if (index == NSNotFound) {
@@ -91,8 +89,8 @@
 
 - (void)removeVideoTrack:(RTC_OBJC_TYPE(RTCVideoTrack) *)videoTrack {
   if (!_signalingThread->IsCurrent()) {
-    return _signalingThread->Invoke<void>(
-        RTC_FROM_HERE, [videoTrack, self]() { return [self removeVideoTrack:videoTrack]; });
+    return _signalingThread->BlockingCall(
+        [videoTrack, self]() { return [self removeVideoTrack:videoTrack]; });
   }
   NSUInteger index = [_videoTracks indexOfObjectIdenticalTo:videoTrack];
   if (index == NSNotFound) {