Android device manager should not drop WebSocket frame data even if it arrives together with handsh…

chrome/browser/devtools/device/android_web_socket.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/rand_util.h"
 #include "chrome/browser/devtools/device/android_device_manager.h"
 #include "content/public/browser/browser_thread.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
 #include "net/server/web_socket_encoder.h"
 #include "net/socket/stream_socket.h"
 
 using content::BrowserThread;
 using net::WebSocket;
 
 namespace {
 
 const int kBufferSize = 16 * 1024;
 
 }  // namespace
 
 class AndroidDeviceManager::AndroidWebSocket::WebSocketImpl {
  public:
-   WebSocketImpl(scoped_refptr<base::MessageLoopProxy> response_message_loop,
+  WebSocketImpl(scoped_refptr<base::MessageLoopProxy> response_message_loop,
                  base::WeakPtr<AndroidWebSocket> weak_socket,
                  const std::string& extensions,
+                 const std::string& body_head,
                  scoped_ptr<net::StreamSocket> socket)
        : response_message_loop_(response_message_loop),
          weak_socket_(weak_socket),
          socket_(socket.Pass()),
-         encoder_(net::WebSocketEncoder::CreateClient(extensions)) {
+         encoder_(net::WebSocketEncoder::CreateClient(extensions)),
+         response_buffer_(body_head) {
     thread_checker_.DetachFromThread();
   }
 
   void StartListening() {
     DCHECK(thread_checker_.CalledOnValidThread());
     DCHECK(socket_);
+
     scoped_refptr<net::IOBuffer> buffer(new net::IOBuffer(kBufferSize));
-    Read(buffer);
+
+    if (response_buffer_.size() > 0)
+      ProcessResponseBuffer(buffer);
+    else
+      Read(buffer);
   }
 
   void SendFrame(const std::string& message) {
     DCHECK(thread_checker_.CalledOnValidThread());
     if (!socket_)
       return;
     int mask = base::RandInt(0, 0x7FFFFFFF);
     std::string encoded_frame;
     encoder_->EncodeFrame(message, mask, &encoded_frame);
     request_buffer_ += encoded_frame;
     if (request_buffer_.length() == encoded_frame.length())
       SendPendingRequests(0);
   }
 
  private:
-  void Read(scoped_refptr<net::IOBuffer> response_buffer) {
+  void Read(scoped_refptr<net::IOBuffer> response_io_buffer) {
     int result = socket_->Read(
-        response_buffer.get(),
+        response_io_buffer.get(),
         kBufferSize,
         base::Bind(&WebSocketImpl::OnBytesRead,
-                   base::Unretained(this), response_buffer));
+                   base::Unretained(this), response_io_buffer));
     if (result != net::ERR_IO_PENDING)
-      OnBytesRead(response_buffer, result);
+      OnBytesRead(response_io_buffer, result);
   }
 
-  void OnBytesRead(scoped_refptr<net::IOBuffer> response_buffer, int result) {
-    DCHECK(thread_checker_.CalledOnValidThread());
-    if (result <= 0) {
-      Disconnect();
-      return;
-    }
-    response_buffer_.append(response_buffer->data(), result);
-
+  void ProcessResponseBuffer(scoped_refptr<net::IOBuffer> response_io_buffer) {

[dgozman, 2015/04/09 14:05:22]

I'd rename this to |io_buffer| to better differentiate from |response_buffer|.

[tyoshino (SeeGerritForStatus), 2015/04/14 12:24:33]

Done.

     int bytes_consumed;
     std::string output;
     WebSocket::ParseResult parse_result = encoder_->DecodeFrame(
         response_buffer_, &bytes_consumed, &output);
 
     while (parse_result == WebSocket::FRAME_OK) {
       response_buffer_ = response_buffer_.substr(bytes_consumed);
       response_message_loop_->PostTask(
           FROM_HERE,
           base::Bind(&AndroidWebSocket::OnFrameRead, weak_socket_, output));
       parse_result = encoder_->DecodeFrame(
           response_buffer_, &bytes_consumed, &output);
     }
 
     if (parse_result == WebSocket::FRAME_ERROR ||
         parse_result == WebSocket::FRAME_CLOSE) {
       Disconnect();
       return;
     }
-    Read(response_buffer);
+    Read(response_io_buffer);
+  }
+
+  void OnBytesRead(scoped_refptr<net::IOBuffer> response_io_buffer,

[dgozman, 2015/04/09 14:05:22]

nit: mind moving this code back for cleaner diff?

[tyoshino (SeeGerritForStatus), 2015/04/14 12:24:33]

Done.

+                   int result) {
+    DCHECK(thread_checker_.CalledOnValidThread());
+    if (result <= 0) {
+      Disconnect();
+      return;
+    }
+    response_buffer_.append(response_io_buffer->data(), result);
+
+    ProcessResponseBuffer(response_io_buffer);
   }
 
   void SendPendingRequests(int result) {
     DCHECK(thread_checker_.CalledOnValidThread());
     if (result < 0) {
       Disconnect();
       return;
     }
     request_buffer_ = request_buffer_.substr(result);
     if (request_buffer_.empty())
@@ skipping 56 matching lines @@
   DCHECK(device_);
   device_->message_loop_proxy_->PostTask(
       FROM_HERE,
       base::Bind(&WebSocketImpl::SendFrame,
                  base::Unretained(socket_impl_), message));
 }
 
 void AndroidDeviceManager::AndroidWebSocket::Connected(
     int result,
     const std::string& extensions,
+    const std::string& body_head,
     scoped_ptr<net::StreamSocket> socket) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   if (result != net::OK || !socket.get()) {
     OnSocketClosed();
     return;
   }
   socket_impl_ = new WebSocketImpl(base::MessageLoopProxy::current(),
                                    weak_factory_.GetWeakPtr(),
                                    extensions,
+                                   body_head,
                                    socket.Pass());
   device_->message_loop_proxy_->PostTask(
       FROM_HERE,
       base::Bind(&WebSocketImpl::StartListening,
                  base::Unretained(socket_impl_)));
   delegate_->OnSocketOpened();
 }
 
 void AndroidDeviceManager::AndroidWebSocket::OnFrameRead(
     const std::string& message) {
@@ skipping 20 matching lines @@
   }
 }
 
 AndroidDeviceManager::AndroidWebSocket*
 AndroidDeviceManager::Device::CreateWebSocket(
     const std::string& socket_name,
     const std::string& url,
     AndroidWebSocket::Delegate* delegate) {
   return new AndroidWebSocket(this, socket_name, url, delegate);
 }