mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 134.0.6998.118
This commit is contained in:
committed by
Marshall Greenblatt
parent
36934ebbc5
commit
96006d1193
@@ -7,5 +7,5 @@
|
|||||||
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
|
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
|
||||||
|
|
||||||
{
|
{
|
||||||
'chromium_checkout': 'refs/tags/134.0.6998.89'
|
'chromium_checkout': 'refs/tags/134.0.6998.118'
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -136,7 +136,7 @@ index cb51224f9892c..b5a3946999d8f 100644
|
|||||||
private:
|
private:
|
||||||
// RenderViewContextMenuViewsMac:
|
// RenderViewContextMenuViewsMac:
|
||||||
diff --git chrome/browser/ui/cocoa/renderer_context_menu/render_view_context_menu_mac_cocoa.mm chrome/browser/ui/cocoa/renderer_context_menu/render_view_context_menu_mac_cocoa.mm
|
diff --git chrome/browser/ui/cocoa/renderer_context_menu/render_view_context_menu_mac_cocoa.mm chrome/browser/ui/cocoa/renderer_context_menu/render_view_context_menu_mac_cocoa.mm
|
||||||
index 2e34cf104fbe6..850489d12a458 100644
|
index 5e266a42d3df6..e57211944d6a6 100644
|
||||||
--- chrome/browser/ui/cocoa/renderer_context_menu/render_view_context_menu_mac_cocoa.mm
|
--- chrome/browser/ui/cocoa/renderer_context_menu/render_view_context_menu_mac_cocoa.mm
|
||||||
+++ chrome/browser/ui/cocoa/renderer_context_menu/render_view_context_menu_mac_cocoa.mm
|
+++ chrome/browser/ui/cocoa/renderer_context_menu/render_view_context_menu_mac_cocoa.mm
|
||||||
@@ -70,6 +70,10 @@ RenderViewContextMenuMacCocoa::~RenderViewContextMenuMacCocoa() {
|
@@ -70,6 +70,10 @@ RenderViewContextMenuMacCocoa::~RenderViewContextMenuMacCocoa() {
|
||||||
@@ -150,7 +150,7 @@ index 2e34cf104fbe6..850489d12a458 100644
|
|||||||
views::Widget* widget = views::Widget::GetTopLevelWidgetForNativeView(
|
views::Widget* widget = views::Widget::GetTopLevelWidgetForNativeView(
|
||||||
source_web_contents_->GetNativeView());
|
source_web_contents_->GetNativeView());
|
||||||
|
|
||||||
@@ -94,6 +98,10 @@ void RenderViewContextMenuMacCocoa::Show() {
|
@@ -95,6 +99,10 @@ void RenderViewContextMenuMacCocoa::Show() {
|
||||||
views::ElementTrackerViews::GetContextForWidget(widget));
|
views::ElementTrackerViews::GetContextForWidget(widget));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
diff --git content/browser/renderer_host/render_frame_host_impl.cc content/browser/renderer_host/render_frame_host_impl.cc
|
diff --git content/browser/renderer_host/render_frame_host_impl.cc content/browser/renderer_host/render_frame_host_impl.cc
|
||||||
index 622142dcf64df..3648e7e38b9c1 100644
|
index 6e28debbe692a..8eb96841a5347 100644
|
||||||
--- content/browser/renderer_host/render_frame_host_impl.cc
|
--- content/browser/renderer_host/render_frame_host_impl.cc
|
||||||
+++ content/browser/renderer_host/render_frame_host_impl.cc
|
+++ content/browser/renderer_host/render_frame_host_impl.cc
|
||||||
@@ -9615,6 +9615,16 @@ void RenderFrameHostImpl::CreateNewWindow(
|
@@ -9616,6 +9616,16 @@ void RenderFrameHostImpl::CreateNewWindow(
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -19,7 +19,7 @@ index 622142dcf64df..3648e7e38b9c1 100644
|
|||||||
// Otherwise, consume user activation before we proceed. In particular, it is
|
// Otherwise, consume user activation before we proceed. In particular, it is
|
||||||
// important to do this before we return from the |opener_suppressed| case
|
// important to do this before we return from the |opener_suppressed| case
|
||||||
// below.
|
// below.
|
||||||
@@ -11992,6 +12002,7 @@ void RenderFrameHostImpl::CommitNavigation(
|
@@ -11993,6 +12003,7 @@ void RenderFrameHostImpl::CommitNavigation(
|
||||||
auto browser_calc_origin_to_commit =
|
auto browser_calc_origin_to_commit =
|
||||||
navigation_request->GetOriginToCommitWithDebugInfo();
|
navigation_request->GetOriginToCommitWithDebugInfo();
|
||||||
if (!process_lock.is_error_page() && !is_mhtml_subframe &&
|
if (!process_lock.is_error_page() && !is_mhtml_subframe &&
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
diff --git BUILD.gn BUILD.gn
|
diff --git BUILD.gn BUILD.gn
|
||||||
index 3fd37aa586b..11d52f4236f 100644
|
index 001b0791603..2ad30b10066 100644
|
||||||
--- BUILD.gn
|
--- BUILD.gn
|
||||||
+++ BUILD.gn
|
+++ BUILD.gn
|
||||||
@@ -11,6 +11,7 @@ import("//build/config/mips.gni")
|
@@ -11,6 +11,7 @@ import("//build/config/mips.gni")
|
||||||
|
|||||||
@@ -654,7 +654,7 @@ index f5b0936aac647..20f476c9abd93 100644
|
|||||||
std::optional<std::string> show_menu_host_duration_histogram) override;
|
std::optional<std::string> show_menu_host_duration_histogram) override;
|
||||||
void Cancel() override;
|
void Cancel() override;
|
||||||
diff --git ui/views/controls/menu/menu_runner_impl_cocoa.mm ui/views/controls/menu/menu_runner_impl_cocoa.mm
|
diff --git ui/views/controls/menu/menu_runner_impl_cocoa.mm ui/views/controls/menu/menu_runner_impl_cocoa.mm
|
||||||
index 05322e627acab..a866a76c50372 100644
|
index e1e3f0d4c54dd..f8afecca2016b 100644
|
||||||
--- ui/views/controls/menu/menu_runner_impl_cocoa.mm
|
--- ui/views/controls/menu/menu_runner_impl_cocoa.mm
|
||||||
+++ ui/views/controls/menu/menu_runner_impl_cocoa.mm
|
+++ ui/views/controls/menu/menu_runner_impl_cocoa.mm
|
||||||
@@ -72,6 +72,7 @@ void MenuRunnerImplCocoa::RunMenuAt(
|
@@ -72,6 +72,7 @@ void MenuRunnerImplCocoa::RunMenuAt(
|
||||||
|
|||||||
Reference in New Issue
Block a user