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

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

Issue 497223003: Revert of Replace StreamListenSocket with StreamSocket in HttpServer. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 4 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 181 matching lines...) Expand 10 before | Expand all | Expand 10 after
192 } 192 }
193 193
194 void WebSocketImpl::OnBytesRead(scoped_refptr<net::IOBuffer> response_buffer, 194 void WebSocketImpl::OnBytesRead(scoped_refptr<net::IOBuffer> response_buffer,
195 int result) { 195 int result) {
196 DCHECK(thread_checker_.CalledOnValidThread()); 196 DCHECK(thread_checker_.CalledOnValidThread());
197 if (result <= 0) { 197 if (result <= 0) {
198 Disconnect(); 198 Disconnect();
199 return; 199 return;
200 } 200 }
201 201
202 response_buffer_.append(response_buffer->data(), result); 202 std::string data = std::string(response_buffer->data(), result);
203 response_buffer_ += data;
203 204
204 int bytes_consumed; 205 int bytes_consumed;
205 std::string output; 206 std::string output;
206 WebSocket::ParseResult parse_result = WebSocket::DecodeFrameHybi17( 207 WebSocket::ParseResult parse_result = WebSocket::DecodeFrameHybi17(
207 response_buffer_, false, &bytes_consumed, &output); 208 response_buffer_, false, &bytes_consumed, &output);
208 209
209 while (parse_result == WebSocket::FRAME_OK) { 210 while (parse_result == WebSocket::FRAME_OK) {
210 response_buffer_ = response_buffer_.substr(bytes_consumed); 211 response_buffer_ = response_buffer_.substr(bytes_consumed);
211 delegate_->OnFrameRead(output); 212 delegate_->OnFrameRead(output);
212 parse_result = WebSocket::DecodeFrameHybi17( 213 parse_result = WebSocket::DecodeFrameHybi17(
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
271 } // namespace 272 } // namespace
272 273
273 AndroidDeviceManager::AndroidWebSocket* 274 AndroidDeviceManager::AndroidWebSocket*
274 AndroidDeviceManager::Device::CreateWebSocket( 275 AndroidDeviceManager::Device::CreateWebSocket(
275 const std::string& socket, 276 const std::string& socket,
276 const std::string& url, 277 const std::string& url,
277 AndroidDeviceManager::AndroidWebSocket::Delegate* delegate) { 278 AndroidDeviceManager::AndroidWebSocket::Delegate* delegate) {
278 return new AndroidWebSocketImpl( 279 return new AndroidWebSocketImpl(
279 device_message_loop_, this, socket, url, delegate); 280 device_message_loop_, this, socket, url, delegate);
280 } 281 }
OLDNEW
« no previous file with comments | « chrome/browser/android/dev_tools_server.cc ('k') | chrome/browser/devtools/remote_debugging_server.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698