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

Side by Side Diff: remoting/protocol/buffered_socket_writer.cc

Issue 810133003: replace NULL->nullptr in src/remoting. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 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
« no previous file with comments | « remoting/protocol/buffered_socket_writer.h ('k') | remoting/protocol/channel_dispatcher_base.h » ('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 "remoting/protocol/buffered_socket_writer.h" 5 #include "remoting/protocol/buffered_socket_writer.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/location.h" 8 #include "base/location.h"
9 #include "base/single_thread_task_runner.h" 9 #include "base/single_thread_task_runner.h"
10 #include "base/stl_util.h" 10 #include "base/stl_util.h"
11 #include "base/thread_task_runner_handle.h" 11 #include "base/thread_task_runner_handle.h"
12 #include "net/base/net_errors.h" 12 #include "net/base/net_errors.h"
13 13
14 namespace remoting { 14 namespace remoting {
15 namespace protocol { 15 namespace protocol {
16 16
17 struct BufferedSocketWriterBase::PendingPacket { 17 struct BufferedSocketWriterBase::PendingPacket {
18 PendingPacket(scoped_refptr<net::IOBufferWithSize> data, 18 PendingPacket(scoped_refptr<net::IOBufferWithSize> data,
19 const base::Closure& done_task) 19 const base::Closure& done_task)
20 : data(data), 20 : data(data),
21 done_task(done_task) { 21 done_task(done_task) {
22 } 22 }
23 23
24 scoped_refptr<net::IOBufferWithSize> data; 24 scoped_refptr<net::IOBufferWithSize> data;
25 base::Closure done_task; 25 base::Closure done_task;
26 }; 26 };
27 27
28 BufferedSocketWriterBase::BufferedSocketWriterBase() 28 BufferedSocketWriterBase::BufferedSocketWriterBase()
29 : buffer_size_(0), 29 : buffer_size_(0),
30 socket_(NULL), 30 socket_(nullptr),
31 write_pending_(false), 31 write_pending_(false),
32 closed_(false), 32 closed_(false),
33 destroyed_flag_(NULL) { 33 destroyed_flag_(nullptr) {
34 } 34 }
35 35
36 void BufferedSocketWriterBase::Init(net::Socket* socket, 36 void BufferedSocketWriterBase::Init(net::Socket* socket,
37 const WriteFailedCallback& callback) { 37 const WriteFailedCallback& callback) {
38 DCHECK(CalledOnValidThread()); 38 DCHECK(CalledOnValidThread());
39 DCHECK(socket); 39 DCHECK(socket);
40 socket_ = socket; 40 socket_ = socket;
41 write_failed_callback_ = callback; 41 write_failed_callback_ = callback;
42 } 42 }
43 43
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 108
109 base::Closure done_task = AdvanceBufferPosition(result); 109 base::Closure done_task = AdvanceBufferPosition(result);
110 if (!done_task.is_null()) { 110 if (!done_task.is_null()) {
111 bool destroyed = false; 111 bool destroyed = false;
112 destroyed_flag_ = &destroyed; 112 destroyed_flag_ = &destroyed;
113 done_task.Run(); 113 done_task.Run();
114 if (destroyed) { 114 if (destroyed) {
115 // Stop doing anything if we've been destroyed by the callback. 115 // Stop doing anything if we've been destroyed by the callback.
116 return; 116 return;
117 } 117 }
118 destroyed_flag_ = NULL; 118 destroyed_flag_ = nullptr;
119 } 119 }
120 120
121 *write_again = true; 121 *write_again = true;
122 } 122 }
123 123
124 void BufferedSocketWriterBase::OnWritten(int result) { 124 void BufferedSocketWriterBase::OnWritten(int result) {
125 DCHECK(CalledOnValidThread()); 125 DCHECK(CalledOnValidThread());
126 DCHECK(write_pending_); 126 DCHECK(write_pending_);
127 write_pending_ = false; 127 write_pending_ = false;
128 128
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
170 return result; 170 return result;
171 } 171 }
172 172
173 BufferedSocketWriter::BufferedSocketWriter() { 173 BufferedSocketWriter::BufferedSocketWriter() {
174 } 174 }
175 175
176 void BufferedSocketWriter::GetNextPacket( 176 void BufferedSocketWriter::GetNextPacket(
177 net::IOBuffer** buffer, int* size) { 177 net::IOBuffer** buffer, int* size) {
178 if (!current_buf_.get()) { 178 if (!current_buf_.get()) {
179 if (queue_.empty()) { 179 if (queue_.empty()) {
180 *buffer = NULL; 180 *buffer = nullptr;
181 return; // Nothing to write. 181 return; // Nothing to write.
182 } 182 }
183 current_buf_ = new net::DrainableIOBuffer(queue_.front()->data.get(), 183 current_buf_ = new net::DrainableIOBuffer(queue_.front()->data.get(),
184 queue_.front()->data->size()); 184 queue_.front()->data->size());
185 } 185 }
186 186
187 *buffer = current_buf_.get(); 187 *buffer = current_buf_.get();
188 *size = current_buf_->BytesRemaining(); 188 *size = current_buf_->BytesRemaining();
189 } 189 }
190 190
191 base::Closure BufferedSocketWriter::AdvanceBufferPosition(int written) { 191 base::Closure BufferedSocketWriter::AdvanceBufferPosition(int written) {
192 buffer_size_ -= written; 192 buffer_size_ -= written;
193 current_buf_->DidConsume(written); 193 current_buf_->DidConsume(written);
194 194
195 if (current_buf_->BytesRemaining() == 0) { 195 if (current_buf_->BytesRemaining() == 0) {
196 current_buf_ = NULL; 196 current_buf_ = nullptr;
197 return PopQueue(); 197 return PopQueue();
198 } 198 }
199 return base::Closure(); 199 return base::Closure();
200 } 200 }
201 201
202 void BufferedSocketWriter::OnError(int result) { 202 void BufferedSocketWriter::OnError(int result) {
203 current_buf_ = NULL; 203 current_buf_ = nullptr;
204 } 204 }
205 205
206 BufferedSocketWriter::~BufferedSocketWriter() { 206 BufferedSocketWriter::~BufferedSocketWriter() {
207 } 207 }
208 208
209 BufferedDatagramWriter::BufferedDatagramWriter() { 209 BufferedDatagramWriter::BufferedDatagramWriter() {
210 } 210 }
211 211
212 void BufferedDatagramWriter::GetNextPacket( 212 void BufferedDatagramWriter::GetNextPacket(
213 net::IOBuffer** buffer, int* size) { 213 net::IOBuffer** buffer, int* size) {
214 if (queue_.empty()) { 214 if (queue_.empty()) {
215 *buffer = NULL; 215 *buffer = nullptr;
216 return; // Nothing to write. 216 return; // Nothing to write.
217 } 217 }
218 *buffer = queue_.front()->data.get(); 218 *buffer = queue_.front()->data.get();
219 *size = queue_.front()->data->size(); 219 *size = queue_.front()->data->size();
220 } 220 }
221 221
222 base::Closure BufferedDatagramWriter::AdvanceBufferPosition(int written) { 222 base::Closure BufferedDatagramWriter::AdvanceBufferPosition(int written) {
223 DCHECK_EQ(written, queue_.front()->data->size()); 223 DCHECK_EQ(written, queue_.front()->data->size());
224 buffer_size_ -= queue_.front()->data->size(); 224 buffer_size_ -= queue_.front()->data->size();
225 return PopQueue(); 225 return PopQueue();
226 } 226 }
227 227
228 void BufferedDatagramWriter::OnError(int result) { 228 void BufferedDatagramWriter::OnError(int result) {
229 // Nothing to do here. 229 // Nothing to do here.
230 } 230 }
231 231
232 BufferedDatagramWriter::~BufferedDatagramWriter() { 232 BufferedDatagramWriter::~BufferedDatagramWriter() {
233 } 233 }
234 234
235 } // namespace protocol 235 } // namespace protocol
236 } // namespace remoting 236 } // namespace remoting
OLDNEW
« no previous file with comments | « remoting/protocol/buffered_socket_writer.h ('k') | remoting/protocol/channel_dispatcher_base.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698