mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 103.0.5060.53
This commit is contained in:
committed by
Marshall Greenblatt
parent
9e8dba7e03
commit
e38efd51d1
@@ -7,6 +7,6 @@
|
|||||||
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
|
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
|
||||||
|
|
||||||
{
|
{
|
||||||
'chromium_checkout': 'refs/tags/103.0.5060.42',
|
'chromium_checkout': 'refs/tags/103.0.5060.53',
|
||||||
'depot_tools_checkout': '964f8124b6'
|
'depot_tools_checkout': '964f8124b6'
|
||||||
}
|
}
|
||||||
|
@@ -20,10 +20,10 @@ index bbc7c3ece4123..fe2b35d70f1f3 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 2081607afe3c1..e6a24203f1702 100644
|
index 5417bc7894ad4..43ad329e38962 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
|
||||||
@@ -6253,6 +6253,12 @@ NavigationRequest::GetOriginForURLLoaderFactoryWithoutFinalFrameHost(
|
@@ -6259,6 +6259,12 @@ NavigationRequest::GetOriginForURLLoaderFactoryWithoutFinalFrameHost(
|
||||||
network::mojom::WebSandboxFlags sandbox_flags) {
|
network::mojom::WebSandboxFlags sandbox_flags) {
|
||||||
// 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);
|
||||||
@@ -36,7 +36,7 @@ index 2081607afe3c1..e6a24203f1702 100644
|
|||||||
|
|
||||||
// Apply sandbox flags.
|
// Apply sandbox flags.
|
||||||
// See https://html.spec.whatwg.org/#sandboxed-origin-browsing-context-flag
|
// See https://html.spec.whatwg.org/#sandboxed-origin-browsing-context-flag
|
||||||
@@ -6286,6 +6292,15 @@ NavigationRequest::GetOriginForURLLoaderFactoryWithFinalFrameHost() {
|
@@ -6292,6 +6298,15 @@ NavigationRequest::GetOriginForURLLoaderFactoryWithFinalFrameHost() {
|
||||||
if (IsSameDocument() || IsPageActivation())
|
if (IsSameDocument() || IsPageActivation())
|
||||||
return GetRenderFrameHost()->GetLastCommittedOrigin();
|
return GetRenderFrameHost()->GetLastCommittedOrigin();
|
||||||
|
|
||||||
|
@@ -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 631420eb56152..0f8b82a757a01 100644
|
index 3833b9c12e0cf..2e53204e17565 100644
|
||||||
--- chrome/browser/BUILD.gn
|
--- chrome/browser/BUILD.gn
|
||||||
+++ chrome/browser/BUILD.gn
|
+++ chrome/browser/BUILD.gn
|
||||||
@@ -11,6 +11,7 @@ import("//build/config/compiler/pgo/pgo.gni")
|
@@ -11,6 +11,7 @@ import("//build/config/compiler/pgo/pgo.gni")
|
||||||
|
@@ -1,8 +1,8 @@
|
|||||||
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 fdad390f46a98..6554eea8bc247 100644
|
index 531e5d18284b6..227e649af0b58 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
|
||||||
@@ -300,6 +300,13 @@ base::OnceCallback<void(RenderViewContextMenu*)>* GetMenuShownCallback() {
|
@@ -299,6 +299,13 @@ base::OnceCallback<void(RenderViewContextMenu*)>* GetMenuShownCallback() {
|
||||||
return callback.get();
|
return callback.get();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -16,7 +16,7 @@ index fdad390f46a98..6554eea8bc247 100644
|
|||||||
enum class UmaEnumIdLookupType {
|
enum class UmaEnumIdLookupType {
|
||||||
GeneralEnumId,
|
GeneralEnumId,
|
||||||
ContextSpecificEnumId,
|
ContextSpecificEnumId,
|
||||||
@@ -528,6 +535,10 @@ int FindUMAEnumValueForCommand(int id, UmaEnumIdLookupType type) {
|
@@ -527,6 +534,10 @@ int FindUMAEnumValueForCommand(int id, UmaEnumIdLookupType type) {
|
||||||
if (ContextMenuMatcher::IsExtensionsCustomCommandId(id))
|
if (ContextMenuMatcher::IsExtensionsCustomCommandId(id))
|
||||||
return 1;
|
return 1;
|
||||||
|
|
||||||
@@ -27,7 +27,7 @@ index fdad390f46a98..6554eea8bc247 100644
|
|||||||
id = CollapseCommandsForUMA(id);
|
id = CollapseCommandsForUMA(id);
|
||||||
const auto& map = GetIdcToUmaMap(type);
|
const auto& map = GetIdcToUmaMap(type);
|
||||||
auto it = map.find(id);
|
auto it = map.find(id);
|
||||||
@@ -713,6 +724,14 @@ RenderViewContextMenu::RenderViewContextMenu(
|
@@ -712,6 +723,14 @@ RenderViewContextMenu::RenderViewContextMenu(
|
||||||
system_app_ = GetBrowser() && GetBrowser()->app_controller()
|
system_app_ = GetBrowser() && GetBrowser()->app_controller()
|
||||||
? GetBrowser()->app_controller()->system_app()
|
? GetBrowser()->app_controller()->system_app()
|
||||||
: nullptr;
|
: nullptr;
|
||||||
@@ -42,7 +42,7 @@ index fdad390f46a98..6554eea8bc247 100644
|
|||||||
}
|
}
|
||||||
|
|
||||||
RenderViewContextMenu::~RenderViewContextMenu() = default;
|
RenderViewContextMenu::~RenderViewContextMenu() = default;
|
||||||
@@ -1094,6 +1113,12 @@ void RenderViewContextMenu::InitMenu() {
|
@@ -1093,6 +1112,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 fdad390f46a98..6554eea8bc247 100644
|
|||||||
}
|
}
|
||||||
|
|
||||||
Profile* RenderViewContextMenu::GetProfile() const {
|
Profile* RenderViewContextMenu::GetProfile() const {
|
||||||
@@ -2868,6 +2893,12 @@ void RenderViewContextMenu::RegisterExecutePluginActionCallbackForTesting(
|
@@ -2861,6 +2886,12 @@ void RenderViewContextMenu::RegisterExecutePluginActionCallbackForTesting(
|
||||||
execute_plugin_action_callback_ = std::move(cb);
|
execute_plugin_action_callback_ = std::move(cb);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
diff --git chrome/browser/themes/theme_service.cc chrome/browser/themes/theme_service.cc
|
diff --git chrome/browser/themes/theme_service.cc chrome/browser/themes/theme_service.cc
|
||||||
index d759fbfcd4215..156ac3dcbdda1 100644
|
index 5d2c348a99b76..bfa0c77ff1aa1 100644
|
||||||
--- chrome/browser/themes/theme_service.cc
|
--- chrome/browser/themes/theme_service.cc
|
||||||
+++ chrome/browser/themes/theme_service.cc
|
+++ chrome/browser/themes/theme_service.cc
|
||||||
@@ -31,6 +31,7 @@
|
@@ -31,6 +31,7 @@
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
diff --git components/embedder_support/user_agent_utils.cc components/embedder_support/user_agent_utils.cc
|
diff --git components/embedder_support/user_agent_utils.cc components/embedder_support/user_agent_utils.cc
|
||||||
index b8764e510563a..1bca276c9f52d 100644
|
index acd60381a6294..f9be70d2da75f 100644
|
||||||
--- components/embedder_support/user_agent_utils.cc
|
--- components/embedder_support/user_agent_utils.cc
|
||||||
+++ components/embedder_support/user_agent_utils.cc
|
+++ components/embedder_support/user_agent_utils.cc
|
||||||
@@ -15,6 +15,7 @@
|
@@ -15,6 +15,7 @@
|
||||||
|
@@ -12,7 +12,7 @@ index 7d538f812d72e..9eec79395aeec 100644
|
|||||||
# https://crbug.com/474506.
|
# https://crbug.com/474506.
|
||||||
"//clank/java/BUILD.gn",
|
"//clank/java/BUILD.gn",
|
||||||
diff --git BUILD.gn BUILD.gn
|
diff --git BUILD.gn BUILD.gn
|
||||||
index 3fb396df0a458..2e9dbe0a18a1b 100644
|
index 09b4c938cdec9..caf6994378898 100644
|
||||||
--- BUILD.gn
|
--- BUILD.gn
|
||||||
+++ BUILD.gn
|
+++ BUILD.gn
|
||||||
@@ -17,6 +17,7 @@ import("//build/config/sanitizers/sanitizers.gni")
|
@@ -17,6 +17,7 @@ import("//build/config/sanitizers/sanitizers.gni")
|
||||||
|
Reference in New Issue
Block a user