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

chore: bump chromium to 90.0.4415.0 (master) (#27694)

Browse source 
* chore: bump chromium in DEPS to 520c02b46668fc608927e0fcd79b6a90885a48bf

* chore: bump chromium in DEPS to 90.0.4414.0

* resolve chromium conflicts

* resolve v8 conflicts

* fix node gn files

* 2673502: Remove RenderViewCreated use from ExtensionHost.

2673502

* 2676903: [mojo] Remove most legacy Binding classes.

2676903

* 2644847: Move self-deleting URLLoaderFactory base into //services/network.

2644847

* 2664006: Remove from mojo::DataPipe.

2664006

* 2674530: Remove CertVerifierService feature

2674530

* 2668748: Move OnSSLCertificateError to a new interface.

2668748

* 2672923: Remove RAPPOR reporting infrastructure.

2672923

* 2673502: Remove RenderViewCreated use from ExtensionHost.

2673502

* 2655126: Convert FrameHostMsg_ContextMenu and FrameMsg_ContextMenuClosed|CustomContextMenuAction to Mojo

2655126

* 2628705: Window Placement: Implement screen.isExtended and change event

2628705

* 2643161: Refactor storage::kFileSystem*Native*

2643161

* fix build

* only remove the biggest subdir of //ios

* chore: bump chromium in DEPS to 90.0.4415.0

* update patches

* update sysroots

* 2686147: Remove WebContentsObserver::RenderViewCreated().

2686147

* 2596429: Fixing how extension's split and spanning modes affect OriginAccessList.

2596429

* 2686026: [mojo] Delete AssociatedInterfacePtr (replaced by AssociatedRemote)

2686026

* 2651705: Move ui/base/dragdrop/file_info to ui/base/clipboard

2651705

* 358217: drawBitmap is deprecated

https://skia-review.googlesource.com/c/skia/+/358217

* fix gn check

* 2678098: Use gen/front_end as input to generate_devtools_grd

2678098

* 2674530: Remove CertVerifierService feature

2674530

* fixup 2664006: Remove from mojo::DataPipe.

  2664006

* fixup build_add_electron_tracing_category.patch

* 2673415: [base] Prepare CrashReporterClient for string16 switch

2673415

* 2673413: Add CursorFactoryWin to handle Cursors on Windows

2673413

* 2668748: Move OnSSLCertificateError to a new interface.

2668748

* fix mas gn check

* update patch after merge

* Update node for .mjs files

* build: load v8_prof_processor dependencies as ESM

* chore: add patch to fix linux 32bit

Co-authored-by: Jeremy Rose <nornagon@nornagon.net>
Co-authored-by: Jeremy Rose <jeremya@chromium.org>
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
Co-authored-by: Samuel Attard <samuel.r.attard@gmail.com>
This commit is contained in:
Electron Bot 2021-03-04 09:27:05 -08:00 • committed by GitHub
parent 0b042d3b1c
commit ca75bca667
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
119 changed files with 746 additions and 633 deletions
Download patch file Download diff file Expand all files Collapse all files

18
shell/browser/net/asar/asar_url_loader.cc
View file

@ -135,8 +135,10 @@ class AsarURLLoader : public network::mojom::URLLoader {
info.offset = 0;
}
mojo::DataPipe pipe(kDefaultFileUrlPipeSize);
if (!pipe.consumer_handle.is_valid()) {
mojo::ScopedDataPipeProducerHandle producer_handle;
mojo::ScopedDataPipeConsumerHandle consumer_handle;
if (mojo::CreateDataPipe(kDefaultFileUrlPipeSize, producer_handle,
consumer_handle) != MOJO_RESULT_OK) {
OnClientComplete(net::ERR_FAILED);
return;
}
@ -201,9 +203,9 @@ class AsarURLLoader : public network::mojom::URLLoader {
static_cast<uint32_t>(read_result.bytes_read - first_byte_to_send),
static_cast<uint32_t>(total_bytes_to_send));
const uint32_t expected_write_size = write_size;
MojoResult result = pipe.producer_handle->WriteData(
&initial_read_buffer[first_byte_to_send], &write_size,
MOJO_WRITE_DATA_FLAG_NONE);
MojoResult result =
producer_handle->WriteData(&initial_read_buffer[first_byte_to_send],
&write_size, MOJO_WRITE_DATA_FLAG_NONE);
if (result != MOJO_RESULT_OK || write_size != expected_write_size) {
OnFileWritten(result);
return;
@ -228,7 +230,7 @@ class AsarURLLoader : public network::mojom::URLLoader {
head->mime_type.c_str());
}
client_->OnReceiveResponse(std::move(head));
client_->OnStartLoadingResponseBody(std::move(pipe.consumer_handle));
client_->OnStartLoadingResponseBody(std::move(consumer_handle));
if (total_bytes_to_send == 0) {
// There's definitely no more data, so we're already done.
@ -245,8 +247,8 @@ class AsarURLLoader : public network::mojom::URLLoader {
first_byte_to_send + info.offset,
first_byte_to_send + info.offset + total_bytes_to_send);
data_producer_ = std::make_unique<mojo::DataPipeProducer>(
std::move(pipe.producer_handle));
data_producer_ =
std::make_unique<mojo::DataPipeProducer>(std::move(producer_handle));
data_producer_->Write(
std::move(file_data_source),
base::BindOnce(&AsarURLLoader::OnFileWritten, base::Unretained(this)));

3
shell/browser/net/electron_url_loader_factory.cc
View file

@ -12,7 +12,6 @@
#include "base/strings/string_number_conversions.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/storage_partition.h"
#include "mojo/public/cpp/bindings/binding.h"
#include "mojo/public/cpp/system/data_pipe_producer.h"
#include "mojo/public/cpp/system/string_data_source.h"
#include "net/base/filename_util.h"
@ -185,7 +184,7 @@ ElectronURLLoaderFactory::ElectronURLLoaderFactory(
ProtocolType type,
const ProtocolHandler& handler,
mojo::PendingReceiver<network::mojom::URLLoaderFactory> factory_receiver)
: content::NonNetworkURLLoaderFactoryBase(std::move(factory_receiver)),
: network::SelfDeletingURLLoaderFactory(std::move(factory_receiver)),
type_(type),
handler_(handler) {}

5
shell/browser/net/electron_url_loader_factory.h
View file

@ -9,12 +9,12 @@
#include <string>
#include <utility>
#include "content/public/browser/non_network_url_loader_factory_base.h"
#include "mojo/public/cpp/bindings/pending_receiver.h"
#include "mojo/public/cpp/bindings/pending_remote.h"
#include "mojo/public/cpp/bindings/receiver_set.h"
#include "mojo/public/cpp/bindings/remote.h"
#include "net/url_request/url_request_job_factory.h"
#include "services/network/public/cpp/self_deleting_url_loader_factory.h"
#include "services/network/public/mojom/url_loader_factory.mojom.h"
#include "services/network/public/mojom/url_response_head.mojom.h"
#include "shell/common/gin_helper/dictionary.h"
@ -40,8 +40,7 @@ using HandlersMap =
std::map<std::string, std::pair<ProtocolType, ProtocolHandler>>;
// Implementation of URLLoaderFactory.
class ElectronURLLoaderFactory
: public content::NonNetworkURLLoaderFactoryBase {
class ElectronURLLoaderFactory : public network::SelfDeletingURLLoaderFactory {
public:
static mojo::PendingRemote<network::mojom::URLLoaderFactory> Create(
ProtocolType type,

6
shell/browser/net/node_stream_loader.cc
View file

@ -14,15 +14,15 @@ namespace electron {
NodeStreamLoader::NodeStreamLoader(
network::mojom::URLResponseHeadPtr head,
network::mojom::URLLoaderRequest loader,
mojo::PendingReceiver<network::mojom::URLLoader> loader,
mojo::PendingRemote<network::mojom::URLLoaderClient> client,
v8::Isolate* isolate,
v8::Local<v8::Object> emitter)
: binding_(this, std::move(loader)),
: url_loader_(this, std::move(loader)),
client_(std::move(client)),
isolate_(isolate),
emitter_(isolate, emitter) {
binding_.set_connection_error_handler(
url_loader_.set_disconnect_handler(
base::BindOnce(&NodeStreamLoader::NotifyComplete,
weak_factory_.GetWeakPtr(), net::ERR_FAILED));

5
shell/browser/net/node_stream_loader.h
View file

@ -12,7 +12,6 @@
#include "mojo/public/cpp/bindings/pending_remote.h"
#include "mojo/public/cpp/bindings/remote.h"
#include "mojo/public/cpp/bindings/strong_binding.h"
#include "mojo/public/cpp/system/data_pipe_producer.h"
#include "services/network/public/mojom/url_loader.mojom.h"
#include "services/network/public/mojom/url_response_head.mojom.h"
@ -31,7 +30,7 @@ namespace electron {
class NodeStreamLoader : public network::mojom::URLLoader {
public:
NodeStreamLoader(network::mojom::URLResponseHeadPtr head,
network::mojom::URLLoaderRequest loader,
mojo::PendingReceiver<network::mojom::URLLoader> loader,
mojo::PendingRemote<network::mojom::URLLoaderClient> client,
v8::Isolate* isolate,
v8::Local<v8::Object> emitter);
@ -61,7 +60,7 @@ class NodeStreamLoader : public network::mojom::URLLoader {
void PauseReadingBodyFromNet() override {}
void ResumeReadingBodyFromNet() override {}
mojo::Binding<network::mojom::URLLoader> binding_;
mojo::Receiver<network::mojom::URLLoader> url_loader_;
mojo::Remote<network::mojom::URLLoaderClient> client_;
v8::Isolate* isolate_;

1
shell/browser/net/proxying_url_loader_factory.cc
View file

@ -11,7 +11,6 @@
#include "base/strings/string_util.h"
#include "content/public/browser/browser_context.h"
#include "extensions/browser/extension_navigation_ui_data.h"
#include "mojo/public/cpp/bindings/binding.h"
#include "net/base/completion_repeating_callback.h"
#include "net/base/load_flags.h"
#include "net/http/http_util.h"

1
shell/browser/net/proxying_url_loader_factory.h
View file

@ -14,7 +14,6 @@
#include "base/optional.h"
#include "content/public/browser/content_browser_client.h"
#include "extensions/browser/api/web_request/web_request_info.h"
#include "mojo/public/cpp/bindings/binding.h"
#include "mojo/public/cpp/bindings/pending_receiver.h"
#include "mojo/public/cpp/bindings/pending_remote.h"
#include "mojo/public/cpp/bindings/receiver_set.h"

6
shell/browser/net/proxying_websocket.h
View file

@ -31,7 +31,7 @@ namespace electron {
// The code is referenced from the
// extensions::WebRequestProxyingWebSocket class.
class ProxyingWebSocket : public network::mojom::WebSocketHandshakeClient,
public network::mojom::AuthenticationHandler,
public network::mojom::WebSocketAuthenticationHandler,
public network::mojom::TrustedHeaderClient {
public:
using WebSocketFactory = content::ContentBrowserClient::WebSocketFactory;
@ -79,7 +79,7 @@ class ProxyingWebSocket : public network::mojom::WebSocketHandshakeClient,
mojo::ScopedDataPipeConsumerHandle readable,
mojo::ScopedDataPipeProducerHandle writable) override;
// network::mojom::AuthenticationHandler method:
// network::mojom::WebSocketAuthenticationHandler method:
void OnAuthRequired(const net::AuthChallengeInfo& auth_info,
const scoped_refptr<net::HttpResponseHeaders>& headers,
const net::IPEndPoint& remote_endpoint,
@ -144,7 +144,7 @@ class ProxyingWebSocket : public network::mojom::WebSocketHandshakeClient,
forwarding_handshake_client_;
mojo::Receiver<network::mojom::WebSocketHandshakeClient>
receiver_as_handshake_client_{this};
mojo::Receiver<network::mojom::AuthenticationHandler>
mojo::Receiver<network::mojom::WebSocketAuthenticationHandler>
receiver_as_auth_handler_{this};
mojo::Receiver<network::mojom::TrustedHeaderClient>
receiver_as_header_client_{this};

6
shell/browser/net/system_network_context_manager.cc
View file

@ -13,7 +13,6 @@
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/network_service_instance.h"
#include "content/public/common/content_features.h"
#include "mojo/public/cpp/bindings/associated_interface_ptr.h"
#include "mojo/public/cpp/bindings/pending_receiver.h"
#include "net/net_buildflags.h"
#include "services/network/network_service.h"
@ -157,6 +156,11 @@ SystemNetworkContextManager::CreateDefaultNetworkContextParams() {
network::mojom::NetworkContextParams::New();
ConfigureDefaultNetworkContextParams(network_context_params.get());
network::mojom::CertVerifierCreationParamsPtr cert_verifier_creation_params =
network::mojom::CertVerifierCreationParams::New();
network_context_params->cert_verifier_params =
content::GetCertVerifierParams(std::move(cert_verifier_creation_params));
return network_context_params;
}

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

@ -15,12 +15,12 @@ namespace electron {
URLPipeLoader::URLPipeLoader(
scoped_refptr<network::SharedURLLoaderFactory> factory,
std::unique_ptr<network::ResourceRequest> request,
network::mojom::URLLoaderRequest loader,
mojo::PendingReceiver<network::mojom::URLLoader> loader,
mojo::PendingRemote<network::mojom::URLLoaderClient> client,
const net::NetworkTrafficAnnotationTag& annotation,
base::DictionaryValue upload_data)
: binding_(this, std::move(loader)), client_(std::move(client)) {
binding_.set_connection_error_handler(base::BindOnce(
: url_loader_(this, std::move(loader)), client_(std::move(client)) {
url_loader_.set_disconnect_handler(base::BindOnce(
&URLPipeLoader::NotifyComplete, base::Unretained(this), net::ERR_FAILED));
// PostTask since it might destruct.

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

@ -11,7 +11,6 @@
#include "mojo/public/cpp/bindings/receiver.h"
#include "mojo/public/cpp/bindings/remote.h"
#include "mojo/public/cpp/bindings/strong_binding.h"
#include "mojo/public/cpp/system/data_pipe_producer.h"
#include "services/network/public/cpp/simple_url_loader.h"
#include "services/network/public/cpp/simple_url_loader_stream_consumer.h"
@ -35,7 +34,7 @@ class URLPipeLoader : public network::mojom::URLLoader,
public:
URLPipeLoader(scoped_refptr<network::SharedURLLoaderFactory> factory,
std::unique_ptr<network::ResourceRequest> request,
network::mojom::URLLoaderRequest loader,
mojo::PendingReceiver<network::mojom::URLLoader> loader,
mojo::PendingRemote<network::mojom::URLLoaderClient> client,
const net::NetworkTrafficAnnotationTag& annotation,
base::DictionaryValue upload_data);
@ -69,7 +68,7 @@ class URLPipeLoader : public network::mojom::URLLoader,
void PauseReadingBodyFromNet() override {}
void ResumeReadingBodyFromNet() override {}
mojo::Binding<network::mojom::URLLoader> binding_;
mojo::Receiver<network::mojom::URLLoader> url_loader_;
mojo::Remote<network::mojom::URLLoaderClient> client_;
std::unique_ptr<mojo::DataPipeProducer> producer_;