Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(825)

Unified Diff: webrtc/p2p/base/transportcontroller.h

Issue 1895813003: Renames TransportController worker_thread to network_thread. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: rebase Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/p2p/base/faketransportcontroller.h ('k') | webrtc/p2p/base/transportcontroller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/p2p/base/transportcontroller.h
diff --git a/webrtc/p2p/base/transportcontroller.h b/webrtc/p2p/base/transportcontroller.h
index f84c55179c13f7a9b3ee342b12b5270a7be77372..cc16a768ab9a4b51323bbca4da0e79b864ef0d9a 100644
--- a/webrtc/p2p/base/transportcontroller.h
+++ b/webrtc/p2p/base/transportcontroller.h
@@ -32,13 +32,13 @@ class TransportController : public sigslot::has_slots<>,
public rtc::MessageHandler {
public:
TransportController(rtc::Thread* signaling_thread,
- rtc::Thread* worker_thread,
+ rtc::Thread* network_thread,
PortAllocator* port_allocator);
virtual ~TransportController();
rtc::Thread* signaling_thread() const { return signaling_thread_; }
- rtc::Thread* worker_thread() const { return worker_thread_; }
+ rtc::Thread* network_thread() const { return network_thread_; }
PortAllocator* port_allocator() const { return port_allocator_; }
@@ -82,13 +82,13 @@ class TransportController : public sigslot::has_slots<>,
// Creates a channel if it doesn't exist. Otherwise, increments a reference
// count and returns an existing channel.
- virtual TransportChannel* CreateTransportChannel_w(
+ virtual TransportChannel* CreateTransportChannel_n(
const std::string& transport_name,
int component);
// Decrements a channel's reference count, and destroys the channel if
// nothing is referencing it.
- virtual void DestroyTransportChannel_w(const std::string& transport_name,
+ virtual void DestroyTransportChannel_n(const std::string& transport_name,
int component);
void use_quic() { quic_ = true; }
@@ -121,11 +121,11 @@ class TransportController : public sigslot::has_slots<>,
protected:
// Protected and virtual so we can override it in unit tests.
- virtual Transport* CreateTransport_w(const std::string& transport_name);
+ virtual Transport* CreateTransport_n(const std::string& transport_name);
// For unit tests
const std::map<std::string, Transport*>& transports() { return transports_; }
- Transport* GetTransport_w(const std::string& transport_name);
+ Transport* GetTransport_n(const std::string& transport_name);
private:
void OnMessage(rtc::Message* pmsg) override;
@@ -153,57 +153,57 @@ class TransportController : public sigslot::has_slots<>,
int ref_;
};
- std::vector<RefCountedChannel>::iterator FindChannel_w(
+ std::vector<RefCountedChannel>::iterator FindChannel_n(
const std::string& transport_name,
int component);
- Transport* GetOrCreateTransport_w(const std::string& transport_name);
- void DestroyTransport_w(const std::string& transport_name);
- void DestroyAllTransports_w();
+ Transport* GetOrCreateTransport_n(const std::string& transport_name);
+ void DestroyTransport_n(const std::string& transport_name);
+ void DestroyAllTransports_n();
- bool SetSslMaxProtocolVersion_w(rtc::SSLProtocolVersion version);
- void SetIceConfig_w(const IceConfig& config);
- void SetIceRole_w(IceRole ice_role);
- bool GetSslRole_w(const std::string& transport_name, rtc::SSLRole* role);
- bool SetLocalCertificate_w(
+ bool SetSslMaxProtocolVersion_n(rtc::SSLProtocolVersion version);
+ void SetIceConfig_n(const IceConfig& config);
+ void SetIceRole_n(IceRole ice_role);
+ bool GetSslRole_n(const std::string& transport_name, rtc::SSLRole* role);
+ bool SetLocalCertificate_n(
const rtc::scoped_refptr<rtc::RTCCertificate>& certificate);
- bool GetLocalCertificate_w(
+ bool GetLocalCertificate_n(
const std::string& transport_name,
rtc::scoped_refptr<rtc::RTCCertificate>* certificate);
- std::unique_ptr<rtc::SSLCertificate> GetRemoteSSLCertificate_w(
+ std::unique_ptr<rtc::SSLCertificate> GetRemoteSSLCertificate_n(
const std::string& transport_name);
- bool SetLocalTransportDescription_w(const std::string& transport_name,
+ bool SetLocalTransportDescription_n(const std::string& transport_name,
const TransportDescription& tdesc,
ContentAction action,
std::string* err);
- bool SetRemoteTransportDescription_w(const std::string& transport_name,
+ bool SetRemoteTransportDescription_n(const std::string& transport_name,
const TransportDescription& tdesc,
ContentAction action,
std::string* err);
- void MaybeStartGathering_w();
- bool AddRemoteCandidates_w(const std::string& transport_name,
+ void MaybeStartGathering_n();
+ bool AddRemoteCandidates_n(const std::string& transport_name,
const Candidates& candidates,
std::string* err);
- bool RemoveRemoteCandidates_w(const Candidates& candidates, std::string* err);
- bool ReadyForRemoteCandidates_w(const std::string& transport_name);
- bool GetStats_w(const std::string& transport_name, TransportStats* stats);
+ bool RemoveRemoteCandidates_n(const Candidates& candidates, std::string* err);
+ bool ReadyForRemoteCandidates_n(const std::string& transport_name);
+ bool GetStats_n(const std::string& transport_name, TransportStats* stats);
// Handlers for signals from Transport.
- void OnChannelWritableState_w(TransportChannel* channel);
- void OnChannelReceivingState_w(TransportChannel* channel);
- void OnChannelGatheringState_w(TransportChannelImpl* channel);
- void OnChannelCandidateGathered_w(TransportChannelImpl* channel,
+ void OnChannelWritableState_n(TransportChannel* channel);
+ void OnChannelReceivingState_n(TransportChannel* channel);
+ void OnChannelGatheringState_n(TransportChannelImpl* channel);
+ void OnChannelCandidateGathered_n(TransportChannelImpl* channel,
const Candidate& candidate);
void OnChannelCandidatesRemoved(const Candidates& candidates);
- void OnChannelCandidatesRemoved_w(TransportChannelImpl* channel,
+ void OnChannelCandidatesRemoved_n(TransportChannelImpl* channel,
const Candidates& candidates);
- void OnChannelRoleConflict_w(TransportChannelImpl* channel);
- void OnChannelConnectionRemoved_w(TransportChannelImpl* channel);
+ void OnChannelRoleConflict_n(TransportChannelImpl* channel);
+ void OnChannelConnectionRemoved_n(TransportChannelImpl* channel);
- void UpdateAggregateStates_w();
+ void UpdateAggregateStates_n();
rtc::Thread* const signaling_thread_ = nullptr;
- rtc::Thread* const worker_thread_ = nullptr;
+ rtc::Thread* const network_thread_ = nullptr;
typedef std::map<std::string, Transport*> TransportMap;
TransportMap transports_;
« no previous file with comments | « webrtc/p2p/base/faketransportcontroller.h ('k') | webrtc/p2p/base/transportcontroller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698