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

Side by Side Diff: jingle/glue/channel_socket_adapter.cc

Issue 15782010: Update remoting/ and jingle/ to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | jingle/glue/channel_socket_adapter_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "jingle/glue/channel_socket_adapter.h" 5 #include "jingle/glue/channel_socket_adapter.h"
6 6
7 #include <limits> 7 #include <limits>
8 8
9 #include "base/callback.h" 9 #include "base/callback.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
136 } 136 }
137 137
138 void TransportChannelSocketAdapter::OnNewPacket( 138 void TransportChannelSocketAdapter::OnNewPacket(
139 cricket::TransportChannel* channel, 139 cricket::TransportChannel* channel,
140 const char* data, 140 const char* data,
141 size_t data_size, 141 size_t data_size,
142 int flags) { 142 int flags) {
143 DCHECK_EQ(base::MessageLoop::current(), message_loop_); 143 DCHECK_EQ(base::MessageLoop::current(), message_loop_);
144 DCHECK_EQ(channel, channel_); 144 DCHECK_EQ(channel, channel_);
145 if (!read_callback_.is_null()) { 145 if (!read_callback_.is_null()) {
146 DCHECK(read_buffer_); 146 DCHECK(read_buffer_.get());
147 CHECK_LT(data_size, static_cast<size_t>(std::numeric_limits<int>::max())); 147 CHECK_LT(data_size, static_cast<size_t>(std::numeric_limits<int>::max()));
148 148
149 if (read_buffer_size_ < static_cast<int>(data_size)) { 149 if (read_buffer_size_ < static_cast<int>(data_size)) {
150 LOG(WARNING) << "Data buffer is smaller than the received packet. " 150 LOG(WARNING) << "Data buffer is smaller than the received packet. "
151 << "Dropping the data that doesn't fit."; 151 << "Dropping the data that doesn't fit.";
152 data_size = read_buffer_size_; 152 data_size = read_buffer_size_;
153 } 153 }
154 154
155 memcpy(read_buffer_->data(), data, data_size); 155 memcpy(read_buffer_->data(), data, data_size);
156 156
(...skipping 28 matching lines...) Expand all
185 } 185 }
186 186
187 void TransportChannelSocketAdapter::OnChannelDestroyed( 187 void TransportChannelSocketAdapter::OnChannelDestroyed(
188 cricket::TransportChannel* channel) { 188 cricket::TransportChannel* channel) {
189 DCHECK_EQ(base::MessageLoop::current(), message_loop_); 189 DCHECK_EQ(base::MessageLoop::current(), message_loop_);
190 DCHECK_EQ(channel, channel_); 190 DCHECK_EQ(channel, channel_);
191 Close(net::ERR_CONNECTION_ABORTED); 191 Close(net::ERR_CONNECTION_ABORTED);
192 } 192 }
193 193
194 } // namespace jingle_glue 194 } // namespace jingle_glue
OLDNEW
« no previous file with comments | « no previous file | jingle/glue/channel_socket_adapter_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698