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

Fix more API changes due to name changes

Browse source
This commit is contained in:
Cheng Zhao 2017-04-05 18:02:06 +09:00
parent 50e3bfa764
commit 6be10ffef2
16 changed files with 30 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

2
atom/browser/net/asar/url_request_asar_job.cc
View file

@ -185,7 +185,7 @@ std::unique_ptr<net::SourceStream> URLRequestAsarJob::SetUpSourceStream() {
// Bug 9936 - .svgz files needs to be decompressed.
return base::LowerCaseEqualsASCII(file_path_.Extension(), ".svgz")
? net::GzipSourceStream::Create(std::move(source),
net::SourceStream::Type::GZIP)
net::SourceStream::TYPE_GZIP)
: std::move(source);
}

7
atom/browser/net/atom_url_request_job_factory.cc
View file

@ -50,7 +50,7 @@ bool AtomURLRequestJobFactory::InterceptProtocol(
return false;
ProtocolHandler* original_protocol_handler = protocol_handler_map_[scheme];
protocol_handler_map_[scheme] = protocol_handler.release();
original_protocols_[scheme] = std::move(original_protocol_handler);
original_protocols_[scheme].reset(original_protocol_handler);
return true;
}
@ -58,7 +58,7 @@ bool AtomURLRequestJobFactory::UninterceptProtocol(const std::string& scheme) {
auto it = original_protocols_.find(scheme);
if (it == original_protocols_.end())
return false;
protocol_handler_map_[scheme] = std::move(it->second);
protocol_handler_map_[scheme] = it->second.release();
original_protocols_.erase(it);
return true;
}
@ -79,7 +79,8 @@ bool AtomURLRequestJobFactory::HasProtocolHandler(
}
void AtomURLRequestJobFactory::Clear() {
base::STLDeleteValues(&protocol_handler_map_);
for (auto& it : protocol_handler_map_)
delete it.second;
}
net::URLRequestJob* AtomURLRequestJobFactory::MaybeCreateJobWithProtocolHandler(

1
atom/browser/net/url_request_async_asar_job.cc
View file

@ -7,6 +7,7 @@
#include <string>
#include "atom/common/atom_constants.h"
#include "base/threading/sequenced_worker_pool.h"
namespace atom {