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

chore: bump chromium to 134.0.6998.10 (main) (#45564)

Browse source 
* chore: bump chromium to 134.0.6992.0

* chore: add BrowserProcessImpl::CreateGlobalFeaturesForTesting() stub

Xref: 6216193

Remove GlobalFeatures from TestingBrowserProcess::Init

* chore: bump chromium to 134.0.6994.0

* 6208630: Mac sandbox: don't use protobuf for policy serialization | 6208630

* [PDF] Remove HasUnsupportedFeature Mojo interface

Xref: 6220800

* 6217444: Remove scoped_gdi_object.h type aliases. | 6217444

* chore: bump chromium to 134.0.6998.10

* 6221378: Revert [OBC] Exclude Aliasing Cookies in FilterCookiesWithOptions() | 6221378

* Update ExtensionPrefs::GetDisableReasons to return DisableReasonSet

Xref: 6218840

change copied from 6218840 extensions/shell/browser/shell_extension_loader.cc

* 6218402: Typemap ui.gfx.DXGIHandle <=> gfx::DXGIHandle | 6218402

* chore: disable flaky contentTracing test

not new to this roll; it is happening in main as well

* fixup! chore: disable flaky contentTracing test

---------

Co-authored-by: alice <alice@makenotion.com>
This commit is contained in:
Charles Kerr 2025-02-11 17:26:39 -06:00 • committed by GitHub
parent 9f47c9a051
commit aa06b065c0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
17 changed files with 69 additions and 94 deletions
Download patch file Download diff file Expand all files Collapse all files

6
shell/browser/api/electron_api_cookies.cc
View file

@ -250,11 +250,7 @@ const std::string InclusionStatusToString(net::CookieInclusionStatus status) {
{Reason::EXCLUDE_THIRD_PARTY_PHASEOUT,
"The cookie is blocked for third-party cookie phaseout."},
{Reason::EXCLUDE_NO_COOKIE_CONTENT,
"The cookie contains no content or only whitespace."},
{Reason::EXCLUDE_ALIASING,
"Cookie aliases that of another with a different source_port or "
"source scheme. I.e.: Two or more cookies share the same name "
"but have different ports/schemes."}});
"The cookie contains no content or only whitespace."}});
static_assert(
Reasons.size() ==
net::CookieInclusionStatus::ExclusionReasonBitset::kValueCount,

1
shell/browser/browser_process_impl.h
View file

@ -70,6 +70,7 @@ class BrowserProcessImpl : public BrowserProcess {
// BrowserProcess
BuildState* GetBuildState() override;
GlobalFeatures* GetFeatures() override;
void CreateGlobalFeaturesForTesting() override {}
void EndSession() override {}
void FlushLocalStateAndReply(base::OnceClosure reply) override {}
bool IsShuttingDown() override;

1
shell/browser/electron_pdf_document_helper_client.h
View file

@ -20,7 +20,6 @@ class ElectronPDFDocumentHelperClient : public pdf::PDFDocumentHelperClient {
// pdf::PDFDocumentHelperClient
void UpdateContentRestrictions(content::RenderFrameHost* render_frame_host,
int content_restrictions) override;
void OnPDFHasUnsupportedFeature(content::WebContents* contents) override {}
void OnSaveURL(content::WebContents* contents) override {}
void SetPluginCanSave(content::RenderFrameHost* render_frame_host,
bool can_save) override;

3
shell/browser/extensions/electron_extension_loader.cc
View file

@ -181,8 +181,7 @@ void ElectronExtensionLoader::PreAddExtension(const Extension* extension,
extension_prefs->RemoveDisableReason(extension->id(),
disable_reason::DISABLE_RELOAD);
// Only re-enable the extension if there are no other disable reasons.
if (extension_prefs->GetDisableReasons(extension->id()) ==
disable_reason::DISABLE_NONE) {
if (extension_prefs->GetDisableReasons(extension->id()).empty()) {
extension_prefs->SetExtensionEnabled(extension->id());
}
}

4
shell/browser/native_window_views.cc
View file

@ -1636,8 +1636,8 @@ gfx::Rect NativeWindowViews::WindowBoundsToContentBounds(
#if BUILDFLAG(IS_WIN)
void NativeWindowViews::SetIcon(HICON window_icon, HICON app_icon) {
// We are responsible for storing the images.
window_icon_ = base::win::ScopedHICON(CopyIcon(window_icon));
app_icon_ = base::win::ScopedHICON(CopyIcon(app_icon));
window_icon_ = base::win::ScopedGDIObject<HICON>(CopyIcon(window_icon));
app_icon_ = base::win::ScopedGDIObject<HICON>(CopyIcon(app_icon));
HWND hwnd = GetAcceleratedWidget();
SendMessage(hwnd, WM_SETICON, ICON_SMALL,

4
shell/browser/native_window_views.h
View file

@ -277,8 +277,8 @@ class NativeWindowViews : public NativeWindow,
gfx::Rect restore_bounds_;
// The icons of window and taskbar.
base::win::ScopedHICON window_icon_;
base::win::ScopedHICON app_icon_;
base::win::ScopedGDIObject<HICON> window_icon_;
base::win::ScopedGDIObject<HICON> app_icon_;
// The set of windows currently forwarding mouse messages.
static std::set<NativeWindowViews*> forwarding_windows_;

2
shell/browser/osr/osr_video_consumer.cc
View file

@ -99,7 +99,7 @@ void OffScreenVideoConsumer::OnFrameCaptured(
#if BUILDFLAG(IS_WIN)
texture.shared_texture_handle =
reinterpret_cast<uintptr_t>(gmb_handle.dxgi_handle.Get());
reinterpret_cast<uintptr_t>(gmb_handle.dxgi_handle().buffer_handle());
#elif BUILDFLAG(IS_APPLE)
texture.shared_texture_handle =
reinterpret_cast<uintptr_t>(gmb_handle.io_surface.get());

2
shell/browser/ui/message_box_win.cc
View file

@ -176,7 +176,7 @@ DialogResult ShowTaskDialogWstr(gfx::AcceleratedWidget parent,
config.pszWindowTitle = base::as_wcstr(title);
}
base::win::ScopedHICON hicon;
base::win::ScopedGDIObject<HICON> hicon;
if (!icon.isNull()) {
hicon = IconUtil::CreateHICONFromSkBitmap(*icon.bitmap());
config.dwFlags |= TDF_USE_HICON_MAIN;

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

@ -129,7 +129,7 @@ void NotifyIcon::ResetIcon() {
}
void NotifyIcon::SetImage(HICON image) {
icon_ = base::win::ScopedHICON(CopyIcon(image));
icon_ = base::win::ScopedGDIObject<HICON>(CopyIcon(image));
// Create the icon.
NOTIFYICONDATA icon_data;

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

@ -91,7 +91,7 @@ class NotifyIcon : public TrayIcon {
UINT message_id_;
// The currently-displayed icon for the window.
base::win::ScopedHICON icon_;
base::win::ScopedGDIObject<HICON> icon_;
// The context menu.
raw_ptr<ElectronMenuModel> menu_model_ = nullptr;

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

@ -73,7 +73,8 @@ bool TaskbarHost::SetThumbarButtons(HWND window,
// The number of buttons in thumbar can not be changed once it is created,
// so we have to claim kMaxButtonsCount buttons initially in case users add
// more buttons later.
auto icons = std::array<base::win::ScopedHICON, kMaxButtonsCount>{};
auto icons =
std::array<base::win::ScopedGDIObject<HICON>, kMaxButtonsCount>{};
auto thumb_buttons = std::array<THUMBBUTTON, kMaxButtonsCount>{};
for (size_t i = 0U; i < kMaxButtonsCount; ++i) {

5
shell/common/api/electron_api_native_image.cc
View file

@ -102,7 +102,8 @@ bool IsTemplateFilename(const base::FilePath& path) {
#endif
#if BUILDFLAG(IS_WIN)
base::win::ScopedHICON ReadICOFromPath(int size, const base::FilePath& path) {
base::win::ScopedGDIObject<HICON> ReadICOFromPath(int size,
const base::FilePath& path) {
// If file is in asar archive, we extract it to a temp file so LoadImage can
// load it.
base::FilePath asar_path, relative_path;
@ -115,7 +116,7 @@ base::win::ScopedHICON ReadICOFromPath(int size, const base::FilePath& path) {
}
// Load the icon from file.
return base::win::ScopedHICON(
return base::win::ScopedGDIObject<HICON>(
static_cast<HICON>(LoadImage(nullptr, image_path.value().c_str(),
IMAGE_ICON, size, size, LR_LOADFROMFILE)));
}

2
shell/common/api/electron_api_native_image.h
View file

@ -134,7 +134,7 @@ class NativeImage final : public gin::Wrappable<NativeImage> {
base::FilePath hicon_path_;
// size -> hicon
base::flat_map<int, base::win::ScopedHICON> hicons_;
base::flat_map<int, base::win::ScopedGDIObject<HICON>> hicons_;
#endif
gfx::Image image_;

2
shell/common/api/electron_api_native_image_win.cc
View file

@ -90,7 +90,7 @@ v8::Local<v8::Promise> NativeImage::CreateThumbnailFromPath(
icon_info.hbmMask = hBitmap;
icon_info.hbmColor = hBitmap;
base::win::ScopedHICON icon(CreateIconIndirect(&icon_info));
base::win::ScopedGDIObject<HICON> icon(CreateIconIndirect(&icon_info));
SkBitmap skbitmap = IconUtil::CreateSkBitmapFromHICON(icon.get());
gfx::ImageSkia image_skia =
gfx::ImageSkia::CreateFromBitmap(skbitmap, 1.0 /*scale factor*/);