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

chore: bump chromium to 137.0.7128.1 (main) (#46482)

Browse source 
* chore: bump chromium in DEPS to 137.0.7107.0

* chore: bump chromium in DEPS to 137.0.7109.0

* chore: bump chromium in DEPS to 137.0.7111.0

* chore: bump chromium in DEPS to 137.0.7113.0

* 6384240: Remove double-declaration for accessibility on macOS | 6384240

* 6422872: Remove unused includes in isolation_info_mojom_traits.h | 6422872

* chore: update patches

* 6400733: Avoid ipc_message_macros.h usage in some foo_param_traits_macros.h files | 6400733

* chore: update patches

* 6423410: Enable unsafe buffer warnings for chromium, try #3. | 6423410

* chore: iwyu

* refactor: prefer value initialization over memset()

From the looks up upstream commits in base/, it looks like memset()
could trigger `-Wunsafe-buffer-usage` warnings soon?

Value initialization is more C++ish and less error-prone anyway,
due to memset()'s easily swappable parameters.

* refactor: NotifyIcon::InitIconData() returns a NOTIFYICONDATA

This follows F.20 in the C++ Core Guidelines and also removes the need
for memset()

* 6423410: Enable unsafe buffer warnings for chromium, try #3. | 6423410

remove all uses of:

- strcmp()

* fixup!  6423410: Enable unsafe buffer warnings for chromium, try #3. | 6423410

* 6433203: Add a PassKey to RegisterDeleteDelegateCallback(). | 6433203

* chore: bump chromium in DEPS to 137.0.7115.0

* 6387077: [PermissionOptions] Generalize PermissionRequestDescription | 6387077

* chore: update patches

* 6387077: [PermissionOptions] Generalize PermissionRequestDescription | 6387077

* fix: add pragma for MacSDK unsafe buffers | 6423410: Enable unsafe buffer warnings for chromium, try #3. | 6423410

* chore: bump chromium in DEPS to 137.0.7117.0

* chore: update patches

* chore: update filesnames.libcxx.gni

* 6431756: Replace SetOwnedByWidget() bool arg with a PassKey. | 6431756

* 6387077: [PermissionOptions] Generalize PermissionRequestDescription | 6387077

* 6428345: Remove ExtensionService usage from ChromeExtensionRegistrarDelegate | 6428345

* 6384315: Migrate extensions_enabled from ExtensionService to Registrar | 6384315

* 6428749: [extensions] Refactor ExtensionService for AddNewAndUpdateExtension. | 6428749

* chore: bump chromium in DEPS to 137.0.7119.0

* 6440290: corner-shape: support inset shadow | 6440290

* 6429230: FSA: Move blocked paths to the PermissionContext class | 6429230

* chore: update patches

* chore: bump chromium in DEPS to 137.0.7121.0

* chore: update patches

* fix: partially revert 6443473: Remove ItemDelete from the Mac version of AppleKeychain | 6443473

* fix: update filenames.libcxx.gni

* chore: bump chromium in DEPS to 137.0.7123.0

* chore: update patches

* chore: "grandfather in" electron views too

Lock further access to View::set_owned_by_client() | 6448510

* chore: update feat_corner_smoothing_css_rule_and_blink_painting.patch

corner-shape: support inset shadow | 6440290

* refactor: grandfather in AutofillPopupView as a subclass of WidgetDelegateView

Add a PassKey for std::make_unique<WidgetDelegateView>() | 6442265

* Provide dbus appmenu information on Wayland | 6405535

* [extensions] Move OnExtensionInstalled out of ExtensionService. | 6443325

* refactor: grandfather in NativeWindowViews for delete callbacks

6433203: Add a PassKey to RegisterDeleteDelegateCallback(). | 6433203

* chore: merge the four "grandfather" patches into one

* [A11yPerformance] Remove IsAccessibilityAllowed() | 6404386: [A11yPerformance] Remove IsAccessibilityAllowed() | 6404386

NB: the changes here are copied from the upstream changes in
chrome/browser/ui/webui/accessibility/accessibility_ui.cc

* 6420753: [PermissionOptions] Use PermissionDescriptorPtr in PermissionController | 6420753

* 6429573: [accessibility] Move mode change out of AccessibilityNotificationWaiter | 6429573

* chore: e patches all

* 6419936: [win] Change ScreenWin public static methods to virtual | 6419936

* 6423410: Enable unsafe buffer warnings for chromium, try #3. | 6423410

remove all uses of:

- fprintf()
- fputs()
- snprintf()
- vsnprintf()

* fix: size conversion FTBFS on Win

* 6423410: Enable unsafe buffer warnings for chromium, try #3. | 6423410

remove all uses of:

- wcscpy_s()

* 6423410: Enable unsafe buffer warnings for chromium, try #3. | 6423410

remove all uses of:

- wcsncpy_s()

* chore: update mas_avoid_private_macos_api_usage.patch.patch

6394283: Remove double-declaration for accessibility on iOS | 6394283

Lots of context shear in this commit but the only interesting part is:

-+  return nullptr;
++  return {};

Which is needed because the return type is sometimes not a pointer.

* chore: e patches all

* chore: disable -Wmacro-redefined warning in electron_main_win.cc

* chore: bump chromium in DEPS to 137.0.7123.5

* refactor: patch electron PermissionTypes into blink

6387077: [PermissionOptions] Generalize PermissionRequestDescription | 6387077

* chore: e patches all

* chore: remove the box_painter_base.cc part of feat_corner_smoothing_css_rule_and_blink_painting.patch

as per code review @ https://github.com/electron/electron/pull/46482#pullrequestreview-2777338370

* test: enable window-smaller-than-64x64 test on Linux

* chore: bump chromium in DEPS to 137.0.7124.1

* chore: bump chromium in DEPS to 137.0.7125.1

* chore: bump chromium in DEPS to 137.0.7127.3

* 6459201: [Extensions] Remove ExtensionSystem::FinishDelayedInstallationIfReady() | 6459201

* 6454796: [Extensions] Move (most) registrar delayed install logic to //extensions | 6454796

* chore: bump chromium in DEPS to 137.0.7128.1

* chore: e patches all

* chore: node ./script/gen-libc++-filenames.js

* [views] Gate DesktopWindowTreeHostWin::window_enlargement_ behind flag

Refs 6428649

* feat: allow opt-out animated_content_sampler.

Refs 6438681

* Trigger CI

---------

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: Keeley Hammond <khammond@slack-corp.com>
Co-authored-by: Charles Kerr <charles@charleskerr.com>
Co-authored-by: Keeley Hammond <vertedinde@electronjs.org>
Co-authored-by: deepak1556 <hop2deep@gmail.com>
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
This commit is contained in:
electron-roller[bot] 2025-04-22 15:53:29 -04:00 • committed by GitHub
parent d0e13cc262
commit dd03cceda0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
145 changed files with 1414 additions and 1780 deletions
Download patch file Download diff file Expand all files Collapse all files

71
shell/browser/ui/win/notify_icon.cc
View file

@ -6,6 +6,7 @@
#include <objbase.h>
#include "base/containers/span.h"
#include "base/logging.h"
#include "base/strings/string_util_win.h"
#include "base/strings/utf_string_conversions.h"
@ -49,11 +50,10 @@ NotifyIcon::NotifyIcon(NotifyIconHost* host,
: host_(host), icon_id_(id), window_(window), message_id_(message) {
guid_ = guid;
is_using_guid_ = guid != GUID_DEFAULT;
NOTIFYICONDATA icon_data;
InitIconData(&icon_data);
NOTIFYICONDATA icon_data = InitIconData();
icon_data.uFlags |= NIF_MESSAGE;
icon_data.uCallbackMessage = message_id_;
BOOL result = Shell_NotifyIcon(NIM_ADD, &icon_data);
const BOOL result = Shell_NotifyIcon(NIM_ADD, &icon_data);
// This can happen if the explorer process isn't running when we try to
// create the icon for some reason (for example, at startup).
if (!result)
@ -63,8 +63,7 @@ NotifyIcon::NotifyIcon(NotifyIconHost* host,
NotifyIcon::~NotifyIcon() {
// Remove our icon.
host_->Remove(this);
NOTIFYICONDATA icon_data;
InitIconData(&icon_data);
NOTIFYICONDATA icon_data = InitIconData();
Shell_NotifyIcon(NIM_DELETE, &icon_data);
}
@ -110,11 +109,12 @@ void NotifyIcon::HandleMouseExited(int modifiers) {
}
void NotifyIcon::ResetIcon() {
NOTIFYICONDATA icon_data;
InitIconData(&icon_data);
// Delete any previously existing icon.
NOTIFYICONDATA icon_data = InitIconData();
Shell_NotifyIcon(NIM_DELETE, &icon_data);
InitIconData(&icon_data);
// Update the icon.
icon_data = InitIconData();
icon_data.uFlags |= NIF_MESSAGE;
icon_data.uCallbackMessage = message_id_;
icon_data.hIcon = icon_.get();
@ -132,8 +132,7 @@ void NotifyIcon::SetImage(HICON image) {
icon_ = base::win::ScopedGDIObject<HICON>(CopyIcon(image));
// Create the icon.
NOTIFYICONDATA icon_data;
InitIconData(&icon_data);
NOTIFYICONDATA icon_data = InitIconData();
icon_data.uFlags |= NIF_ICON;
icon_data.hIcon = image;
BOOL result = Shell_NotifyIcon(NIM_MODIFY, &icon_data);
@ -146,23 +145,34 @@ void NotifyIcon::SetPressedImage(HICON image) {
// pressed status icons.
}
template <typename CharT, size_t N>
static void CopyStringToBuf(CharT (&tgt_buf)[N],
const std::basic_string<CharT> src_str) {
if constexpr (N < 1U)
return;
const auto src = base::span{src_str};
const auto n_chars = std::min(src.size(), N - 1U);
auto tgt = base::span{tgt_buf};
tgt.first(n_chars).copy_from(src.first(n_chars));
tgt[n_chars] = CharT{}; // zero-terminate the string
}
void NotifyIcon::SetToolTip(const std::string& tool_tip) {
// Create the icon.
NOTIFYICONDATA icon_data;
InitIconData(&icon_data);
NOTIFYICONDATA icon_data = InitIconData();
icon_data.uFlags |= NIF_TIP;
wcsncpy_s(icon_data.szTip, base::UTF8ToWide(tool_tip).c_str(), _TRUNCATE);
CopyStringToBuf(icon_data.szTip, base::UTF8ToWide(tool_tip));
BOOL result = Shell_NotifyIcon(NIM_MODIFY, &icon_data);
if (!result)
LOG(WARNING) << "Unable to set tooltip for status tray icon";
}
void NotifyIcon::DisplayBalloon(const BalloonOptions& options) {
NOTIFYICONDATA icon_data;
InitIconData(&icon_data);
NOTIFYICONDATA icon_data = InitIconData();
icon_data.uFlags |= NIF_INFO;
wcsncpy_s(icon_data.szInfoTitle, base::as_wcstr(options.title), _TRUNCATE);
wcsncpy_s(icon_data.szInfo, base::as_wcstr(options.content), _TRUNCATE);
CopyStringToBuf(icon_data.szInfoTitle, base::AsWString(options.title));
CopyStringToBuf(icon_data.szInfo, base::AsWString(options.content));
icon_data.uTimeout = 0;
icon_data.hBalloonIcon = options.icon;
icon_data.dwInfoFlags = ConvertIconType(options.icon_type);
@ -182,8 +192,7 @@ void NotifyIcon::DisplayBalloon(const BalloonOptions& options) {
}
void NotifyIcon::RemoveBalloon() {
NOTIFYICONDATA icon_data;
InitIconData(&icon_data);
NOTIFYICONDATA icon_data = InitIconData();
icon_data.uFlags |= NIF_INFO;
BOOL result = Shell_NotifyIcon(NIM_MODIFY, &icon_data);
@ -192,8 +201,7 @@ void NotifyIcon::RemoveBalloon() {
}
void NotifyIcon::Focus() {
NOTIFYICONDATA icon_data;
InitIconData(&icon_data);
NOTIFYICONDATA icon_data = InitIconData();
BOOL result = Shell_NotifyIcon(NIM_SETFOCUS, &icon_data);
if (!result)
@ -242,8 +250,7 @@ void NotifyIcon::SetContextMenu(raw_ptr<ElectronMenuModel> menu_model) {
}
gfx::Rect NotifyIcon::GetBounds() {
NOTIFYICONIDENTIFIER icon_id;
memset(&icon_id, 0, sizeof(NOTIFYICONIDENTIFIER));
NOTIFYICONIDENTIFIER icon_id = {};
icon_id.uID = icon_id_;
icon_id.hWnd = window_;
icon_id.cbSize = sizeof(NOTIFYICONIDENTIFIER);
@ -253,18 +260,20 @@ gfx::Rect NotifyIcon::GetBounds() {
RECT rect = {0};
Shell_NotifyIconGetRect(&icon_id, &rect);
return display::win::ScreenWin::ScreenToDIPRect(window_, gfx::Rect(rect));
return display::win::GetScreenWin()->ScreenToDIPRect(window_,
gfx::Rect{rect});
}
void NotifyIcon::InitIconData(NOTIFYICONDATA* icon_data) {
memset(icon_data, 0, sizeof(NOTIFYICONDATA));
icon_data->cbSize = sizeof(NOTIFYICONDATA);
icon_data->hWnd = window_;
icon_data->uID = icon_id_;
NOTIFYICONDATA NotifyIcon::InitIconData() const {
NOTIFYICONDATA icon_data = {};
icon_data.cbSize = sizeof(NOTIFYICONDATA);
icon_data.hWnd = window_;
icon_data.uID = icon_id_;
if (is_using_guid_) {
icon_data->uFlags = NIF_GUID;
icon_data->guidItem = guid_;
icon_data.uFlags = NIF_GUID;
icon_data.guidItem = guid_;
}
return icon_data;
}
} // namespace electron

2
shell/browser/ui/win/notify_icon.h
View file

@ -76,7 +76,7 @@ class NotifyIcon : public TrayIcon {
base::WeakPtr<NotifyIcon> GetWeakPtr() { return weak_factory_.GetWeakPtr(); }
private:
void InitIconData(NOTIFYICONDATA* icon_data);
NOTIFYICONDATA InitIconData() const;
// The tray that owns us. Weak.
raw_ptr<NotifyIconHost> host_;

18
shell/browser/ui/win/taskbar_host.cc
View file

@ -8,6 +8,7 @@
#include <array>
#include <string>
#include "base/containers/span.h"
#include "base/strings/utf_string_conversions.h"
#include "base/win/scoped_gdi_object.h"
#include "shell/browser/native_window.h"
@ -52,6 +53,18 @@ bool GetThumbarButtonFlags(const std::vector<std::string>& flags,
return true;
}
template <typename CharT, size_t N>
void CopyStringToBuf(CharT (&tgt_buf)[N],
const std::basic_string<CharT> src_str) {
if constexpr (N < 1U)
return;
const auto src = base::span{src_str};
const auto n_chars = std::min(src.size(), N - 1U);
auto tgt = base::span{tgt_buf};
tgt.first(n_chars).copy_from(src.first(n_chars));
tgt[n_chars] = CharT{}; // zero-terminate the string
}
} // namespace
TaskbarHost::ThumbarButton::ThumbarButton() = default;
@ -109,8 +122,7 @@ bool TaskbarHost::SetThumbarButtons(HWND window,
// Set tooltip.
if (!button.tooltip.empty()) {
thumb_button.dwMask |= THB_TOOLTIP;
wcsncpy_s(thumb_button.szTip, base::UTF8ToWide(button.tooltip).c_str(),
_TRUNCATE);
CopyStringToBuf(thumb_button.szTip, base::UTF8ToWide(button.tooltip));
}
// Save callback.
@ -234,7 +246,7 @@ bool TaskbarHost::SetThumbnailClip(HWND window, const gfx::Rect& region) {
return SUCCEEDED(taskbar_->SetThumbnailClip(window, nullptr));
} else {
RECT rect =
display::win::ScreenWin::DIPToScreenRect(window, region).ToRECT();
display::win::GetScreenWin()->DIPToScreenRect(window, region).ToRECT();
return SUCCEEDED(taskbar_->SetThumbnailClip(window, &rect));
}
}