mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-02-17 20:50:42 +01:00
Update to Chromium version 104.0.5112.102
This commit is contained in:
parent
181df42df2
commit
46ae630452
@ -7,6 +7,6 @@
|
|||||||
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
|
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
|
||||||
|
|
||||||
{
|
{
|
||||||
'chromium_checkout': 'refs/tags/104.0.5112.81',
|
'chromium_checkout': 'refs/tags/104.0.5112.102',
|
||||||
'depot_tools_checkout': '350d210871'
|
'depot_tools_checkout': '350d210871'
|
||||||
}
|
}
|
||||||
|
@ -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 8209af14c838d..98278b94328f1 100644
|
index 36e5cc38f09ff..645278d32d1e4 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
|
||||||
@@ -301,6 +301,13 @@ base::OnceCallback<void(RenderViewContextMenu*)>* GetMenuShownCallback() {
|
@@ -301,6 +301,13 @@ base::OnceCallback<void(RenderViewContextMenu*)>* GetMenuShownCallback() {
|
||||||
@ -55,7 +55,7 @@ index 8209af14c838d..98278b94328f1 100644
|
|||||||
}
|
}
|
||||||
|
|
||||||
Profile* RenderViewContextMenu::GetProfile() const {
|
Profile* RenderViewContextMenu::GetProfile() const {
|
||||||
@@ -2913,6 +2938,12 @@ void RenderViewContextMenu::RegisterExecutePluginActionCallbackForTesting(
|
@@ -2914,6 +2939,12 @@ void RenderViewContextMenu::RegisterExecutePluginActionCallbackForTesting(
|
||||||
execute_plugin_action_callback_ = std::move(cb);
|
execute_plugin_action_callback_ = std::move(cb);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
diff --git base/message_loop/message_pump_mac.mm base/message_loop/message_pump_mac.mm
|
diff --git base/message_loop/message_pump_mac.mm base/message_loop/message_pump_mac.mm
|
||||||
index 1a7e0fa282a48..a56ac88cf5a98 100644
|
index dea5a84245531..b17a58d581c4c 100644
|
||||||
--- base/message_loop/message_pump_mac.mm
|
--- base/message_loop/message_pump_mac.mm
|
||||||
+++ base/message_loop/message_pump_mac.mm
|
+++ base/message_loop/message_pump_mac.mm
|
||||||
@@ -759,7 +759,8 @@ void MessagePumpUIApplication::Detach() {
|
@@ -758,7 +758,8 @@ void MessagePumpUIApplication::Detach() {
|
||||||
#else
|
#else
|
||||||
|
|
||||||
ScopedPumpMessagesInPrivateModes::ScopedPumpMessagesInPrivateModes() {
|
ScopedPumpMessagesInPrivateModes::ScopedPumpMessagesInPrivateModes() {
|
||||||
@ -12,7 +12,7 @@ index 1a7e0fa282a48..a56ac88cf5a98 100644
|
|||||||
DCHECK_EQ(kNSApplicationModalSafeModeMask, g_app_pump->GetModeMask());
|
DCHECK_EQ(kNSApplicationModalSafeModeMask, g_app_pump->GetModeMask());
|
||||||
// Pumping events in private runloop modes is known to interact badly with
|
// Pumping events in private runloop modes is known to interact badly with
|
||||||
// app modal windows like NSAlert.
|
// app modal windows like NSAlert.
|
||||||
@@ -769,7 +770,8 @@ ScopedPumpMessagesInPrivateModes::ScopedPumpMessagesInPrivateModes() {
|
@@ -768,7 +769,8 @@ ScopedPumpMessagesInPrivateModes::ScopedPumpMessagesInPrivateModes() {
|
||||||
}
|
}
|
||||||
|
|
||||||
ScopedPumpMessagesInPrivateModes::~ScopedPumpMessagesInPrivateModes() {
|
ScopedPumpMessagesInPrivateModes::~ScopedPumpMessagesInPrivateModes() {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user