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

Side by Side Diff: chrome/browser/devtools/device/android_web_socket.cc

Issue 1030263002: favor DCHECK_CURRENTLY_ON for better logs in chrome/browser/devtools (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "base/memory/weak_ptr.h" 5 #include "base/memory/weak_ptr.h"
6 #include "base/message_loop/message_loop.h" 6 #include "base/message_loop/message_loop.h"
7 #include "base/rand_util.h" 7 #include "base/rand_util.h"
8 #include "chrome/browser/devtools/device/android_device_manager.h" 8 #include "chrome/browser/devtools/device/android_device_manager.h"
9 #include "content/public/browser/browser_thread.h" 9 #include "content/public/browser/browser_thread.h"
10 #include "net/base/io_buffer.h" 10 #include "net/base/io_buffer.h"
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 133
134 AndroidDeviceManager::AndroidWebSocket::AndroidWebSocket( 134 AndroidDeviceManager::AndroidWebSocket::AndroidWebSocket(
135 scoped_refptr<Device> device, 135 scoped_refptr<Device> device,
136 const std::string& socket_name, 136 const std::string& socket_name,
137 const std::string& url, 137 const std::string& url,
138 Delegate* delegate) 138 Delegate* delegate)
139 : device_(device.get()), 139 : device_(device.get()),
140 socket_impl_(nullptr), 140 socket_impl_(nullptr),
141 delegate_(delegate), 141 delegate_(delegate),
142 weak_factory_(this) { 142 weak_factory_(this) {
143 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 143 DCHECK_CURRENTLY_ON(BrowserThread::UI);
144 DCHECK(delegate_); 144 DCHECK(delegate_);
145 DCHECK(device_); 145 DCHECK(device_);
146 device_->sockets_.insert(this); 146 device_->sockets_.insert(this);
147 device_->HttpUpgrade( 147 device_->HttpUpgrade(
148 socket_name, url, net::WebSocketEncoder::kClientExtensions, 148 socket_name, url, net::WebSocketEncoder::kClientExtensions,
149 base::Bind(&AndroidWebSocket::Connected, weak_factory_.GetWeakPtr())); 149 base::Bind(&AndroidWebSocket::Connected, weak_factory_.GetWeakPtr()));
150 } 150 }
151 151
152 AndroidDeviceManager::AndroidWebSocket::~AndroidWebSocket() { 152 AndroidDeviceManager::AndroidWebSocket::~AndroidWebSocket() {
153 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 153 DCHECK_CURRENTLY_ON(BrowserThread::UI);
154 Terminate(); 154 Terminate();
155 } 155 }
156 156
157 void AndroidDeviceManager::AndroidWebSocket::SendFrame( 157 void AndroidDeviceManager::AndroidWebSocket::SendFrame(
158 const std::string& message) { 158 const std::string& message) {
159 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 159 DCHECK_CURRENTLY_ON(BrowserThread::UI);
160 DCHECK(socket_impl_); 160 DCHECK(socket_impl_);
161 DCHECK(device_); 161 DCHECK(device_);
162 device_->message_loop_proxy_->PostTask( 162 device_->message_loop_proxy_->PostTask(
163 FROM_HERE, 163 FROM_HERE,
164 base::Bind(&WebSocketImpl::SendFrame, 164 base::Bind(&WebSocketImpl::SendFrame,
165 base::Unretained(socket_impl_), message)); 165 base::Unretained(socket_impl_), message));
166 } 166 }
167 167
168 void AndroidDeviceManager::AndroidWebSocket::Connected( 168 void AndroidDeviceManager::AndroidWebSocket::Connected(
169 int result, 169 int result,
170 const std::string& extensions, 170 const std::string& extensions,
171 scoped_ptr<net::StreamSocket> socket) { 171 scoped_ptr<net::StreamSocket> socket) {
172 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 172 DCHECK_CURRENTLY_ON(BrowserThread::UI);
173 if (result != net::OK || !socket.get()) { 173 if (result != net::OK || !socket.get()) {
174 OnSocketClosed(); 174 OnSocketClosed();
175 return; 175 return;
176 } 176 }
177 socket_impl_ = new WebSocketImpl(base::MessageLoopProxy::current(), 177 socket_impl_ = new WebSocketImpl(base::MessageLoopProxy::current(),
178 weak_factory_.GetWeakPtr(), 178 weak_factory_.GetWeakPtr(),
179 extensions, 179 extensions,
180 socket.Pass()); 180 socket.Pass());
181 device_->message_loop_proxy_->PostTask( 181 device_->message_loop_proxy_->PostTask(
182 FROM_HERE, 182 FROM_HERE,
183 base::Bind(&WebSocketImpl::StartListening, 183 base::Bind(&WebSocketImpl::StartListening,
184 base::Unretained(socket_impl_))); 184 base::Unretained(socket_impl_)));
185 delegate_->OnSocketOpened(); 185 delegate_->OnSocketOpened();
186 } 186 }
187 187
188 void AndroidDeviceManager::AndroidWebSocket::OnFrameRead( 188 void AndroidDeviceManager::AndroidWebSocket::OnFrameRead(
189 const std::string& message) { 189 const std::string& message) {
190 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 190 DCHECK_CURRENTLY_ON(BrowserThread::UI);
191 delegate_->OnFrameRead(message); 191 delegate_->OnFrameRead(message);
192 } 192 }
193 193
194 void AndroidDeviceManager::AndroidWebSocket::OnSocketClosed() { 194 void AndroidDeviceManager::AndroidWebSocket::OnSocketClosed() {
195 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 195 DCHECK_CURRENTLY_ON(BrowserThread::UI);
196 Terminate(); 196 Terminate();
197 delegate_->OnSocketClosed(); 197 delegate_->OnSocketClosed();
198 } 198 }
199 199
200 void AndroidDeviceManager::AndroidWebSocket::Terminate() { 200 void AndroidDeviceManager::AndroidWebSocket::Terminate() {
201 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 201 DCHECK_CURRENTLY_ON(BrowserThread::UI);
202 if (socket_impl_) { 202 if (socket_impl_) {
203 DCHECK(device_); 203 DCHECK(device_);
204 device_->message_loop_proxy_->DeleteSoon(FROM_HERE, socket_impl_); 204 device_->message_loop_proxy_->DeleteSoon(FROM_HERE, socket_impl_);
205 socket_impl_ = nullptr; 205 socket_impl_ = nullptr;
206 } 206 }
207 if (device_) { 207 if (device_) {
208 device_->sockets_.erase(this); 208 device_->sockets_.erase(this);
209 device_ = nullptr; 209 device_ = nullptr;
210 } 210 }
211 } 211 }
212 212
213 AndroidDeviceManager::AndroidWebSocket* 213 AndroidDeviceManager::AndroidWebSocket*
214 AndroidDeviceManager::Device::CreateWebSocket( 214 AndroidDeviceManager::Device::CreateWebSocket(
215 const std::string& socket_name, 215 const std::string& socket_name,
216 const std::string& url, 216 const std::string& url,
217 AndroidWebSocket::Delegate* delegate) { 217 AndroidWebSocket::Delegate* delegate) {
218 return new AndroidWebSocket(this, socket_name, url, delegate); 218 return new AndroidWebSocket(this, socket_name, url, delegate);
219 } 219 }
OLDNEW
« no previous file with comments | « chrome/browser/devtools/device/android_device_manager.cc ('k') | chrome/browser/devtools/device/devtools_android_bridge.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698