bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium version 90.0.4430.0 (#857950)

Browse Source 
- Linux ARM builds require use_vaapi=false (see https://crbug.com/1185348)
- Windows official builds require use_thin_lto=false (see https://crbug.com/1177001)
This commit is contained in:
Marshall Greenblatt
2021-03-04 17:36:57 -05:00
parent 1587d6da03
commit 74db00fc89
134 changed files with 1245 additions and 1204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
libcef/browser/menu_model_impl.cc
View File

@ -12,7 +12,7 @@
#include "base/bind.h"
#include "base/logging.h"
#include "content/public/common/menu_item.h"
#include "third_party/blink/public/mojom/context_menu/context_menu.mojom.h"
#include "ui/base/accelerators/accelerator.h"
#include "ui/base/models/image_model.h"
#include "ui/gfx/geometry/point.h"
@ -927,37 +927,40 @@ bool CefMenuModelImpl::VerifyRefCount() {
return true;
}
void CefMenuModelImpl::AddMenuItem(const content::MenuItem& menu_item) {
void CefMenuModelImpl::AddMenuItem(
const blink::mojom::CustomContextMenuItem& menu_item) {
const int command_id = static_cast<int>(menu_item.action);
switch (menu_item.type) {
case content::MenuItem::OPTION:
case blink::mojom::CustomContextMenuItemType::kOption:
AddItem(command_id, menu_item.label);
break;
case content::MenuItem::CHECKABLE_OPTION:
case blink::mojom::CustomContextMenuItemType::kCheckableOption:
AddCheckItem(command_id, menu_item.label);
break;
case content::MenuItem::GROUP:
case blink::mojom::CustomContextMenuItemType::kGroup:
AddRadioItem(command_id, menu_item.label, 0);
break;
case content::MenuItem::SEPARATOR:
case blink::mojom::CustomContextMenuItemType::kSeparator:
AddSeparator();
break;
case content::MenuItem::SUBMENU: {
case blink::mojom::CustomContextMenuItemType::kSubMenu: {
CefRefPtr<CefMenuModelImpl> sub_menu = static_cast<CefMenuModelImpl*>(
AddSubMenu(command_id, menu_item.label).get());
for (size_t i = 0; i < menu_item.submenu.size(); ++i)
sub_menu->AddMenuItem(menu_item.submenu[i]);
sub_menu->AddMenuItem(*menu_item.submenu[i]);
break;
}
}
if (!menu_item.enabled && menu_item.type != content::MenuItem::SEPARATOR)
if (!menu_item.enabled &&
menu_item.type != blink::mojom::CustomContextMenuItemType::kSeparator)
SetEnabled(command_id, false);
if (menu_item.checked &&
(menu_item.type == content::MenuItem::CHECKABLE_OPTION ||
menu_item.type == content::MenuItem::GROUP)) {
(menu_item.type ==
blink::mojom::CustomContextMenuItemType::kCheckableOption ||
menu_item.type == blink::mojom::CustomContextMenuItemType::kGroup)) {
SetChecked(command_id, true);
}
}