| Index: talk/session/media/channelmanager.cc
|
| diff --git a/talk/session/media/channelmanager.cc b/talk/session/media/channelmanager.cc
|
| index bb6fb25cb575301ad6b877d27c352c9aab90eed9..0e79e08dc3bd59ca63faad7cd53fdc059dbb8fdf 100644
|
| --- a/talk/session/media/channelmanager.cc
|
| +++ b/talk/session/media/channelmanager.cc
|
| @@ -49,6 +49,7 @@
|
| #include "webrtc/base/sigslotrepeater.h"
|
| #include "webrtc/base/stringencode.h"
|
| #include "webrtc/base/stringutils.h"
|
| +#include "webrtc/base/trace_event.h"
|
|
|
| namespace cricket {
|
|
|
| @@ -295,6 +296,7 @@ VoiceChannel* ChannelManager::CreateVoiceChannel_w(
|
| }
|
|
|
| void ChannelManager::DestroyVoiceChannel(VoiceChannel* voice_channel) {
|
| + TRACE_EVENT0("webrtc", "ChannelManager::DestroyVoiceChannel");
|
| if (voice_channel) {
|
| worker_thread_->Invoke<void>(
|
| Bind(&ChannelManager::DestroyVoiceChannel_w, this, voice_channel));
|
| @@ -302,6 +304,7 @@ void ChannelManager::DestroyVoiceChannel(VoiceChannel* voice_channel) {
|
| }
|
|
|
| void ChannelManager::DestroyVoiceChannel_w(VoiceChannel* voice_channel) {
|
| + TRACE_EVENT0("webrtc", "ChannelManager::DestroyVoiceChannel_w");
|
| // Destroy voice channel.
|
| ASSERT(initialized_);
|
| ASSERT(worker_thread_ == rtc::Thread::Current());
|
| @@ -351,6 +354,7 @@ VideoChannel* ChannelManager::CreateVideoChannel_w(
|
| }
|
|
|
| void ChannelManager::DestroyVideoChannel(VideoChannel* video_channel) {
|
| + TRACE_EVENT0("webrtc", "ChannelManager::DestroyVideoChannel");
|
| if (video_channel) {
|
| worker_thread_->Invoke<void>(
|
| Bind(&ChannelManager::DestroyVideoChannel_w, this, video_channel));
|
| @@ -358,6 +362,7 @@ void ChannelManager::DestroyVideoChannel(VideoChannel* video_channel) {
|
| }
|
|
|
| void ChannelManager::DestroyVideoChannel_w(VideoChannel* video_channel) {
|
| + TRACE_EVENT0("webrtc", "ChannelManager::DestroyVideoChannel_w");
|
| // Destroy video channel.
|
| ASSERT(initialized_);
|
| ASSERT(worker_thread_ == rtc::Thread::Current());
|
| @@ -408,6 +413,7 @@ DataChannel* ChannelManager::CreateDataChannel_w(
|
| }
|
|
|
| void ChannelManager::DestroyDataChannel(DataChannel* data_channel) {
|
| + TRACE_EVENT0("webrtc", "ChannelManager::DestroyDataChannel");
|
| if (data_channel) {
|
| worker_thread_->Invoke<void>(
|
| Bind(&ChannelManager::DestroyDataChannel_w, this, data_channel));
|
| @@ -415,6 +421,7 @@ void ChannelManager::DestroyDataChannel(DataChannel* data_channel) {
|
| }
|
|
|
| void ChannelManager::DestroyDataChannel_w(DataChannel* data_channel) {
|
| + TRACE_EVENT0("webrtc", "ChannelManager::DestroyDataChannel_w");
|
| // Destroy data channel.
|
| ASSERT(initialized_);
|
| DataChannels::iterator it = std::find(data_channels_.begin(),
|
|
|