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

chore: bump chromium to 121.0.6147.0 (main) (#40523)

Browse source 
* chore: bump chromium in DEPS to 121.0.6128.0

* build: update patches

* refactor: remove instrumentation from extensions code

Ref: 5002404

* refactor: modernization of tabs_api

Ref: 4997031

* fix: add RecordHover and RecordDrag handlers

* build: add missing pdf files

* chore: bump chromium in DEPS to 121.0.6129.0

* chore: bump chromium in DEPS to 121.0.6131.0

* chore: update patches

* refactor: remove will_cause_resize from ExitFullscreen

Ref: 5031312

* chore: add missing std converter include

Before these were being inferred as std::string implicitly, not anymore
Ref: 5029573

* chore: Unwrap UserScriptList from unique_ptrs

Ref: 5005198

* refactor: add PDF internal id into PDF stream info

Ref: 4876972

* refactor: add metadata to view classes

Ref: 4994885

* chore: run lint --fix

* chore: update libc++ filenames

* chore: clean up menubar

* chore: update patches after main merge

* 5010979: Replace base::WStringPiece usage with std::wstring_view | 5010979

* chore: bump chromium in DEPS to 121.0.6142.0

* chore: update patches

* 4969574: Refactor NativeDesktopMediaList | 4969574

* 5031192: [blink] Create new blink test suite that doesn't create blink Isolate | 5031192

* chore: update v8/devtools patches

* 5040722: [base] Replace MakeFixedFlatTreeSorted with tag type overloads | 5040722

* 5026474: Add --generate-pdf-document-outline | 5026474

* 5024297: Change parameter of CheckMediaAccessPermission from GURL to URL::Origin | 5024297

* 5034217: [RWS] Remove CanonicalCookie::IsSameParty method | 5034217

* 5037192: Rewrite usage of RenderFrame::GetRoutingID | 5037192

* 5041802: Reland "Incorporate policy override for OOPPD feature" | 5041802

* chore: bump chromium in DEPS to 121.0.6143.0

* chore: bump chromium in DEPS to 121.0.6145.0

* chore: update chromium patches

* 5049986: Use std::unique_ptr for MenuItemView::submenu_ member. | 5049986

* 5041595: picture-in-picture: Add PictureInPictureOcclusionTracker | 5041595

* chore: update all patches

* chore: bump chromium in DEPS to 121.0.6147.0

* chore: update patches

* 5051069: Use base::FunctionRef for BrowserPluginGuestManager. | 5051069

* 5057330: [base] Remove base::Erase()/base::EraseIf() overloads for std::set | 5057330

* fixup! 5041802: Reland "Incorporate policy override for OOPPD feature" | 5041802

* 5017518: Remove PPAPI if NaCl is disabled | 5017518

* 5002232: [DevTools] Console Insights: move from build flag to Feature API | 5002232

* 4970322: [X11] Move utils into x11::Connection | 4970322

* 5048950: Let MenuModelAdapter::CreateMenu return a std::unique_ptr<>. | 5048950

* chore: update libcxx filenames

* use Context::Scope in RunScriptsAtDocument{Start,End}

* 4775128: content: Reuse CC instance for main frame navigations

4775128

* also wrap WebWorkerObserver::ContextWillDestroy with Context::Scope

* set LIBCPP_HARDENING_MODE

5014271

---------

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: Samuel Attard <marshallofsound@electronjs.org>
Co-authored-by: Keeley Hammond <vertedinde@electronjs.org>
Co-authored-by: VerteDinde <keeleymhammond@gmail.com>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
Co-authored-by: Jeremy Rose <jeremya@chromium.org>
This commit is contained in:
electron-roller[bot] 2023-11-28 13:40:12 -08:00 • committed by GitHub
parent f0f027c06d
commit 5c7579ab1c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
132 changed files with 701 additions and 660 deletions
Download patch file Download diff file Expand all files Collapse all files

1
shell/common/gin_converters/base_converter.h
View file

@ -7,6 +7,7 @@
#include "base/process/kill.h"
#include "gin/converter.h"
#include "shell/common/gin_converters/std_converter.h"
namespace gin {

8
shell/common/gin_converters/blink_converter.cc
View file

@ -135,7 +135,7 @@ struct Converter<blink::WebMouseEvent::Button> {
blink::WebMouseEvent::Button* out) {
using Val = blink::WebMouseEvent::Button;
static constexpr auto Lookup =
base::MakeFixedFlatMapSorted<base::StringPiece, Val>({
base::MakeFixedFlatMap<base::StringPiece, Val>({
{"left", Val::kLeft},
{"middle", Val::kMiddle},
{"right", Val::kRight},
@ -148,7 +148,7 @@ struct Converter<blink::WebMouseEvent::Button> {
// these are the modifier names we both accept and return
static constexpr auto Modifiers =
base::MakeFixedFlatMapSorted<base::StringPiece, blink::WebInputEvent::Modifiers>({
base::MakeFixedFlatMap<base::StringPiece, blink::WebInputEvent::Modifiers>({
{"alt", blink::WebInputEvent::Modifiers::kAltKey},
{"capslock", blink::WebInputEvent::Modifiers::kCapsLockOn},
{"control", blink::WebInputEvent::Modifiers::kControlKey},
@ -167,14 +167,14 @@ static constexpr auto Modifiers =
// these are the modifier names we accept but do not return
static constexpr auto ModifierAliases =
base::MakeFixedFlatMapSorted<base::StringPiece, blink::WebInputEvent::Modifiers>({
base::MakeFixedFlatMap<base::StringPiece, blink::WebInputEvent::Modifiers>({
{"cmd", blink::WebInputEvent::Modifiers::kMetaKey},
{"command", blink::WebInputEvent::Modifiers::kMetaKey},
{"ctrl", blink::WebInputEvent::Modifiers::kControlKey},
});
static constexpr auto ReferrerPolicies =
base::MakeFixedFlatMapSorted<base::StringPiece, network::mojom::ReferrerPolicy>({
base::MakeFixedFlatMap<base::StringPiece, network::mojom::ReferrerPolicy>({
{"default", network::mojom::ReferrerPolicy::kDefault},
{"no-referrer", network::mojom::ReferrerPolicy::kNever},
{"no-referrer-when-downgrade", network::mojom::ReferrerPolicy::kNoReferrerWhenDowngrade},

2
shell/common/gin_converters/content_converter.cc
View file

@ -323,7 +323,7 @@ bool Converter<content::StopFindAction>::FromV8(v8::Isolate* isolate,
content::StopFindAction* out) {
using Val = content::StopFindAction;
static constexpr auto Lookup =
base::MakeFixedFlatMapSorted<base::StringPiece, Val>({
base::MakeFixedFlatMap<base::StringPiece, Val>({
{"activateSelection", Val::STOP_FIND_ACTION_ACTIVATE_SELECTION},
{"clearSelection", Val::STOP_FIND_ACTION_CLEAR_SELECTION},
{"keepSelection", Val::STOP_FIND_ACTION_KEEP_SELECTION},

11
shell/common/gin_converters/hid_device_info_converter.h
View file

@ -9,6 +9,7 @@
#include "services/device/public/mojom/hid.mojom.h"
#include "shell/browser/hid/hid_chooser_context.h"
#include "shell/browser/hid/hid_chooser_controller.h"
#include "shell/common/gin_converters/value_converter.h"
namespace gin {
@ -18,11 +19,11 @@ struct Converter<device::mojom::HidDeviceInfoPtr> {
v8::Isolate* isolate,
const device::mojom::HidDeviceInfoPtr& device) {
base::Value value = electron::HidChooserContext::DeviceInfoToValue(*device);
value.GetDict().Set(
"deviceId",
electron::HidChooserController::PhysicalDeviceIdFromDeviceInfo(
*device));
return gin::ConvertToV8(isolate, value);
base::Value::Dict& dict = value.GetDict();
dict.Set("deviceId",
electron::HidChooserController::PhysicalDeviceIdFromDeviceInfo(
*device));
return gin::Converter<base::Value::Dict>::ToV8(isolate, dict);
}
};

8
shell/common/gin_converters/net_converter.cc
View file

@ -691,7 +691,7 @@ bool Converter<net::DnsQueryType>::FromV8(v8::Isolate* isolate,
v8::Local<v8::Value> val,
net::DnsQueryType* out) {
static constexpr auto Lookup =
base::MakeFixedFlatMapSorted<base::StringPiece, net::DnsQueryType>({
base::MakeFixedFlatMap<base::StringPiece, net::DnsQueryType>({
{"A", net::DnsQueryType::A},
{"AAAA", net::DnsQueryType::AAAA},
});
@ -704,7 +704,7 @@ bool Converter<net::HostResolverSource>::FromV8(v8::Isolate* isolate,
net::HostResolverSource* out) {
using Val = net::HostResolverSource;
static constexpr auto Lookup =
base::MakeFixedFlatMapSorted<base::StringPiece, Val>({
base::MakeFixedFlatMap<base::StringPiece, Val>({
{"any", Val::ANY},
{"dns", Val::DNS},
{"localOnly", Val::LOCAL_ONLY},
@ -721,7 +721,7 @@ bool Converter<network::mojom::ResolveHostParameters::CacheUsage>::FromV8(
network::mojom::ResolveHostParameters::CacheUsage* out) {
using Val = network::mojom::ResolveHostParameters::CacheUsage;
static constexpr auto Lookup =
base::MakeFixedFlatMapSorted<base::StringPiece, Val>({
base::MakeFixedFlatMap<base::StringPiece, Val>({
{"allowed", Val::ALLOWED},
{"disallowed", Val::DISALLOWED},
{"staleAllowed", Val::STALE_ALLOWED},
@ -736,7 +736,7 @@ bool Converter<network::mojom::SecureDnsPolicy>::FromV8(
network::mojom::SecureDnsPolicy* out) {
using Val = network::mojom::SecureDnsPolicy;
static constexpr auto Lookup =
base::MakeFixedFlatMapSorted<base::StringPiece, Val>({
base::MakeFixedFlatMap<base::StringPiece, Val>({
{"allow", Val::ALLOW},
{"disable", Val::DISABLE},
});

2
shell/common/keyboard_util.cc
View file

@ -27,7 +27,7 @@ constexpr CodeAndShiftedChar KeyboardCodeFromKeyIdentifier(
#endif
constexpr auto Lookup =
base::MakeFixedFlatMapSorted<base::StringPiece, CodeAndShiftedChar>({
base::MakeFixedFlatMap<base::StringPiece, CodeAndShiftedChar>({
{"alt", {ui::VKEY_MENU, {}}},
{"altgr", {ui::VKEY_ALTGR, {}}},
{"backspace", {ui::VKEY_BACK, {}}},

2
shell/common/language_util_win.cc
View file

@ -43,7 +43,7 @@ bool GetPreferredLanguagesUsingGlobalization(
HSTRING hstr;
hr = langs->GetAt(i, &hstr);
if (SUCCEEDED(hr)) {
base::WStringPiece str = base::win::ScopedHString(hstr).Get();
std::wstring_view str = base::win::ScopedHString(hstr).Get();
languages->emplace_back(str.data(), str.size());
}
}

43
shell/common/node_bindings.cc
View file

@ -297,7 +297,7 @@ void ErrorMessageListener(v8::Local<v8::Message> message,
// If node CLI inspect support is disabled, allow no debug options.
bool IsAllowedOption(base::StringPiece option) {
static constexpr auto debug_options =
base::MakeFixedFlatSetSorted<base::StringPiece>({
base::MakeFixedFlatSet<base::StringPiece>({
"--debug",
"--debug-brk",
"--debug-port",
@ -309,14 +309,13 @@ bool IsAllowedOption(base::StringPiece option) {
});
// This should be aligned with what's possible to set via the process object.
static constexpr auto options =
base::MakeFixedFlatSetSorted<base::StringPiece>({
"--dns-result-order",
"--no-deprecation",
"--throw-deprecation",
"--trace-deprecation",
"--trace-warnings",
});
static constexpr auto options = base::MakeFixedFlatSet<base::StringPiece>({
"--dns-result-order",
"--no-deprecation",
"--throw-deprecation",
"--trace-deprecation",
"--trace-warnings",
});
if (debug_options.contains(option))
return electron::fuses::IsNodeCliInspectEnabled();
@ -328,21 +327,19 @@ bool IsAllowedOption(base::StringPiece option) {
// See https://nodejs.org/api/cli.html#cli_node_options_options
void SetNodeOptions(base::Environment* env) {
// Options that are unilaterally disallowed
static constexpr auto disallowed =
base::MakeFixedFlatSetSorted<base::StringPiece>({
"--enable-fips",
"--experimental-policy",
"--force-fips",
"--openssl-config",
"--use-bundled-ca",
"--use-openssl-ca",
});
static constexpr auto disallowed = base::MakeFixedFlatSet<base::StringPiece>({
"--enable-fips",
"--experimental-policy",
"--force-fips",
"--openssl-config",
"--use-bundled-ca",
"--use-openssl-ca",
});
static constexpr auto pkg_opts =
base::MakeFixedFlatSetSorted<base::StringPiece>({
"--http-parser",
"--max-http-header-size",
});
static constexpr auto pkg_opts = base::MakeFixedFlatSet<base::StringPiece>({
"--http-parser",
"--max-http-header-size",
});
if (env->HasVar("NODE_OPTIONS")) {
if (electron::fuses::IsNodeOptionsEnabled()) {