mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-02-17 20:50:42 +01:00
Update to Chromium version 97.0.4692.45
This commit is contained in:
parent
4eb2da6aac
commit
b2e06a3503
@ -7,6 +7,6 @@
|
||||
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
|
||||
|
||||
{
|
||||
'chromium_checkout': 'refs/tags/97.0.4692.36',
|
||||
'chromium_checkout': 'refs/tags/97.0.4692.45',
|
||||
'depot_tools_checkout': 'f7b8f8f3cd'
|
||||
}
|
||||
|
@ -20,7 +20,7 @@ index 85a68f06ccc71..a57f47d70084b 100644
|
||||
|
||||
// TODO(wjmaclean): We should update the ProcessLock comparison API
|
||||
diff --git content/browser/renderer_host/navigation_request.cc content/browser/renderer_host/navigation_request.cc
|
||||
index 3a5aa8aa5f82a..936dd8da4c572 100644
|
||||
index 31ba319a27630..72bfe592f5c5a 100644
|
||||
--- content/browser/renderer_host/navigation_request.cc
|
||||
+++ content/browser/renderer_host/navigation_request.cc
|
||||
@@ -5832,6 +5832,12 @@ NavigationRequest::GetOriginForURLLoaderFactoryWithoutFinalFrameHost(
|
||||
|
@ -1,5 +1,5 @@
|
||||
diff --git chrome/browser/BUILD.gn chrome/browser/BUILD.gn
|
||||
index d189c06a28cf6..1071b887e9888 100644
|
||||
index 1dbd99cace756..922efee40f1de 100644
|
||||
--- chrome/browser/BUILD.gn
|
||||
+++ chrome/browser/BUILD.gn
|
||||
@@ -13,6 +13,7 @@ import("//build/config/features.gni")
|
||||
|
@ -1,5 +1,5 @@
|
||||
diff --git content/browser/storage_partition_impl.cc content/browser/storage_partition_impl.cc
|
||||
index b2737eddcda61..d23ee8daf0d76 100644
|
||||
index 891c7a686bf76..b6a6d994cbafd 100644
|
||||
--- content/browser/storage_partition_impl.cc
|
||||
+++ content/browser/storage_partition_impl.cc
|
||||
@@ -476,10 +476,6 @@ class LoginHandlerDelegate {
|
||||
@ -26,7 +26,7 @@ index b2737eddcda61..d23ee8daf0d76 100644
|
||||
new LoginHandlerDelegate(
|
||||
std::move(auth_challenge_responder), std::move(web_contents_getter),
|
||||
auth_info, is_request_for_primary_main_frame, process_id, request_id, url,
|
||||
@@ -2677,8 +2667,12 @@ void StoragePartitionImpl::GetQuotaSettings(
|
||||
@@ -2681,8 +2671,12 @@ void StoragePartitionImpl::GetQuotaSettings(
|
||||
return;
|
||||
}
|
||||
|
||||
@ -40,7 +40,7 @@ index b2737eddcda61..d23ee8daf0d76 100644
|
||||
storage::GetDefaultDeviceInfoHelper(), std::move(callback));
|
||||
}
|
||||
|
||||
@@ -2688,9 +2682,12 @@ void StoragePartitionImpl::InitNetworkContext() {
|
||||
@@ -2692,9 +2686,12 @@ void StoragePartitionImpl::InitNetworkContext() {
|
||||
cert_verifier::mojom::CertVerifierCreationParamsPtr
|
||||
cert_verifier_creation_params =
|
||||
cert_verifier::mojom::CertVerifierCreationParams::New();
|
||||
|
@ -308,10 +308,10 @@ index 9c1542e1f4f0f..548fc8e87d520 100644
|
||||
virtual int GetMaxWidthForMenu(MenuItemView* menu);
|
||||
|
||||
diff --git ui/views/controls/menu/menu_item_view.cc ui/views/controls/menu/menu_item_view.cc
|
||||
index 23c49fc5325cd..98f3c89e71bcd 100644
|
||||
index c77036ffe127b..df75a76d34ab0 100644
|
||||
--- ui/views/controls/menu/menu_item_view.cc
|
||||
+++ ui/views/controls/menu/menu_item_view.cc
|
||||
@@ -1082,6 +1082,15 @@ void MenuItemView::PaintBackground(gfx::Canvas* canvas,
|
||||
@@ -1084,6 +1084,15 @@ void MenuItemView::PaintBackground(gfx::Canvas* canvas,
|
||||
spilling_rect.set_y(spilling_rect.y() - corner_radius_);
|
||||
spilling_rect.set_height(spilling_rect.height() + corner_radius_);
|
||||
canvas->DrawRoundRect(spilling_rect, corner_radius_, flags);
|
||||
@ -327,7 +327,7 @@ index 23c49fc5325cd..98f3c89e71bcd 100644
|
||||
} else if (paint_as_selected) {
|
||||
gfx::Rect item_bounds = GetLocalBounds();
|
||||
if (type_ == Type::kActionableSubMenu) {
|
||||
@@ -1148,6 +1157,13 @@ void MenuItemView::PaintMinorIconAndText(gfx::Canvas* canvas, SkColor color) {
|
||||
@@ -1150,6 +1159,13 @@ void MenuItemView::PaintMinorIconAndText(gfx::Canvas* canvas, SkColor color) {
|
||||
}
|
||||
|
||||
SkColor MenuItemView::GetTextColor(bool minor, bool paint_as_selected) const {
|
||||
|
Loading…
x
Reference in New Issue
Block a user