diff options
| author | Andras Becsi <andras.becsi@digia.com> | 2014-03-18 13:16:26 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-03-20 15:55:39 +0100 |
| commit | 3f0f86b0caed75241fa71c95a5d73bc0164348c5 (patch) | |
| tree | 92b9fb00f2e9e90b0be2262093876d4f43b6cd13 /chromium/net/http/http_stream_factory_impl_request.cc | |
| parent | e90d7c4b152c56919d963987e2503f9909a666d2 (diff) | |
| download | qtwebengine-chromium-3f0f86b0caed75241fa71c95a5d73bc0164348c5.tar.gz | |
Update to new stable branch 1750
This also includes an updated ninja and chromium dependencies
needed on Windows.
Change-Id: Icd597d80ed3fa4425933c9f1334c3c2e31291c42
Reviewed-by: Zoltan Arvai <zarvai@inf.u-szeged.hu>
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Diffstat (limited to 'chromium/net/http/http_stream_factory_impl_request.cc')
| -rw-r--r-- | chromium/net/http/http_stream_factory_impl_request.cc | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/chromium/net/http/http_stream_factory_impl_request.cc b/chromium/net/http/http_stream_factory_impl_request.cc index 57190ed72e7..d731d414b71 100644 --- a/chromium/net/http/http_stream_factory_impl_request.cc +++ b/chromium/net/http/http_stream_factory_impl_request.cc @@ -17,11 +17,13 @@ HttpStreamFactoryImpl::Request::Request( const GURL& url, HttpStreamFactoryImpl* factory, HttpStreamRequest::Delegate* delegate, - WebSocketStreamBase::Factory* websocket_stream_factory, + WebSocketHandshakeStreamBase::CreateHelper* + websocket_handshake_stream_create_helper, const BoundNetLog& net_log) : url_(url), factory_(factory), - websocket_stream_factory_(websocket_stream_factory), + websocket_handshake_stream_create_helper_( + websocket_handshake_stream_create_helper), delegate_(delegate), net_log_(net_log), completed_(false), @@ -110,17 +112,18 @@ void HttpStreamFactoryImpl::Request::OnStreamReady( delegate_->OnStreamReady(used_ssl_config, used_proxy_info, stream); } -void HttpStreamFactoryImpl::Request::OnWebSocketStreamReady( +void HttpStreamFactoryImpl::Request::OnWebSocketHandshakeStreamReady( Job* job, const SSLConfig& used_ssl_config, const ProxyInfo& used_proxy_info, - WebSocketStreamBase* stream) { + WebSocketHandshakeStreamBase* stream) { DCHECK(factory_->for_websockets_); DCHECK(stream); DCHECK(completed_); OnJobSucceeded(job); - delegate_->OnWebSocketStreamReady(used_ssl_config, used_proxy_info, stream); + delegate_->OnWebSocketHandshakeStreamReady( + used_ssl_config, used_proxy_info, stream); } void HttpStreamFactoryImpl::Request::OnStreamFailed( @@ -315,13 +318,13 @@ void HttpStreamFactoryImpl::Request::OnNewSpdySessionReady( // Cache this so we can still use it if the request is deleted. HttpStreamFactoryImpl* factory = factory_; if (factory->for_websockets_) { - DCHECK(websocket_stream_factory_); + DCHECK(websocket_handshake_stream_create_helper_); bool use_relative_url = direct || url().SchemeIs("wss"); - delegate_->OnWebSocketStreamReady( + delegate_->OnWebSocketHandshakeStreamReady( job->server_ssl_config(), job->proxy_info(), - websocket_stream_factory_->CreateSpdyStream(spdy_session, - use_relative_url)); + websocket_handshake_stream_create_helper_->CreateSpdyStream( + spdy_session, use_relative_url)); } else { bool use_relative_url = direct || url().SchemeIs("https"); delegate_->OnStreamReady( |