| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2012 The WebRTC project authors. All Rights Reserved. | 2 * Copyright 2012 The WebRTC project authors. All Rights Reserved. |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
| 5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
| 6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
| 7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
| 8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
| 9 */ | 9 */ |
| 10 | 10 |
| (...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 180 // Try to connect to the transport in case the transport channel already | 180 // Try to connect to the transport in case the transport channel already |
| 181 // exists. | 181 // exists. |
| 182 OnTransportChannelCreated(); | 182 OnTransportChannelCreated(); |
| 183 | 183 |
| 184 // Checks if the transport is ready to send because the initial channel | 184 // Checks if the transport is ready to send because the initial channel |
| 185 // ready signal may have been sent before the DataChannel creation. | 185 // ready signal may have been sent before the DataChannel creation. |
| 186 // This has to be done async because the upper layer objects (e.g. | 186 // This has to be done async because the upper layer objects (e.g. |
| 187 // Chrome glue and WebKit) are not wired up properly until after this | 187 // Chrome glue and WebKit) are not wired up properly until after this |
| 188 // function returns. | 188 // function returns. |
| 189 if (provider_->ReadyToSendData()) { | 189 if (provider_->ReadyToSendData()) { |
| 190 rtc::Thread::Current()->Post(this, MSG_CHANNELREADY, NULL); | 190 rtc::Thread::Current()->Post(RTC_FROM_HERE, this, MSG_CHANNELREADY, NULL); |
| 191 } | 191 } |
| 192 } | 192 } |
| 193 | 193 |
| 194 return true; | 194 return true; |
| 195 } | 195 } |
| 196 | 196 |
| 197 DataChannel::~DataChannel() {} | 197 DataChannel::~DataChannel() {} |
| 198 | 198 |
| 199 void DataChannel::RegisterObserver(DataChannelObserver* observer) { | 199 void DataChannel::RegisterObserver(DataChannelObserver* observer) { |
| 200 observer_ = observer; | 200 observer_ = observer; |
| (...skipping 429 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 630 QueueControlMessage(buffer); | 630 QueueControlMessage(buffer); |
| 631 } else { | 631 } else { |
| 632 LOG(LS_ERROR) << "Closing the DataChannel due to a failure to send" | 632 LOG(LS_ERROR) << "Closing the DataChannel due to a failure to send" |
| 633 << " the CONTROL message, send_result = " << send_result; | 633 << " the CONTROL message, send_result = " << send_result; |
| 634 Close(); | 634 Close(); |
| 635 } | 635 } |
| 636 return retval; | 636 return retval; |
| 637 } | 637 } |
| 638 | 638 |
| 639 } // namespace webrtc | 639 } // namespace webrtc |
| OLD | NEW |