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

chore: bump chromium to 122.0.6236.2 (main) (#40871)

Browse source 
* chore: bump chromium in DEPS to 122.0.6223.0

* 5129828: Removes special cases for selenium-atoms dependencies.

5129828

* chore: fixup patch indices

* 5139789: Deduplicate BrowserContext's ResourceContext

5139789

* 5148579: Simplify SelectFileDialog::Listener

5148579

* 5134038: Code Health: Use string_view in base::i18n::BreakIterator::SetText

5134038

* 5137427: Code Health: Use string_view in SpellCheck::SpellCheckWord

5137427

* [libcxx] adds ranges::fold_left_with_iter and ranges::fold_left

Notable things in this commit:

* refactors `__indirect_binary_left_foldable`, making it slightly
different (but equivalent) to _`indirect-binary-left-foldable`_, which
improves readability (a [patch to the Working Paper][patch] was made)
* omits `__cpo` namespace, since it is not required for implementing
niebloids (a cleanup should happen in 2024)
* puts tests ensuring invocable robustness and dangling correctness
inside the correctness testing to ensure that the algorithms' results
are still correct

[patch]: https://github.com/cplusplus/draft/pull/6734

* chore: bump chromium in DEPS to 122.0.6224.0

* 5154766: [Refresh 2023] [GTK] Fix gap above toolbar with fractional scaling

5154766

* chore: fixup patch indices

* 5094458: Remove extra CGColorSpace parameters from skia and ui helpers

5094458

* chore: bump chromium in DEPS to 122.0.6226.0

* chore: update patches

* chore: bump chromium in DEPS to 122.0.6227.0

* chore: update patches

* chore: bump chromium in DEPS to 122.0.6228.0

* chore: update patches

* chore: bump chromium in DEPS to 122.0.6230.0

* chore: bump chromium in DEPS to 122.0.6232.0

* chore: bump chromium in DEPS to 122.0.6234.0

* chore: bump chromium in DEPS to 122.0.6236.2

* chore: update patches

* fix: remove --disable-color-correct-renderering

Per https://electronhq.slack.com/archives/CB6CG54DB/p1698444047862459 it is not used any more and was never documented.

* chore: add WEB_PRINTING to content permission converter

Unused in non-cros so no need to document

Ref: 5136178

* chore: Views is now vec<raw_ptr> instead of raw<T*>

Ref: 5140028

* spec: add Iterator to global intrinsics

---------

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
Co-authored-by: Samuel Attard <marshallofsound@electronjs.org>
This commit is contained in:
electron-roller[bot] 2024-01-11 19:33:40 +13:00 • committed by GitHub
parent f36ceae024
commit 2e4e6f10de
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
75 changed files with 274 additions and 522 deletions
Download patch file Download diff file Expand all files Collapse all files

9
shell/browser/electron_browser_context.cc
View file

@ -269,9 +269,6 @@ ElectronBrowserContext::~ElectronBrowserContext() {
BrowserContextDependencyManager::GetInstance()->DestroyBrowserContextServices(
this);
ShutdownStoragePartitions();
BrowserThread::DeleteSoon(BrowserThread::IO, FROM_HERE,
std::move(resource_context_));
}
void ElectronBrowserContext::InitPrefs() {
@ -365,12 +362,6 @@ int ElectronBrowserContext::GetMaxCacheSize() const {
return max_cache_size_;
}
content::ResourceContext* ElectronBrowserContext::GetResourceContext() {
if (!resource_context_)
resource_context_ = std::make_unique<content::ResourceContext>();
return resource_context_.get();
}
std::string ElectronBrowserContext::GetMediaDeviceIDSalt() {
if (!media_device_id_salt_.get())
media_device_id_salt_ = std::make_unique<MediaDeviceIDSalt>(prefs_.get());

2
shell/browser/electron_browser_context.h
View file

@ -148,7 +148,6 @@ class ElectronBrowserContext : public content::BrowserContext {
// content::BrowserContext:
base::FilePath GetPath() override;
bool IsOffTheRecord() override;
content::ResourceContext* GetResourceContext() override;
std::unique_ptr<content::ZoomLevelDelegate> CreateZoomLevelDelegate(
const base::FilePath& partition_path) override;
content::PushMessagingService* GetPushMessagingService() override;
@ -243,7 +242,6 @@ class ElectronBrowserContext : public content::BrowserContext {
blink::PermissionType permission_type);
scoped_refptr<ValueMapPrefStore> in_memory_pref_store_;
std::unique_ptr<content::ResourceContext> resource_context_;
std::unique_ptr<CookieChangeNotifier> cookie_change_notifier_;
std::unique_ptr<PrefService> prefs_;
std::unique_ptr<ElectronDownloadManagerDelegate> download_manager_delegate_;

20
shell/browser/file_select_helper.cc
View file

@ -77,16 +77,9 @@ FileSelectHelper::~FileSelectHelper() {
select_file_dialog_->ListenerDestroyed();
}
void FileSelectHelper::FileSelected(const base::FilePath& path,
void FileSelectHelper::FileSelected(const ui::SelectedFileInfo& file,
int index,
void* params) {
FileSelectedWithExtraInfo(ui::SelectedFileInfo(path, path), index, params);
}
void FileSelectHelper::FileSelectedWithExtraInfo(
const ui::SelectedFileInfo& file,
int index,
void* params) {
if (!render_frame_host_) {
RunFileChooserEnd();
return;
@ -101,19 +94,10 @@ void FileSelectHelper::FileSelectedWithExtraInfo(
std::vector<ui::SelectedFileInfo> files;
files.push_back(file);
MultiFilesSelectedWithExtraInfo(files, params);
MultiFilesSelected(files, params);
}
void FileSelectHelper::MultiFilesSelected(
const std::vector<base::FilePath>& files,
void* params) {
std::vector<ui::SelectedFileInfo> selected_files =
ui::FilePathListToSelectedFileInfoList(files);
MultiFilesSelectedWithExtraInfo(selected_files, params);
}
void FileSelectHelper::MultiFilesSelectedWithExtraInfo(
const std::vector<ui::SelectedFileInfo>& files,
void* params) {
#if BUILDFLAG(IS_MAC)

10
shell/browser/file_select_helper.h
View file

@ -84,17 +84,11 @@ class FileSelectHelper : public base::RefCountedThreadSafe<
void RunFileChooserEnd();
// SelectFileDialog::Listener overrides.
void FileSelected(const base::FilePath& path,
void FileSelected(const ui::SelectedFileInfo& file,
int index,
void* params) override;
void FileSelectedWithExtraInfo(const ui::SelectedFileInfo& file,
int index,
void* params) override;
void MultiFilesSelected(const std::vector<base::FilePath>& files,
void MultiFilesSelected(const std::vector<ui::SelectedFileInfo>& files,
void* params) override;
void MultiFilesSelectedWithExtraInfo(
const std::vector<ui::SelectedFileInfo>& files,
void* params) override;
void FileSelectionCanceled(void* params) override;
// content::WebContentsObserver overrides.

3
shell/browser/notifications/mac/cocoa_notification.mm
View file

@ -45,8 +45,7 @@ void CocoaNotification::Show(const NotificationOptions& options) {
}
if (!options.icon.drawsNothing()) {
NSImage* image = skia::SkBitmapToNSImageWithColorSpace(
options.icon, base::mac::GetGenericRGBColorSpace());
NSImage* image = skia::SkBitmapToNSImage(options.icon);
[notification_ setContentImage:image];
}

3
shell/browser/ui/message_box_mac.mm
View file

@ -97,8 +97,7 @@ NSAlert* CreateNSAlert(const MessageBoxSettings& settings) {
}
if (!settings.icon.isNull()) {
NSImage* image = skia::SkBitmapToNSImageWithColorSpace(
*settings.icon.bitmap(), base::mac::GetGenericRGBColorSpace());
NSImage* image = skia::SkBitmapToNSImage(*settings.icon.bitmap());
[alert setIcon:image];
}

10
shell/browser/ui/views/menu_bar.cc
View file

@ -54,14 +54,14 @@ void MenuBar::SetMenu(ElectronMenuModel* model) {
}
void MenuBar::SetAcceleratorVisibility(bool visible) {
for (auto* child : GetChildrenInZOrder())
for (views::View* child : GetChildrenInZOrder())
static_cast<SubmenuButton*>(child)->SetAcceleratorVisibility(visible);
}
MenuBar::View* MenuBar::FindAccelChild(char16_t key) {
if (key == 0)
return nullptr;
for (auto* child : GetChildrenInZOrder()) {
for (views::View* child : GetChildrenInZOrder()) {
if (static_cast<SubmenuButton*>(child)->accelerator() == key)
return child;
}
@ -188,7 +188,7 @@ void MenuBar::ButtonPressed(size_t id, const ui::Event& event) {
}
SubmenuButton* source = nullptr;
for (auto* child : children()) {
for (views::View* child : children()) {
auto* button = static_cast<SubmenuButton*>(child);
int button_id = button->GetID();
if (button_id >= 0 && static_cast<size_t>(button_id) == id) {
@ -252,7 +252,7 @@ void MenuBar::UpdateViewColors() {
#if BUILDFLAG(IS_LINUX)
const auto& textColor =
window_->IsFocused() ? enabled_color_ : disabled_color_;
for (auto* child : GetChildrenInZOrder()) {
for (views::View* child : GetChildrenInZOrder()) {
auto* button = static_cast<SubmenuButton*>(child);
button->SetTextColor(views::Button::STATE_NORMAL, textColor);
button->SetTextColor(views::Button::STATE_DISABLED, disabled_color_);
@ -261,7 +261,7 @@ void MenuBar::UpdateViewColors() {
button->SetUnderlineColor(textColor);
}
#elif BUILDFLAG(IS_WIN)
for (auto* child : GetChildrenInZOrder()) {
for (views::View* child : GetChildrenInZOrder()) {
auto* button = static_cast<SubmenuButton*>(child);
button->SetUnderlineColor(color_utils::GetSysSkColor(COLOR_MENUTEXT));
}