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

chore: bump chromium to 0239d631f03d0111f77b0b98c7765 (master) (#20285)

Browse source
This commit is contained in:
Electron Bot 2019-09-21 10:51:28 -04:00 • committed by Jeremy Apthorp
parent d090b0cd2d
commit 913ec1e0d0
42 changed files with 222 additions and 180 deletions
Download patch file Download diff file Expand all files Collapse all files

2
shell/browser/api/atom_api_session.cc
View file

@ -527,7 +527,7 @@ void Session::DownloadURL(const GURL& url) {
void Session::CreateInterruptedDownload(const mate::Dictionary& options) {
int64_t offset = 0, length = 0;
double start_time = 0.0;
double start_time = base::Time::Now().ToDoubleT();
std::string mime_type, last_modified, etag;
base::FilePath path;
std::vector<GURL> url_chain;

4
shell/browser/api/atom_api_url_request_ns.cc
View file

@ -401,7 +401,7 @@ void URLRequestNS::OnComplete(bool success) {
void URLRequestNS::OnResponseStarted(
const GURL& final_url,
const network::ResourceResponseHead& response_head) {
const network::mojom::URLResponseHead& response_head) {
// Don't emit any event after request cancel.
if (request_state_ & STATE_ERROR)
return;
@ -413,7 +413,7 @@ void URLRequestNS::OnResponseStarted(
void URLRequestNS::OnRedirect(
const net::RedirectInfo& redirect_info,
const network::ResourceResponseHead& response_head,
const network::mojom::URLResponseHead& response_head,
std::vector<std::string>* to_be_removed_headers) {
if (!loader_)
return;

4
shell/browser/api/atom_api_url_request_ns.h
View file

@ -65,9 +65,9 @@ class URLRequestNS : public mate::EventEmitter<URLRequestNS>,
friend class UploadDataPipeGetter;
void OnResponseStarted(const GURL& final_url,
const network::ResourceResponseHead& response_head);
const network::mojom::URLResponseHead& response_head);
void OnRedirect(const net::RedirectInfo& redirect_info,
const network::ResourceResponseHead& response_head,
const network::mojom::URLResponseHead& response_head,
std::vector<std::string>* to_be_removed_headers);
void OnUploadProgress(uint64_t position, uint64_t total);
void OnWrite(MojoResult result);

2
shell/browser/atom_browser_client.cc
View file

@ -1047,7 +1047,7 @@ bool AtomBrowserClient::PreSpawnRenderer(sandbox::TargetPolicy* policy,
}
#endif // defined(OS_WIN)
bool AtomBrowserClient::BindAssociatedInterfaceRequestFromFrame(
bool AtomBrowserClient::BindAssociatedReceiverFromFrame(
content::RenderFrameHost* render_frame_host,
const std::string& interface_name,
mojo::ScopedInterfaceEndpointHandle* handle) {

2
shell/browser/atom_browser_client.h
View file

@ -191,7 +191,7 @@ class AtomBrowserClient : public content::ContentBrowserClient,
bool PreSpawnRenderer(sandbox::TargetPolicy* policy,
RendererSpawnFlags flags) override;
#endif
bool BindAssociatedInterfaceRequestFromFrame(
bool BindAssociatedReceiverFromFrame(
content::RenderFrameHost* render_frame_host,
const std::string& interface_name,
mojo::ScopedInterfaceEndpointHandle* handle) override;

1
shell/browser/atom_download_manager_delegate.cc
View file

@ -90,6 +90,7 @@ void AtomDownloadManagerDelegate::OnDownloadPathGenerated(
const content::DownloadTargetCallback& callback,
const base::FilePath& default_path) {
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
base::ThreadRestrictions::ScopedAllowIO allow_io;
auto* item = download_manager_->GetDownload(download_id);
if (!item)

4
shell/browser/net/url_pipe_loader.cc
View file

@ -59,7 +59,7 @@ void URLPipeLoader::NotifyComplete(int result) {
void URLPipeLoader::OnResponseStarted(
const GURL& final_url,
const network::ResourceResponseHead& response_head) {
const network::mojom::URLResponseHead& response_head) {
mojo::ScopedDataPipeProducerHandle producer;
mojo::ScopedDataPipeConsumerHandle consumer;
MojoResult rv = mojo::CreateDataPipe(nullptr, &producer, &consumer);
@ -70,7 +70,7 @@ void URLPipeLoader::OnResponseStarted(
producer_ = std::make_unique<mojo::DataPipeProducer>(std::move(producer));
client_->OnReceiveResponse(response_head);
client_->OnReceiveResponse(response_head.Clone());
client_->OnStartLoadingResponseBody(std::move(consumer));
}

2
shell/browser/net/url_pipe_loader.h
View file

@ -47,7 +47,7 @@ class URLPipeLoader : public network::mojom::URLLoader,
base::DictionaryValue upload_data);
void NotifyComplete(int result);
void OnResponseStarted(const GURL& final_url,
const network::ResourceResponseHead& response_head);
const network::mojom::URLResponseHead& response_head);
void OnWrite(base::OnceClosure resume, MojoResult result);
// SimpleURLLoaderStreamConsumer:

2
shell/browser/ui/inspectable_web_contents_impl.cc
View file

@ -173,7 +173,7 @@ class InspectableWebContentsImpl::NetworkResourceLoader
private:
void OnResponseStarted(const GURL& final_url,
const network::ResourceResponseHead& response_head) {
const network::mojom::URLResponseHead& response_head) {
response_headers_ = response_head.headers;
}