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

Update DevToolsNetworkUploadDataStream

Browse source
This commit is contained in:
Cheng Zhao 2017-01-23 15:18:52 +09:00
parent 70ffec1134
commit db7959619e
3 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -103,10 +103,9 @@ bool DevToolsNetworkTransaction::CheckFailed() {
return false; return false;
} }
int DevToolsNetworkTransaction::Start( int DevToolsNetworkTransaction::Start(const net::HttpRequestInfo* request,
const net::HttpRequestInfo* request,
const net::CompletionCallback& callback, const net::CompletionCallback& callback,
const net::BoundNe& net_log) { const net::NetLogWithSource& net_log) {
DCHECK(request); DCHECK(request);
request_ = request; request_ = request;
@ -141,9 +140,9 @@ int DevToolsNetworkTransaction::Start(
return net::ERR_INTERNET_DISCONNECTED; return net::ERR_INTERNET_DISCONNECTED;
if (!interceptor_) if (!interceptor_)
return network_transaction_->Start(request_, callback, net_log); return transaction_->Start(request_, callback, net_log);
int result = network_transaction_->Start(request_, int result = 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);

6
brightray/browser/net/devtools_network_upload_data_stream.cc
View file

@ -35,11 +35,13 @@ bool DevToolsNetworkUploadDataStream::IsInMemory() const {
return false; return false;
} }
int DevToolsNetworkUploadDataStream::InitInternal(const net::BoundNetLog& net_log) { int DevToolsNetworkUploadDataStream::InitInternal(
const net::NetLogWithSource& net_log) {
throttled_byte_count_ = 0; throttled_byte_count_ = 0;
int result = upload_data_stream_->Init( int result = upload_data_stream_->Init(
base::Bind(&DevToolsNetworkUploadDataStream::StreamInitCallback, base::Bind(&DevToolsNetworkUploadDataStream::StreamInitCallback,
base::Unretained(this)), net_log); base::Unretained(this)),
net_log);
if (result == net::OK && !is_chunked()) if (result == net::OK && !is_chunked())
SetSize(upload_data_stream_->size()); SetSize(upload_data_stream_->size());
return result; return result;

2
brightray/browser/net/devtools_network_upload_data_stream.h
View file

@ -27,7 +27,7 @@ class DevToolsNetworkUploadDataStream : public net::UploadDataStream {
private: private:
// net::UploadDataStream implementation. // net::UploadDataStream implementation.
bool IsInMemory() const override; bool IsInMemory() const override;
int InitInternal(const net::BoundNetLog& net_log) override; int InitInternal(const net::NetLogWithSource& net_log) override;
int ReadInternal(net::IOBuffer* buf, int buf_len) override; int ReadInternal(net::IOBuffer* buf, int buf_len) override;
void ResetInternal() override; void ResetInternal() override;