mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 88.0.4324.146
This commit is contained in:
@@ -7,6 +7,6 @@
|
|||||||
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
|
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
|
||||||
|
|
||||||
{
|
{
|
||||||
'chromium_checkout': 'refs/tags/88.0.4324.96',
|
'chromium_checkout': 'refs/tags/88.0.4324.146',
|
||||||
'depot_tools_checkout': '55e9ddf219'
|
'depot_tools_checkout': '55e9ddf219'
|
||||||
}
|
}
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
diff --git chrome/browser/BUILD.gn chrome/browser/BUILD.gn
|
diff --git chrome/browser/BUILD.gn chrome/browser/BUILD.gn
|
||||||
index 2ce41b55b405..abfd93b1d31f 100644
|
index 2ae270b5a60f..83b4c9737801 100644
|
||||||
--- chrome/browser/BUILD.gn
|
--- chrome/browser/BUILD.gn
|
||||||
+++ chrome/browser/BUILD.gn
|
+++ chrome/browser/BUILD.gn
|
||||||
@@ -12,6 +12,7 @@ import("//build/config/crypto.gni")
|
@@ -12,6 +12,7 @@ import("//build/config/crypto.gni")
|
||||||
@@ -29,7 +29,7 @@ index 2ce41b55b405..abfd93b1d31f 100644
|
|||||||
if (is_android) {
|
if (is_android) {
|
||||||
sources += [
|
sources += [
|
||||||
"after_startup_task_utils_android.cc",
|
"after_startup_task_utils_android.cc",
|
||||||
@@ -4990,7 +4996,7 @@ static_library("browser") {
|
@@ -4988,7 +4994,7 @@ static_library("browser") {
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -242,10 +242,10 @@ index 0a6bac23a2f6..fc5becc010c1 100644
|
|||||||
std::unique_ptr<SelectionController> selection_controller_;
|
std::unique_ptr<SelectionController> selection_controller_;
|
||||||
|
|
||||||
diff --git ui/views/controls/menu/menu_controller.cc ui/views/controls/menu/menu_controller.cc
|
diff --git ui/views/controls/menu/menu_controller.cc ui/views/controls/menu/menu_controller.cc
|
||||||
index 68adbe09fa85..1e489a5edd41 100644
|
index ca6146dd0539..6ac1af8f7617 100644
|
||||||
--- ui/views/controls/menu/menu_controller.cc
|
--- ui/views/controls/menu/menu_controller.cc
|
||||||
+++ ui/views/controls/menu/menu_controller.cc
|
+++ ui/views/controls/menu/menu_controller.cc
|
||||||
@@ -2727,8 +2727,13 @@ MenuItemView* MenuController::FindNextSelectableMenuItem(
|
@@ -2700,8 +2700,13 @@ MenuItemView* MenuController::FindNextSelectableMenuItem(
|
||||||
|
|
||||||
void MenuController::OpenSubmenuChangeSelectionIfCan() {
|
void MenuController::OpenSubmenuChangeSelectionIfCan() {
|
||||||
MenuItemView* item = pending_state_.item;
|
MenuItemView* item = pending_state_.item;
|
||||||
@@ -260,7 +260,7 @@ index 68adbe09fa85..1e489a5edd41 100644
|
|||||||
MenuItemView* to_select = nullptr;
|
MenuItemView* to_select = nullptr;
|
||||||
if (!item->GetSubmenu()->GetMenuItems().empty())
|
if (!item->GetSubmenu()->GetMenuItems().empty())
|
||||||
to_select = FindInitialSelectableMenuItem(item, INCREMENT_SELECTION_DOWN);
|
to_select = FindInitialSelectableMenuItem(item, INCREMENT_SELECTION_DOWN);
|
||||||
@@ -2747,8 +2752,10 @@ void MenuController::OpenSubmenuChangeSelectionIfCan() {
|
@@ -2720,8 +2725,10 @@ void MenuController::OpenSubmenuChangeSelectionIfCan() {
|
||||||
void MenuController::CloseSubmenu() {
|
void MenuController::CloseSubmenu() {
|
||||||
MenuItemView* item = state_.item;
|
MenuItemView* item = state_.item;
|
||||||
DCHECK(item);
|
DCHECK(item);
|
||||||
|
@@ -174,7 +174,7 @@ index 4078ea5dc7be..25f37c487399 100644
|
|||||||
|
|
||||||
XWindow();
|
XWindow();
|
||||||
diff --git ui/platform_window/x11/x11_window.cc ui/platform_window/x11/x11_window.cc
|
diff --git ui/platform_window/x11/x11_window.cc ui/platform_window/x11/x11_window.cc
|
||||||
index 915b430611e8..79d046282138 100644
|
index 4e5c3ddfd63f..b649c208ed4e 100644
|
||||||
--- ui/platform_window/x11/x11_window.cc
|
--- ui/platform_window/x11/x11_window.cc
|
||||||
+++ ui/platform_window/x11/x11_window.cc
|
+++ ui/platform_window/x11/x11_window.cc
|
||||||
@@ -92,6 +92,7 @@ ui::XWindow::Configuration ConvertInitPropertiesToXWindowConfig(
|
@@ -92,6 +92,7 @@ ui::XWindow::Configuration ConvertInitPropertiesToXWindowConfig(
|
||||||
@@ -359,10 +359,10 @@ index c27777b9e958..ef566619e55a 100644
|
|||||||
}
|
}
|
||||||
|
|
||||||
diff --git ui/views/widget/widget.h ui/views/widget/widget.h
|
diff --git ui/views/widget/widget.h ui/views/widget/widget.h
|
||||||
index 97886b70e63a..cc43f791a466 100644
|
index b0e093c4f94e..6bdd058f29bd 100644
|
||||||
--- ui/views/widget/widget.h
|
--- ui/views/widget/widget.h
|
||||||
+++ ui/views/widget/widget.h
|
+++ ui/views/widget/widget.h
|
||||||
@@ -318,6 +318,8 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
|
@@ -317,6 +317,8 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
|
||||||
// the concept with bubble anchoring a la BubbleDialogDelegateView.
|
// the concept with bubble anchoring a la BubbleDialogDelegateView.
|
||||||
gfx::NativeView parent = nullptr;
|
gfx::NativeView parent = nullptr;
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user