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

chore: bump chromium to 131.0.6744.0 (main) (#43948)

Browse source 
* chore: bump chromium in DEPS to 131.0.6738.0

* chore: bump chromium in DEPS to 131.0.6740.0

* 5889025: [LaCrOS] Remove LaCrOS screen capturer. | 5889025

* https://boringssl.googlesource.com/boringssl.git/+/40dd94116ba03678226443ba20c5887459c9bf16/crypto/fipsmodule/digest/digests.c.inc

* chore: update patches

* 5878695: Add IsolationInfo for embedders handling external protocols | 5878695

* 5854304: [UI] Remove alias of mojom  | 5854304

* chore: bump chromium in DEPS to 131.0.6742.0

* chore: update patches

* chore: bump chromium in DEPS to 131.0.6744.0

* fixup! 5889025: [LaCrOS] Remove LaCrOS screen capturer. | 5889025

* chore: e patches all

* chore: update chore_provide_iswebcontentscreationoverridden_with_full_params.patch

Xref: 5894233

* [UI] Remove alias of mojom 'WindowShowState'

Xref: 5854304

* chore: gen-libc++-filenames.js

* chore: partially revert 5894233

see patch commit message for description

* Clean up stale base::Feature "kFileSystemAccessLocalUNCPathBlock"

This feature is always on by default and doesn't have active finch
experiments.

Xref: 5881253

* fix: asar integrity test recognizes SIGABRT as a crash

5882758

ValidateIntegrityOrDie() exits via LOG(FATAL)'s call to
base::ImmediateCrash(). There's been churn there upstream between
5332940 and 5882758 on whether to use SIGTRAP or SIGABRT.  For now,
let's accept both until the churn is done.

---------

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: alice <alice@makenotion.com>
Co-authored-by: Charles Kerr <charles@charleskerr.com>
This commit is contained in:
electron-roller[bot] 2024-09-30 14:54:44 +02:00 • committed by GitHub
parent eb40d2cbfa
commit af58931efa
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
59 changed files with 302 additions and 236 deletions
Download patch file Download diff file Expand all files Collapse all files

1
shell/browser/electron_browser_client.cc
View file

@ -924,6 +924,7 @@ bool ElectronBrowserClient::HandleExternalProtocol(
bool has_user_gesture,
const std::optional<url::Origin>& initiating_origin,
content::RenderFrameHost* initiator_document,
const net::IsolationInfo& isolation_info,
mojo::PendingRemote<network::mojom::URLLoaderFactory>* out_factory) {
content::GetUIThreadTaskRunner({})->PostTask(
FROM_HERE,

1
shell/browser/electron_browser_client.h
View file

@ -276,6 +276,7 @@ class ElectronBrowserClient : public content::ContentBrowserClient,
bool has_user_gesture,
const std::optional<url::Origin>& initiating_origin,
content::RenderFrameHost* initiator_document,
const net::IsolationInfo& isolation_info,
mojo::PendingRemote<network::mojom::URLLoaderFactory>* out_factory)
override;
std::unique_ptr<content::LoginDelegate> CreateLoginDelegate(

5
shell/browser/file_system_access/file_system_access_permission_context.cc
View file

@ -155,11 +155,8 @@ bool ShouldBlockAccessToPath(const base::FilePath& path,
#if BUILDFLAG(IS_WIN)
// On Windows, local UNC paths are rejected, as UNC path can be written in a
// way that can bypass the blocklist.
if (base::FeatureList::IsEnabled(
features::kFileSystemAccessLocalUNCPathBlock) &&
MaybeIsLocalUNCPath(path)) {
if (MaybeIsLocalUNCPath(path))
return true;
}
#endif // BUILDFLAG(IS_WIN)
// Add the hard-coded rules to the dynamic rules.

30
shell/browser/native_window_views.cc
View file

@ -411,9 +411,9 @@ NativeWindowViews::NativeWindowViews(const gin_helper::Dictionary& options,
#if BUILDFLAG(IS_WIN)
// Save initial window state.
if (fullscreen)
last_window_state_ = ui::SHOW_STATE_FULLSCREEN;
last_window_state_ = ui::mojom::WindowShowState::kFullscreen;
else
last_window_state_ = ui::SHOW_STATE_NORMAL;
last_window_state_ = ui::mojom::WindowShowState::kNormal;
#endif
// Listen to mouse events.
@ -641,8 +641,8 @@ void NativeWindowViews::Maximize() {
if (IsVisible()) {
widget()->Maximize();
} else {
widget()->native_widget_private()->Show(ui::SHOW_STATE_MAXIMIZED,
gfx::Rect());
widget()->native_widget_private()->Show(
ui::mojom::WindowShowState::kMaximized, gfx::Rect());
NotifyWindowShow();
}
}
@ -690,8 +690,8 @@ void NativeWindowViews::Minimize() {
if (IsVisible())
widget()->Minimize();
else
widget()->native_widget_private()->Show(ui::SHOW_STATE_MINIMIZED,
gfx::Rect());
widget()->native_widget_private()->Show(
ui::mojom::WindowShowState::kMinimized, gfx::Rect());
}
void NativeWindowViews::Restore() {
@ -715,10 +715,10 @@ void NativeWindowViews::SetFullScreen(bool fullscreen) {
bool leaving_fullscreen = IsFullscreen() && !fullscreen;
if (fullscreen) {
last_window_state_ = ui::SHOW_STATE_FULLSCREEN;
last_window_state_ = ui::mojom::WindowShowState::kFullscreen;
NotifyWindowEnterFullScreen();
} else {
last_window_state_ = ui::SHOW_STATE_NORMAL;
last_window_state_ = ui::mojom::WindowShowState::kNormal;
NotifyWindowLeaveFullScreen();
}
@ -768,8 +768,8 @@ void NativeWindowViews::SetFullScreen(bool fullscreen) {
if (IsVisible())
widget()->SetFullscreen(fullscreen);
else if (fullscreen)
widget()->native_widget_private()->Show(ui::SHOW_STATE_FULLSCREEN,
gfx::Rect());
widget()->native_widget_private()->Show(
ui::mojom::WindowShowState::kFullscreen, gfx::Rect());
// Auto-hide menubar when in fullscreen.
if (fullscreen) {
@ -1777,22 +1777,22 @@ void NativeWindowViews::OnMouseEvent(ui::MouseEvent* event) {
#endif
}
ui::WindowShowState NativeWindowViews::GetRestoredState() {
ui::mojom::WindowShowState NativeWindowViews::GetRestoredState() {
if (IsMaximized()) {
#if BUILDFLAG(IS_WIN)
// Only restore Maximized state when window is NOT transparent style
if (!transparent()) {
return ui::SHOW_STATE_MAXIMIZED;
return ui::mojom::WindowShowState::kMaximized;
}
#else
return ui::SHOW_STATE_MAXIMIZED;
return ui::mojom::WindowShowState::kMinimized;
#endif
}
if (IsFullscreen())
return ui::SHOW_STATE_FULLSCREEN;
return ui::mojom::WindowShowState::kFullscreen;
return ui::SHOW_STATE_NORMAL;
return ui::mojom::WindowShowState::kNormal;
}
void NativeWindowViews::MoveBehindTaskBarIfNeeded() {

4
shell/browser/native_window_views.h
View file

@ -231,7 +231,7 @@ class NativeWindowViews : public NativeWindow,
void OnMouseEvent(ui::MouseEvent* event) override;
// Returns the restore state for the window.
ui::WindowShowState GetRestoredState();
ui::mojom::WindowShowState GetRestoredState();
// Maintain window placement.
void MoveBehindTaskBarIfNeeded();
@ -262,7 +262,7 @@ class NativeWindowViews : public NativeWindow,
#if BUILDFLAG(IS_WIN)
ui::WindowShowState last_window_state_;
ui::mojom::WindowShowState last_window_state_;
gfx::Rect last_normal_placement_bounds_;

24
shell/browser/native_window_views_win.cc
View file

@ -213,8 +213,8 @@ void NativeWindowViews::Maximize() {
if (IsVisible()) {
widget()->Maximize();
} else {
widget()->native_widget_private()->Show(ui::SHOW_STATE_MAXIMIZED,
gfx::Rect());
widget()->native_widget_private()->Show(
ui::mojom::WindowShowState::kMaximized, gfx::Rect());
NotifyWindowShow();
}
} else {
@ -458,31 +458,31 @@ void NativeWindowViews::HandleSizeEvent(WPARAM w_param, LPARAM l_param) {
// Note that SIZE_MAXIMIZED and SIZE_MINIMIZED might be emitted for
// multiple times for one resize because of the SetWindowPlacement call.
if (w_param == SIZE_MAXIMIZED &&
last_window_state_ != ui::SHOW_STATE_MAXIMIZED) {
if (last_window_state_ == ui::SHOW_STATE_MINIMIZED)
last_window_state_ != ui::mojom::WindowShowState::kMaximized) {
if (last_window_state_ == ui::mojom::WindowShowState::kMinimized)
NotifyWindowRestore();
last_window_state_ = ui::SHOW_STATE_MAXIMIZED;
last_window_state_ = ui::mojom::WindowShowState::kMaximized;
NotifyWindowMaximize();
ResetWindowControls();
} else if (w_param == SIZE_MINIMIZED &&
last_window_state_ != ui::SHOW_STATE_MINIMIZED) {
last_window_state_ = ui::SHOW_STATE_MINIMIZED;
last_window_state_ != ui::mojom::WindowShowState::kMinimized) {
last_window_state_ = ui::mojom::WindowShowState::kMinimized;
NotifyWindowMinimize();
}
break;
}
case SIZE_RESTORED: {
switch (last_window_state_) {
case ui::SHOW_STATE_MAXIMIZED:
last_window_state_ = ui::SHOW_STATE_NORMAL;
case ui::mojom::WindowShowState::kMaximized:
last_window_state_ = ui::mojom::WindowShowState::kNormal;
NotifyWindowUnmaximize();
break;
case ui::SHOW_STATE_MINIMIZED:
case ui::mojom::WindowShowState::kMinimized:
if (IsFullscreen()) {
last_window_state_ = ui::SHOW_STATE_FULLSCREEN;
last_window_state_ = ui::mojom::WindowShowState::kFullscreen;
NotifyWindowEnterFullScreen();
} else {
last_window_state_ = ui::SHOW_STATE_NORMAL;
last_window_state_ = ui::mojom::WindowShowState::kNormal;
NotifyWindowRestore();
}
break;

5
shell/browser/ui/views/electron_views_delegate.cc
View file

@ -37,13 +37,14 @@ ViewsDelegate::~ViewsDelegate() = default;
void ViewsDelegate::SaveWindowPlacement(const views::Widget* window,
const std::string& window_name,
const gfx::Rect& bounds,
ui::WindowShowState show_state) {}
ui::mojom::WindowShowState show_state) {
}
bool ViewsDelegate::GetSavedWindowPlacement(
const views::Widget* widget,
const std::string& window_name,
gfx::Rect* bounds,
ui::WindowShowState* show_state) const {
ui::mojom::WindowShowState* show_state) const {
return false;
}

11
shell/browser/ui/views/electron_views_delegate.h
View file

@ -27,11 +27,12 @@ class ViewsDelegate : public views::ViewsDelegate {
void SaveWindowPlacement(const views::Widget* window,
const std::string& window_name,
const gfx::Rect& bounds,
ui::WindowShowState show_state) override;
bool GetSavedWindowPlacement(const views::Widget* widget,
const std::string& window_name,
gfx::Rect* bounds,
ui::WindowShowState* show_state) const override;
ui::mojom::WindowShowState show_state) override;
bool GetSavedWindowPlacement(
const views::Widget* widget,
const std::string& window_name,
gfx::Rect* bounds,
ui::mojom::WindowShowState* show_state) const override;
void NotifyMenuItemFocused(const std::u16string& menu_name,
const std::u16string& menu_item_name,
int item_index,