mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update DevToolsNetworkTransaction

Browse source
This commit is contained in:
Cheng Zhao 2017-01-23 15:10:34 +09:00
parent e7ee9f1be9
commit 0236f87507
2 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
brightray/browser/net/devtools_network_transaction.cc
View file

@ -106,7 +106,7 @@ bool DevToolsNetworkTransaction::CheckFailed() {
int DevToolsNetworkTransaction::Start( int DevToolsNetworkTransaction::Start(
const net::HttpRequestInfo* request, const net::HttpRequestInfo* request,
const net::CompletionCallback& callback, const net::CompletionCallback& callback,
const net::BoundNetLog& net_log) { const net::BoundNe& net_log) {
DCHECK(request); DCHECK(request);
request_ = request; request_ = request;
@ -129,7 +129,8 @@ int DevToolsNetworkTransaction::Start(
request_ = custom_request_.get(); request_ = custom_request_.get();
} }
DevToolsNetworkInterceptor* interceptor = controller_->GetInterceptor(client_id); DevToolsNetworkInterceptor* interceptor =
controller_->GetInterceptor(client_id);
if (interceptor) { if (interceptor) {
interceptor_ = interceptor->GetWeakPtr(); interceptor_ = interceptor->GetWeakPtr();
if (custom_upload_data_stream_) if (custom_upload_data_stream_)
@ -140,9 +141,9 @@ int DevToolsNetworkTransaction::Start(
return net::ERR_INTERNET_DISCONNECTED; return net::ERR_INTERNET_DISCONNECTED;
if (!interceptor_) if (!interceptor_)
return transaction_->Start(request_, callback, net_log); return network_transaction_->Start(request_, callback, net_log);
int result = transaction_->Start(request_, int result = network_transaction_->Start(request_,
base::Bind(&DevToolsNetworkTransaction::IOCallback, base::Bind(&DevToolsNetworkTransaction::IOCallback,
base::Unretained(this), callback, true), base::Unretained(this), callback, true),
net_log); net_log);
@ -246,10 +247,6 @@ net::LoadState DevToolsNetworkTransaction::GetLoadState() const {
return transaction_->GetLoadState(); return transaction_->GetLoadState();
} }
net::UploadProgress DevToolsNetworkTransaction::GetUploadProgress() const {
return transaction_->GetUploadProgress();
}
void DevToolsNetworkTransaction::SetQuicServerInfo( void DevToolsNetworkTransaction::SetQuicServerInfo(
net::QuicServerInfo* info) { net::QuicServerInfo* info) {
transaction_->SetQuicServerInfo(info); transaction_->SetQuicServerInfo(info);

3
brightray/browser/net/devtools_network_transaction.h
View file

@ -32,7 +32,7 @@ class DevToolsNetworkTransaction : public net::HttpTransaction {
// HttpTransaction methods: // HttpTransaction methods:
int Start(const net::HttpRequestInfo* request, int Start(const net::HttpRequestInfo* request,
const net::CompletionCallback& callback, const net::CompletionCallback& callback,
const net::BoundNetLog& net_log) override; const net::NetLogWithSource& net_log) override;
int RestartIgnoringLastError( int RestartIgnoringLastError(
const net::CompletionCallback& callback) override; const net::CompletionCallback& callback) override;
int RestartWithCertificate(net::X509Certificate* client_cert, int RestartWithCertificate(net::X509Certificate* client_cert,
@ -52,7 +52,6 @@ class DevToolsNetworkTransaction : public net::HttpTransaction {
void DoneReading() override; void DoneReading() override;
const net::HttpResponseInfo* GetResponseInfo() const override; const net::HttpResponseInfo* GetResponseInfo() const override;
net::LoadState GetLoadState() const override; net::LoadState GetLoadState() const override;
net::UploadProgress GetUploadProgress() const override;
void SetQuicServerInfo(net::QuicServerInfo* quic_server_info) override; void SetQuicServerInfo(net::QuicServerInfo* quic_server_info) override;
bool GetLoadTimingInfo(net::LoadTimingInfo* load_timing_info) const override; bool GetLoadTimingInfo(net::LoadTimingInfo* load_timing_info) const override;
bool GetRemoteEndpoint(net::IPEndPoint* endpoint) const override; bool GetRemoteEndpoint(net::IPEndPoint* endpoint) const override;