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

chore: bump chromium to 95.0.4629.0 (main) (#30676)

Browse source 
* chore: bump chromium in DEPS to 95.0.4620.0

* chore: update patches

* 3076261: Move args_ to private in ExtensionFunction

3076261

* [GURL -> SiteForCookies] content/public/browser/content_browser_client.h

3107759

* chore: fix -Wunreachable-code-return in node

* Tracing to diagnose ContentScriptTracker-related bad message reports

3057922

* chore: bump chromium in DEPS to 95.0.4621.0

* chore: update patches

* Remove title from the URL format on Windows.

3108445

* chore: bump chromium in DEPS to 95.0.4623.0

* Revert "chore: disable v8 oilpan"

This reverts commit 5d255cf1d8e8efbb906047937a713279e5f800d0.

(cherry picked from commit ba5cde4da2428020d99b7fb603c702878f95da78)

* Change file paths in network context params to be relative.

3092927

* Code Health: Rename/replace content::WebUI::RegisterMessageCallback().

3104691

* Migrate CanExecuteContentScriptSync to Mojo

3108452

* chore: update patches

* remove unreachable code

* Revert "Revert "chore: disable v8 oilpan""

This reverts commit fef495c0294e21760df51bddb5f7bf1ec9ed5f1e.

* fixup mas patch

* Reland "[include] Split out v8.h"

3113629

* chore: bump chromium in DEPS to 95.0.4624.0

* chore: bump chromium in DEPS to 95.0.4625.0

* chore: bump chromium in DEPS to 95.0.4626.0

* 3033504: Pass NavigationDownloadPolicy in CreateNewWindowParams

3033504

* 3058038: Introduce TestPrintingContext & test UpdatePrintSettings

3058038

* 3114943: [Conditional Focus][#4] Add tests and remove flag gating

3114943

* chore: update patch indices

* chore: bump chromium in DEPS to 95.0.4627.0

* chore: update patches

* 3093591: ozone: webpagepopups: calculate anchor for menu bounds. 4/*

3093591

* 3110414: [PA] Remove the leading cookie

3110414

* chore: update patches

* 3076261: Move args_ to private in ExtensionFunction

3076261

* 3113629: Reland "[include] Split out v8.h"

3113629

* chore: bump chromium in DEPS to 95.0.4628.0

* chore: update patches

* chore: bump chromium in DEPS to 95.0.4629.0

* chore: update patches

* Fix chrome root store codegen for cross-compile builds.

3133701

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
Co-authored-by: deepak1556 <hop2deep@gmail.com>
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
This commit is contained in:
electron-roller[bot] 2021-09-01 15:55:07 -04:00 • committed by GitHub
parent e6802bf935
commit 49e62f1261
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
77 changed files with 588 additions and 1090 deletions
Download patch file Download diff file Expand all files Collapse all files

2
shell/browser/electron_browser_client.cc
View file

@ -832,7 +832,7 @@ bool ElectronBrowserClient::ShouldUseProcessPerSite(
bool ElectronBrowserClient::ArePersistentMediaDeviceIDsAllowed(
content::BrowserContext* browser_context,
const GURL& scope,
const GURL& site_for_cookies,
const net::SiteForCookies& site_for_cookies,
const absl::optional<url::Origin>& top_frame_origin) {
return true;
}

2
shell/browser/electron_browser_client.h
View file

@ -268,7 +268,7 @@ class ElectronBrowserClient : public content::ContentBrowserClient,
bool ArePersistentMediaDeviceIDsAllowed(
content::BrowserContext* browser_context,
const GURL& scope,
const GURL& site_for_cookies,
const net::SiteForCookies& site_for_cookies,
const absl::optional<url::Origin>& top_frame_origin) override;
base::FilePath GetLoggingFileName(const base::CommandLine& cmd_line) override;

10
shell/browser/extensions/api/cryptotoken_private/cryptotoken_private_api.cc
View file

@ -101,7 +101,7 @@ CryptotokenPrivateCanOriginAssertAppIdFunction::
ExtensionFunction::ResponseAction
CryptotokenPrivateCanOriginAssertAppIdFunction::Run() {
std::unique_ptr<cryptotoken_private::CanOriginAssertAppId::Params> params =
cryptotoken_private::CanOriginAssertAppId::Params::Create(*args_);
cryptotoken_private::CanOriginAssertAppId::Params::Create(args());
EXTENSION_FUNCTION_VALIDATE(params);
const GURL origin_url(params->security_origin);
@ -159,7 +159,7 @@ CryptotokenPrivateIsAppIdHashInEnterpriseContextFunction::Run() {
std::unique_ptr<cryptotoken_private::IsAppIdHashInEnterpriseContext::Params>
params(
cryptotoken_private::IsAppIdHashInEnterpriseContext::Params::Create(
*args_));
args()));
EXTENSION_FUNCTION_VALIDATE(params);
#if 0
@ -181,7 +181,7 @@ CryptotokenPrivateCanAppIdGetAttestationFunction::
ExtensionFunction::ResponseAction
CryptotokenPrivateCanAppIdGetAttestationFunction::Run() {
std::unique_ptr<cryptotoken_private::CanAppIdGetAttestation::Params> params =
cryptotoken_private::CanAppIdGetAttestation::Params::Create(*args_);
cryptotoken_private::CanAppIdGetAttestation::Params::Create(args());
EXTENSION_FUNCTION_VALIDATE(params);
return RespondNow(Error("API not supported in Electron"));
@ -277,7 +277,7 @@ void CryptotokenPrivateCanAppIdGetAttestationFunction::Complete(bool result) {
ExtensionFunction::ResponseAction
CryptotokenPrivateRecordRegisterRequestFunction::Run() {
auto params =
cryptotoken_private::RecordRegisterRequest::Params::Create(*args_);
cryptotoken_private::RecordRegisterRequest::Params::Create(args());
EXTENSION_FUNCTION_VALIDATE(params);
content::RenderFrameHost* frame = RenderFrameHostForTabAndFrameId(
@ -293,7 +293,7 @@ CryptotokenPrivateRecordRegisterRequestFunction::Run() {
ExtensionFunction::ResponseAction
CryptotokenPrivateRecordSignRequestFunction::Run() {
auto params = cryptotoken_private::RecordSignRequest::Params::Create(*args_);
auto params = cryptotoken_private::RecordSignRequest::Params::Create(args());
EXTENSION_FUNCTION_VALIDATE(params);
content::RenderFrameHost* frame = RenderFrameHostForTabAndFrameId(

2
shell/browser/extensions/api/resources_private/resources_private_api.cc
View file

@ -81,7 +81,7 @@ ResourcesPrivateGetStringsFunction::~ResourcesPrivateGetStringsFunction() =
ExtensionFunction::ResponseAction ResourcesPrivateGetStringsFunction::Run() {
std::unique_ptr<get_strings::Params> params(
get_strings::Params::Create(*args_));
get_strings::Params::Create(args()));
auto dict = std::make_unique<base::DictionaryValue>();
api::resources_private::Component component = params->component;

2
shell/browser/javascript_environment.cc
View file

@ -75,7 +75,7 @@ class ArrayBufferAllocator : public v8::ArrayBuffer::Allocator {
allocator_->init({base::PartitionOptions::AlignedAlloc::kDisallowed,
base::PartitionOptions::ThreadCache::kDisabled,
base::PartitionOptions::Quarantine::kAllowed,
base::PartitionOptions::Cookies::kAllowed,
base::PartitionOptions::Cookie::kAllowed,
base::PartitionOptions::RefCount::kDisallowed});
}

1
shell/browser/javascript_environment.h
View file

@ -10,6 +10,7 @@
#include "base/macros.h"
#include "gin/public/isolate_holder.h"
#include "uv.h" // NOLINT(build/include_directory)
#include "v8/include/v8-locker.h"
namespace node {
class Environment;

14
shell/browser/net/network_context_service.cc
View file

@ -68,12 +68,17 @@ void NetworkContextService::ConfigureNetworkContextParams(
network_context_params->http_cache_max_size =
browser_context_->GetMaxCacheSize();
network_context_params->file_paths =
network::mojom::NetworkContextFilePaths::New();
network_context_params->file_paths->data_path = path;
// Currently this just contains HttpServerProperties
network_context_params->http_server_properties_path =
path.Append(chrome::kNetworkPersistentStateFilename);
network_context_params->file_paths->http_server_properties_file_name =
base::FilePath(chrome::kNetworkPersistentStateFilename);
// Configure persistent cookie path.
network_context_params->cookie_path = path.Append(chrome::kCookieFilename);
network_context_params->file_paths->cookie_database_name =
base::FilePath(chrome::kCookieFilename);
network_context_params->restore_old_session_cookies = false;
network_context_params->persist_session_cookies = false;
@ -81,7 +86,8 @@ void NetworkContextService::ConfigureNetworkContextParams(
network_context_params->enable_encrypted_cookies =
electron::fuses::IsCookieEncryptionEnabled();
network_context_params->transport_security_persister_file_path = path;
network_context_params->file_paths->transport_security_persister_file_name =
base::FilePath(chrome::kTransportSecurityPersisterFilename);
}
proxy_config_monitor_.AddToNetworkContextParams(network_context_params);

3
shell/browser/osr/osr_render_widget_host_view.cc
View file

@ -396,7 +396,8 @@ void OffScreenRenderWidgetHostView::ResetFallbackToFirstNavigationSurface() {
void OffScreenRenderWidgetHostView::InitAsPopup(
content::RenderWidgetHostView* parent_host_view,
const gfx::Rect& pos) {
const gfx::Rect& pos,
const gfx::Rect& anchor_rect) {
DCHECK_EQ(parent_host_view_, parent_host_view);
DCHECK_EQ(widget_type_, content::WidgetType::kPopup);

3
shell/browser/osr/osr_render_widget_host_view.h
View file

@ -114,7 +114,8 @@ class OffScreenRenderWidgetHostView : public content::RenderWidgetHostViewBase,
void ResetFallbackToFirstNavigationSurface() override;
void InitAsPopup(content::RenderWidgetHostView* parent_host_view,
const gfx::Rect& rect) override;
const gfx::Rect& pos,
const gfx::Rect& anchor_rect) override;
void UpdateCursor(const content::WebCursor&) override;
void SetIsLoading(bool is_loading) override;
void TextInputStateChanged(const ui::mojom::TextInputState& params) override;

1
shell/browser/ui/gtk/status_icon.cc
View file

@ -52,7 +52,6 @@ std::unique_ptr<views::StatusIconLinux> CreateLinuxStatusIcon(
} else {
return std::make_unique<GtkStatusIcon>(image, tool_tip);
}
return nullptr;
#endif
}

10
shell/browser/ui/webui/accessibility_ui.cc
View file

@ -391,25 +391,25 @@ void ElectronAccessibilityUIMessageHandler::RequestNativeUITree(
void ElectronAccessibilityUIMessageHandler::RegisterMessages() {
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
web_ui()->RegisterMessageCallback(
web_ui()->RegisterDeprecatedMessageCallback(
"toggleAccessibility",
base::BindRepeating(&AccessibilityUIMessageHandler::ToggleAccessibility,
base::Unretained(this)));
web_ui()->RegisterMessageCallback(
web_ui()->RegisterDeprecatedMessageCallback(
"setGlobalFlag",
base::BindRepeating(&AccessibilityUIMessageHandler::SetGlobalFlag,
base::Unretained(this)));
web_ui()->RegisterMessageCallback(
web_ui()->RegisterDeprecatedMessageCallback(
"requestWebContentsTree",
base::BindRepeating(
&AccessibilityUIMessageHandler::RequestWebContentsTree,
base::Unretained(this)));
web_ui()->RegisterMessageCallback(
web_ui()->RegisterDeprecatedMessageCallback(
"requestNativeUITree",
base::BindRepeating(
&ElectronAccessibilityUIMessageHandler::RequestNativeUITree,
base::Unretained(this)));
web_ui()->RegisterMessageCallback(
web_ui()->RegisterDeprecatedMessageCallback(
"requestAccessibilityEvents",
base::BindRepeating(
&AccessibilityUIMessageHandler::RequestAccessibilityEvents,