diff options
author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-22 22:00:20 +0000 |
---|---|---|
committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-22 22:01:45 +0000 |
commit | 0b2f33f4a88efbd203b0623324ad4114e3bb9d23 (patch) | |
tree | 351b90382f82c9b895edfa4b9fc03724a1b9c0c5 /chrome/browser/devtools | |
parent | 5bd4f0cd8fed1b3d15aba82e85ae5b57cda390c0 (diff) | |
download | chromium_src-0b2f33f4a88efbd203b0623324ad4114e3bb9d23.zip chromium_src-0b2f33f4a88efbd203b0623324ad4114e3bb9d23.tar.gz chromium_src-0b2f33f4a88efbd203b0623324ad4114e3bb9d23.tar.bz2 |
Revert of Replace StreamListenSocket with StreamSocket in HttpServer. (patchset #29 of https://codereview.chromium.org/296053012/)
Reason for revert:
looks like it caused net_unittests failures: http://build.chromium.org/p/chromium.win/builders/Vista%20Tests%20(2)/builds/44610/steps/net_unittests/logs/MultipleRequestsOnSameConnection
Original issue's description:
> Replace StreamListenSocket with StreamSocket in HttpServer.
>
> 1) HttpServer gets ServerSocket instead of StreamListenSocket.
> 2) HttpConnection is just a container for socket, websocket, and pending read/write buffers.
> 3) HttpServer handles data buffering and asynchronous read/write.
> 4) HttpConnection has limit in data buffering, up to 1Mbytes by default.
> 5) For devtools, send buffer limit is 100Mbytes.
> 6) Unittests for buffer handling in HttpConnection.
>
> BUG=371906
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=291447
NOTREECHECKS=true
NOTRY=true
TBR=rsleevi@chromium.org
Review URL: https://codereview.chromium.org/497223003
Cr-Commit-Position: refs/heads/master@{#291521}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@291521 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/devtools')
-rw-r--r-- | chrome/browser/devtools/device/android_web_socket.cc | 3 | ||||
-rw-r--r-- | chrome/browser/devtools/remote_debugging_server.cc | 27 |
2 files changed, 4 insertions, 26 deletions
diff --git a/chrome/browser/devtools/device/android_web_socket.cc b/chrome/browser/devtools/device/android_web_socket.cc index 2a3886b..a0054da 100644 --- a/chrome/browser/devtools/device/android_web_socket.cc +++ b/chrome/browser/devtools/device/android_web_socket.cc @@ -199,7 +199,8 @@ void WebSocketImpl::OnBytesRead(scoped_refptr<net::IOBuffer> response_buffer, return; } - response_buffer_.append(response_buffer->data(), result); + std::string data = std::string(response_buffer->data(), result); + response_buffer_ += data; int bytes_consumed; std::string output; diff --git a/chrome/browser/devtools/remote_debugging_server.cc b/chrome/browser/devtools/remote_debugging_server.cc index c971a4a..211ff1a 100644 --- a/chrome/browser/devtools/remote_debugging_server.cc +++ b/chrome/browser/devtools/remote_debugging_server.cc @@ -9,28 +9,7 @@ #include "chrome/browser/ui/webui/devtools_ui.h" #include "chrome/common/chrome_paths.h" #include "content/public/browser/devtools_http_handler.h" -#include "net/socket/tcp_server_socket.h" - -namespace { - -class TCPServerSocketFactory - : public content::DevToolsHttpHandler::ServerSocketFactory { - public: - TCPServerSocketFactory(const std::string& address, int port, int backlog) - : content::DevToolsHttpHandler::ServerSocketFactory( - address, port, backlog) {} - - private: - // content::DevToolsHttpHandler::ServerSocketFactory. - virtual scoped_ptr<net::ServerSocket> Create() const OVERRIDE { - return scoped_ptr<net::ServerSocket>( - new net::TCPServerSocket(NULL, net::NetLog::Source())); - } - - DISALLOW_COPY_AND_ASSIGN(TCPServerSocketFactory); -}; - -} // namespace +#include "net/socket/tcp_listen_socket.h" RemoteDebuggingServer::RemoteDebuggingServer( chrome::HostDesktopType host_desktop_type, @@ -45,10 +24,8 @@ RemoteDebuggingServer::RemoteDebuggingServer( DCHECK(result); } - scoped_ptr<content::DevToolsHttpHandler::ServerSocketFactory> factory( - new TCPServerSocketFactory(ip, port, 1)); devtools_http_handler_ = content::DevToolsHttpHandler::Start( - factory.Pass(), + new net::TCPListenSocketFactory(ip, port), "", new BrowserListTabContentsProvider(host_desktop_type), output_dir); |