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

chore: bump chromium to 106.0.5216.0 (main) (#34993)

Browse source
This commit is contained in:
electron-roller[bot] 2022-08-17 11:35:53 -07:00 • committed by GitHub
parent e15e66f229
commit 97b353a30a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
114 changed files with 886 additions and 779 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -143,7 +143,7 @@ ElectronMenuModel* ModelForMenuItem(DbusmenuMenuitem* item) {
g_object_get_data(G_OBJECT(item), "model"));
}
bool GetMenuItemID(DbusmenuMenuitem* item, int* id) {
bool GetMenuItemID(DbusmenuMenuitem* item, size_t* id) {
gpointer id_ptr = g_object_get_data(G_OBJECT(item), "menu-id");
if (id_ptr != nullptr) {
*id = GPOINTER_TO_INT(id_ptr) - 1;
@ -162,7 +162,7 @@ void SetMenuItemID(DbusmenuMenuitem* item, int id) {
std::string GetMenuModelStatus(ElectronMenuModel* model) {
std::string ret;
for (int i = 0; i < model->GetItemCount(); ++i) {
for (size_t i = 0; i < model->GetItemCount(); ++i) {
int status = model->GetTypeAt(i) | (model->IsVisibleAt(i) << 3) |
(model->IsEnabledAt(i) << 4) |
(model->IsItemCheckedAt(i) << 5);
@ -231,7 +231,7 @@ void GlobalMenuBarX11::OnWindowUnmapped() {
void GlobalMenuBarX11::BuildMenuFromModel(ElectronMenuModel* model,
DbusmenuMenuitem* parent) {
for (int i = 0; i < model->GetItemCount(); ++i) {
for (size_t i = 0; i < model->GetItemCount(); ++i) {
DbusmenuMenuitem* item = menuitem_new();
menuitem_property_set_bool(item, kPropertyVisible, model->IsVisibleAt(i));
@ -309,14 +309,14 @@ void GlobalMenuBarX11::RegisterAccelerator(DbusmenuMenuitem* item,
void GlobalMenuBarX11::OnItemActivated(DbusmenuMenuitem* item,
unsigned int timestamp) {
int id;
size_t id;
ElectronMenuModel* model = ModelForMenuItem(item);
if (model && GetMenuItemID(item, &id))
model->ActivatedAt(id, 0);
}
void GlobalMenuBarX11::OnSubMenuShow(DbusmenuMenuitem* item) {
int id;
size_t id;
ElectronMenuModel* model = ModelForMenuItem(item);
if (!model || !GetMenuItemID(item, &id))
return;

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

@ -81,7 +81,7 @@ void MenuBar::ActivateAccelerator(char16_t key) {
static_cast<SubmenuButton*>(child)->Activate(nullptr);
}
int MenuBar::GetItemCount() const {
size_t MenuBar::GetItemCount() const {
return menu_model_ ? menu_model_->GetItemCount() : 0;
}
@ -92,7 +92,7 @@ bool MenuBar::GetMenuButtonFromScreenPoint(const gfx::Point& screenPoint,
return false;
auto children = GetChildrenInZOrder();
for (int i = 0, n = children.size(); i < n; ++i) {
for (size_t i = 0, n = children.size(); i < n; ++i) {
if (children[i]->GetBoundsInScreen().Contains(screenPoint) &&
(menu_model_->GetTypeAt(i) == ElectronMenuModel::TYPE_SUBMENU)) {
*menu_model = menu_model_->GetSubmenuModelAt(i);
@ -174,7 +174,7 @@ const char* MenuBar::GetClassName() const {
return kViewClassName;
}
void MenuBar::ButtonPressed(int id, const ui::Event& event) {
void MenuBar::ButtonPressed(size_t id, const ui::Event& event) {
// Hide the accelerator when a submenu is activated.
SetAcceleratorVisibility(pane_has_focus());
@ -193,7 +193,8 @@ void MenuBar::ButtonPressed(int id, const ui::Event& event) {
SubmenuButton* source = nullptr;
for (auto* child : children()) {
auto* button = static_cast<SubmenuButton*>(child);
if (button->GetID() == id) {
int button_id = button->GetID();
if (button_id >= 0 && static_cast<size_t>(button_id) == id) {
source = button;
break;
}
@ -222,7 +223,7 @@ void MenuBar::RefreshColorCache(const ui::NativeTheme* theme) {
void MenuBar::RebuildChildren() {
RemoveAllChildViews();
for (int i = 0, n = GetItemCount(); i < n; ++i) {
for (size_t i = 0, n = GetItemCount(); i < n; ++i) {
auto* button = new SubmenuButton(
base::BindRepeating(&MenuBar::ButtonPressed, base::Unretained(this), i),
menu_model_->GetLabelAt(i), background_color_);

4
shell/browser/ui/views/menu_bar.h
View file

@ -43,7 +43,7 @@ class MenuBar : public views::AccessiblePaneView,
void ActivateAccelerator(char16_t key);
// Returns there are how many items in the root menu.
int GetItemCount() const;
size_t GetItemCount() const;
// Get the menu under specified screen point.
bool GetMenuButtonFromScreenPoint(const gfx::Point& point,
@ -71,7 +71,7 @@ class MenuBar : public views::AccessiblePaneView,
const char* GetClassName() const override;
void GetAccessibleNodeData(ui::AXNodeData* node_data) override;
void ButtonPressed(int id, const ui::Event& event);
void ButtonPressed(size_t id, const ui::Event& event);
void RebuildChildren();
void UpdateViewColors();

2
shell/browser/ui/views/menu_model_adapter.cc
View file

@ -14,7 +14,7 @@ MenuModelAdapter::~MenuModelAdapter() = default;
bool MenuModelAdapter::GetAccelerator(int id,
ui::Accelerator* accelerator) const {
ui::MenuModel* model = menu_model_;
int index = 0;
size_t index = 0;
if (ui::MenuModel::GetModelAndIndexForCommandId(id, &model, &index)) {
return static_cast<ElectronMenuModel*>(model)->GetAcceleratorAtWithParams(
index, true, accelerator);