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

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

Issue 769423005: Support WebSocket per-message deflate extension in http server. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix iOS build Created 6 years 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 | « no previous file | net/BUILD.gn » ('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 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"
11 #include "net/base/net_errors.h" 11 #include "net/base/net_errors.h"
12 #include "net/server/web_socket.h" 12 #include "net/server/web_socket_encoder.h"
13 #include "net/socket/stream_socket.h" 13 #include "net/socket/stream_socket.h"
14 14
15 using content::BrowserThread; 15 using content::BrowserThread;
16 using net::WebSocket; 16 using net::WebSocket;
17 17
18 namespace { 18 namespace {
19 19
20 const int kBufferSize = 16 * 1024; 20 const int kBufferSize = 16 * 1024;
21 21
22 } // namespace 22 } // namespace
23 23
24 class AndroidDeviceManager::AndroidWebSocket::WebSocketImpl { 24 class AndroidDeviceManager::AndroidWebSocket::WebSocketImpl {
25 public: 25 public:
26 WebSocketImpl(scoped_refptr<base::MessageLoopProxy> response_message_loop, 26 WebSocketImpl(scoped_refptr<base::MessageLoopProxy> response_message_loop,
27 base::WeakPtr<AndroidWebSocket> weak_socket, 27 base::WeakPtr<AndroidWebSocket> weak_socket,
28 scoped_ptr<net::StreamSocket> socket) 28 scoped_ptr<net::StreamSocket> socket)
29 : response_message_loop_(response_message_loop), 29 : response_message_loop_(response_message_loop),
30 weak_socket_(weak_socket), 30 weak_socket_(weak_socket),
31 socket_(socket.Pass()) { 31 socket_(socket.Pass()),
32 encoder_(net::WebSocketEncoder::CreateClient(std::string())) {
32 thread_checker_.DetachFromThread(); 33 thread_checker_.DetachFromThread();
33 } 34 }
34 35
35 void StartListening() { 36 void StartListening() {
36 DCHECK(thread_checker_.CalledOnValidThread()); 37 DCHECK(thread_checker_.CalledOnValidThread());
37 DCHECK(socket_); 38 DCHECK(socket_);
38 scoped_refptr<net::IOBuffer> buffer(new net::IOBuffer(kBufferSize)); 39 scoped_refptr<net::IOBuffer> buffer(new net::IOBuffer(kBufferSize));
39 Read(buffer); 40 Read(buffer);
40 } 41 }
41 42
42 void SendFrame(const std::string& message) { 43 void SendFrame(const std::string& message) {
43 DCHECK(thread_checker_.CalledOnValidThread()); 44 DCHECK(thread_checker_.CalledOnValidThread());
44 if (!socket_) 45 if (!socket_)
45 return; 46 return;
46 int mask = base::RandInt(0, 0x7FFFFFFF); 47 int mask = base::RandInt(0, 0x7FFFFFFF);
47 std::string encoded_frame = WebSocket::EncodeFrameHybi17(message, mask); 48 std::string encoded_frame;
49 encoder_->EncodeFrame(message, mask, &encoded_frame);
48 request_buffer_ += encoded_frame; 50 request_buffer_ += encoded_frame;
49 if (request_buffer_.length() == encoded_frame.length()) 51 if (request_buffer_.length() == encoded_frame.length())
50 SendPendingRequests(0); 52 SendPendingRequests(0);
51 } 53 }
52 54
53 private: 55 private:
54 void Read(scoped_refptr<net::IOBuffer> response_buffer) { 56 void Read(scoped_refptr<net::IOBuffer> response_buffer) {
55 int result = socket_->Read( 57 int result = socket_->Read(
56 response_buffer.get(), 58 response_buffer.get(),
57 kBufferSize, 59 kBufferSize,
58 base::Bind(&WebSocketImpl::OnBytesRead, 60 base::Bind(&WebSocketImpl::OnBytesRead,
59 base::Unretained(this), response_buffer)); 61 base::Unretained(this), response_buffer));
60 if (result != net::ERR_IO_PENDING) 62 if (result != net::ERR_IO_PENDING)
61 OnBytesRead(response_buffer, result); 63 OnBytesRead(response_buffer, result);
62 } 64 }
63 65
64 void OnBytesRead(scoped_refptr<net::IOBuffer> response_buffer, int result) { 66 void OnBytesRead(scoped_refptr<net::IOBuffer> response_buffer, int result) {
65 DCHECK(thread_checker_.CalledOnValidThread()); 67 DCHECK(thread_checker_.CalledOnValidThread());
66 if (result <= 0) { 68 if (result <= 0) {
67 Disconnect(); 69 Disconnect();
68 return; 70 return;
69 } 71 }
70 response_buffer_.append(response_buffer->data(), result); 72 response_buffer_.append(response_buffer->data(), result);
71 73
72 int bytes_consumed; 74 int bytes_consumed;
73 std::string output; 75 std::string output;
74 WebSocket::ParseResult parse_result = WebSocket::DecodeFrameHybi17( 76 WebSocket::ParseResult parse_result = encoder_->DecodeFrame(
75 response_buffer_, false, &bytes_consumed, &output); 77 response_buffer_, &bytes_consumed, &output);
76 78
77 while (parse_result == WebSocket::FRAME_OK) { 79 while (parse_result == WebSocket::FRAME_OK) {
78 response_buffer_ = response_buffer_.substr(bytes_consumed); 80 response_buffer_ = response_buffer_.substr(bytes_consumed);
79 response_message_loop_->PostTask( 81 response_message_loop_->PostTask(
80 FROM_HERE, 82 FROM_HERE,
81 base::Bind(&AndroidWebSocket::OnFrameRead, weak_socket_, output)); 83 base::Bind(&AndroidWebSocket::OnFrameRead, weak_socket_, output));
82 parse_result = WebSocket::DecodeFrameHybi17( 84 parse_result = encoder_->DecodeFrame(
83 response_buffer_, false, &bytes_consumed, &output); 85 response_buffer_, &bytes_consumed, &output);
84 } 86 }
85 87
86 if (parse_result == WebSocket::FRAME_ERROR || 88 if (parse_result == WebSocket::FRAME_ERROR ||
87 parse_result == WebSocket::FRAME_CLOSE) { 89 parse_result == WebSocket::FRAME_CLOSE) {
88 Disconnect(); 90 Disconnect();
89 return; 91 return;
90 } 92 }
91 Read(response_buffer); 93 Read(response_buffer);
92 } 94 }
93 95
(...skipping 20 matching lines...) Expand all
114 DCHECK(thread_checker_.CalledOnValidThread()); 116 DCHECK(thread_checker_.CalledOnValidThread());
115 socket_.reset(); 117 socket_.reset();
116 response_message_loop_->PostTask( 118 response_message_loop_->PostTask(
117 FROM_HERE, 119 FROM_HERE,
118 base::Bind(&AndroidWebSocket::OnSocketClosed, weak_socket_)); 120 base::Bind(&AndroidWebSocket::OnSocketClosed, weak_socket_));
119 } 121 }
120 122
121 scoped_refptr<base::MessageLoopProxy> response_message_loop_; 123 scoped_refptr<base::MessageLoopProxy> response_message_loop_;
122 base::WeakPtr<AndroidWebSocket> weak_socket_; 124 base::WeakPtr<AndroidWebSocket> weak_socket_;
123 scoped_ptr<net::StreamSocket> socket_; 125 scoped_ptr<net::StreamSocket> socket_;
126 scoped_ptr<net::WebSocketEncoder> encoder_;
124 std::string response_buffer_; 127 std::string response_buffer_;
125 std::string request_buffer_; 128 std::string request_buffer_;
126 base::ThreadChecker thread_checker_; 129 base::ThreadChecker thread_checker_;
127 DISALLOW_COPY_AND_ASSIGN(WebSocketImpl); 130 DISALLOW_COPY_AND_ASSIGN(WebSocketImpl);
128 }; 131 };
129 132
130 AndroidDeviceManager::AndroidWebSocket::AndroidWebSocket( 133 AndroidDeviceManager::AndroidWebSocket::AndroidWebSocket(
131 scoped_refptr<Device> device, 134 scoped_refptr<Device> device,
132 const std::string& socket_name, 135 const std::string& socket_name,
133 const std::string& url, 136 const std::string& url,
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
204 } 207 }
205 } 208 }
206 209
207 AndroidDeviceManager::AndroidWebSocket* 210 AndroidDeviceManager::AndroidWebSocket*
208 AndroidDeviceManager::Device::CreateWebSocket( 211 AndroidDeviceManager::Device::CreateWebSocket(
209 const std::string& socket_name, 212 const std::string& socket_name,
210 const std::string& url, 213 const std::string& url,
211 AndroidWebSocket::Delegate* delegate) { 214 AndroidWebSocket::Delegate* delegate) {
212 return new AndroidWebSocket(this, socket_name, url, delegate); 215 return new AndroidWebSocket(this, socket_name, url, delegate);
213 } 216 }
OLDNEW
« no previous file with comments | « no previous file | net/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698