mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 92.0.4515.70
This commit is contained in:
committed by
Marshall Greenblatt
parent
847fba0d7f
commit
108795e566
@@ -7,6 +7,6 @@
|
|||||||
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
|
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
|
||||||
|
|
||||||
{
|
{
|
||||||
'chromium_checkout': 'refs/tags/92.0.4515.51',
|
'chromium_checkout': 'refs/tags/92.0.4515.70',
|
||||||
'depot_tools_checkout': '58542b7fef'
|
'depot_tools_checkout': '58542b7fef'
|
||||||
}
|
}
|
||||||
|
@@ -20,10 +20,10 @@ index d548b3d7e0a0..cb93301271cd 100644
|
|||||||
|
|
||||||
// TODO(wjmaclean): We should update the ProcessLock comparison API
|
// 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
|
diff --git content/browser/renderer_host/navigation_request.cc content/browser/renderer_host/navigation_request.cc
|
||||||
index e5acd017125d..9d828b67935f 100644
|
index a3d8dd6b2543..c6a3237025a8 100644
|
||||||
--- content/browser/renderer_host/navigation_request.cc
|
--- content/browser/renderer_host/navigation_request.cc
|
||||||
+++ content/browser/renderer_host/navigation_request.cc
|
+++ content/browser/renderer_host/navigation_request.cc
|
||||||
@@ -5311,6 +5311,12 @@ url::Origin NavigationRequest::GetOriginForURLLoaderFactory() {
|
@@ -5313,6 +5313,12 @@ url::Origin NavigationRequest::GetOriginForURLLoaderFactory() {
|
||||||
|
|
||||||
// Calculate an approximation of the origin. The sandbox/csp are ignored.
|
// Calculate an approximation of the origin. The sandbox/csp are ignored.
|
||||||
url::Origin origin = GetOriginForURLLoaderFactoryUnchecked(this);
|
url::Origin origin = GetOriginForURLLoaderFactoryUnchecked(this);
|
||||||
|
@@ -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 d22903dc43ba..31e3a8cb508f 100644
|
index ea17be6ba1c3..b416f85a4716 100644
|
||||||
--- chrome/browser/BUILD.gn
|
--- chrome/browser/BUILD.gn
|
||||||
+++ chrome/browser/BUILD.gn
|
+++ chrome/browser/BUILD.gn
|
||||||
@@ -13,6 +13,7 @@ import("//build/config/features.gni")
|
@@ -13,6 +13,7 @@ import("//build/config/features.gni")
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
diff --git chrome/browser/app_controller_mac.mm chrome/browser/app_controller_mac.mm
|
diff --git chrome/browser/app_controller_mac.mm chrome/browser/app_controller_mac.mm
|
||||||
index 84743b82b002..469bd656665a 100644
|
index 71dce6d8be27..8349c3f0de41 100644
|
||||||
--- chrome/browser/app_controller_mac.mm
|
--- chrome/browser/app_controller_mac.mm
|
||||||
+++ chrome/browser/app_controller_mac.mm
|
+++ chrome/browser/app_controller_mac.mm
|
||||||
@@ -31,6 +31,7 @@
|
@@ -31,6 +31,7 @@
|
||||||
@@ -10,7 +10,7 @@ index 84743b82b002..469bd656665a 100644
|
|||||||
#include "chrome/app/chrome_command_ids.h"
|
#include "chrome/app/chrome_command_ids.h"
|
||||||
#include "chrome/browser/apps/app_shim/app_shim_manager_mac.h"
|
#include "chrome/browser/apps/app_shim/app_shim_manager_mac.h"
|
||||||
#include "chrome/browser/apps/app_shim/app_shim_termination_manager.h"
|
#include "chrome/browser/apps/app_shim/app_shim_termination_manager.h"
|
||||||
@@ -1298,6 +1299,7 @@ static base::mac::ScopedObjCClassSwizzler* g_swizzle_imk_input_session;
|
@@ -1336,6 +1337,7 @@ static base::mac::ScopedObjCClassSwizzler* g_swizzle_imk_input_session;
|
||||||
|
|
||||||
// Run a (background) application in a new tab.
|
// Run a (background) application in a new tab.
|
||||||
- (void)executeApplication:(id)sender {
|
- (void)executeApplication:(id)sender {
|
||||||
@@ -18,7 +18,7 @@ index 84743b82b002..469bd656665a 100644
|
|||||||
NSInteger tag = [sender tag];
|
NSInteger tag = [sender tag];
|
||||||
Profile* profile = [self lastProfile];
|
Profile* profile = [self lastProfile];
|
||||||
DCHECK(profile);
|
DCHECK(profile);
|
||||||
@@ -1306,6 +1308,7 @@ static base::mac::ScopedObjCClassSwizzler* g_swizzle_imk_input_session;
|
@@ -1344,6 +1346,7 @@ static base::mac::ScopedObjCClassSwizzler* g_swizzle_imk_input_session;
|
||||||
tag < static_cast<int>(applications.size()));
|
tag < static_cast<int>(applications.size()));
|
||||||
const extensions::Extension* extension = applications.GetExtension(tag);
|
const extensions::Extension* extension = applications.GetExtension(tag);
|
||||||
BackgroundModeManager::LaunchBackgroundApplication(profile, extension);
|
BackgroundModeManager::LaunchBackgroundApplication(profile, extension);
|
||||||
@@ -26,7 +26,7 @@ index 84743b82b002..469bd656665a 100644
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Same as |-commandDispatch:|, but executes commands using a disposition
|
// Same as |-commandDispatch:|, but executes commands using a disposition
|
||||||
@@ -1701,6 +1704,7 @@ static base::mac::ScopedObjCClassSwizzler* g_swizzle_imk_input_session;
|
@@ -1739,6 +1742,7 @@ static base::mac::ScopedObjCClassSwizzler* g_swizzle_imk_input_session;
|
||||||
// TODO(rickcam): Mock out BackgroundApplicationListModel, then add unit
|
// TODO(rickcam): Mock out BackgroundApplicationListModel, then add unit
|
||||||
// tests which use the mock in place of the profile-initialized model.
|
// tests which use the mock in place of the profile-initialized model.
|
||||||
|
|
||||||
@@ -34,7 +34,7 @@ index 84743b82b002..469bd656665a 100644
|
|||||||
// Avoid breaking unit tests which have no profile.
|
// Avoid breaking unit tests which have no profile.
|
||||||
if (profile) {
|
if (profile) {
|
||||||
BackgroundApplicationListModel applications(profile);
|
BackgroundApplicationListModel applications(profile);
|
||||||
@@ -1727,6 +1731,7 @@ static base::mac::ScopedObjCClassSwizzler* g_swizzle_imk_input_session;
|
@@ -1765,6 +1769,7 @@ static base::mac::ScopedObjCClassSwizzler* g_swizzle_imk_input_session;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -42,7 +42,7 @@ index 84743b82b002..469bd656665a 100644
|
|||||||
|
|
||||||
return dockMenu;
|
return dockMenu;
|
||||||
}
|
}
|
||||||
@@ -1956,11 +1961,13 @@ static base::mac::ScopedObjCClassSwizzler* g_swizzle_imk_input_session;
|
@@ -1994,11 +1999,13 @@ static base::mac::ScopedObjCClassSwizzler* g_swizzle_imk_input_session;
|
||||||
namespace {
|
namespace {
|
||||||
|
|
||||||
void UpdateProfileInUse(Profile* profile, Profile::CreateStatus status) {
|
void UpdateProfileInUse(Profile* profile, Profile::CreateStatus status) {
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
diff --git chrome/browser/renderer_context_menu/render_view_context_menu.cc chrome/browser/renderer_context_menu/render_view_context_menu.cc
|
diff --git chrome/browser/renderer_context_menu/render_view_context_menu.cc chrome/browser/renderer_context_menu/render_view_context_menu.cc
|
||||||
index 41b804eef642..b1e54d8e9500 100644
|
index cfe46eee2a8f..3db70c7c3149 100644
|
||||||
--- chrome/browser/renderer_context_menu/render_view_context_menu.cc
|
--- chrome/browser/renderer_context_menu/render_view_context_menu.cc
|
||||||
+++ chrome/browser/renderer_context_menu/render_view_context_menu.cc
|
+++ chrome/browser/renderer_context_menu/render_view_context_menu.cc
|
||||||
@@ -264,6 +264,13 @@ base::OnceCallback<void(RenderViewContextMenu*)>* GetMenuShownCallback() {
|
@@ -264,6 +264,13 @@ base::OnceCallback<void(RenderViewContextMenu*)>* GetMenuShownCallback() {
|
||||||
@@ -42,7 +42,7 @@ index 41b804eef642..b1e54d8e9500 100644
|
|||||||
}
|
}
|
||||||
|
|
||||||
RenderViewContextMenu::~RenderViewContextMenu() = default;
|
RenderViewContextMenu::~RenderViewContextMenu() = default;
|
||||||
@@ -983,6 +1002,12 @@ void RenderViewContextMenu::InitMenu() {
|
@@ -984,6 +1003,12 @@ void RenderViewContextMenu::InitMenu() {
|
||||||
// menu, meaning that each menu item added/removed in this function will cause
|
// menu, meaning that each menu item added/removed in this function will cause
|
||||||
// it to visibly jump on the screen (see b/173569669).
|
// it to visibly jump on the screen (see b/173569669).
|
||||||
AppendQuickAnswersItems();
|
AppendQuickAnswersItems();
|
||||||
@@ -55,7 +55,7 @@ index 41b804eef642..b1e54d8e9500 100644
|
|||||||
}
|
}
|
||||||
|
|
||||||
Profile* RenderViewContextMenu::GetProfile() const {
|
Profile* RenderViewContextMenu::GetProfile() const {
|
||||||
@@ -2636,6 +2661,12 @@ void RenderViewContextMenu::RegisterMenuShownCallbackForTesting(
|
@@ -2637,6 +2662,12 @@ void RenderViewContextMenu::RegisterMenuShownCallbackForTesting(
|
||||||
*GetMenuShownCallback() = std::move(cb);
|
*GetMenuShownCallback() = std::move(cb);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -142,7 +142,7 @@ index 599b06c1765e..e8ae98b0b132 100644
|
|||||||
|
|
||||||
TRACE_EVENT_ASYNC_BEGIN0("viz", "SoftwareOutputDeviceWinProxy::Draw", this);
|
TRACE_EVENT_ASYNC_BEGIN0("viz", "SoftwareOutputDeviceWinProxy::Draw", this);
|
||||||
diff --git content/browser/compositor/viz_process_transport_factory.cc content/browser/compositor/viz_process_transport_factory.cc
|
diff --git content/browser/compositor/viz_process_transport_factory.cc content/browser/compositor/viz_process_transport_factory.cc
|
||||||
index 83a23404d1c0..787032702859 100644
|
index 50ff2c9facc2..c34d1f28d2e9 100644
|
||||||
--- content/browser/compositor/viz_process_transport_factory.cc
|
--- content/browser/compositor/viz_process_transport_factory.cc
|
||||||
+++ content/browser/compositor/viz_process_transport_factory.cc
|
+++ content/browser/compositor/viz_process_transport_factory.cc
|
||||||
@@ -395,8 +395,13 @@ void VizProcessTransportFactory::OnEstablishedGpuChannel(
|
@@ -395,8 +395,13 @@ void VizProcessTransportFactory::OnEstablishedGpuChannel(
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
diff --git chrome/app/generated_resources.grd chrome/app/generated_resources.grd
|
diff --git chrome/app/generated_resources.grd chrome/app/generated_resources.grd
|
||||||
index b43b0bf1f5a6..d7ada89a7a61 100644
|
index cdf5187286fe..7670f4e3f81d 100644
|
||||||
--- chrome/app/generated_resources.grd
|
--- chrome/app/generated_resources.grd
|
||||||
+++ chrome/app/generated_resources.grd
|
+++ chrome/app/generated_resources.grd
|
||||||
@@ -5151,7 +5151,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
|
@@ -5151,7 +5151,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
|
||||||
|
Reference in New Issue
Block a user