Update to Chromium version 125.0.6422.41

This commit is contained in:
Marshall Greenblatt 2024-05-10 14:43:46 +00:00 committed by Marshall Greenblatt
parent 44f7b57e79
commit 6da73a3d31
4 changed files with 20 additions and 20 deletions

View File

@ -7,6 +7,6 @@
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding # https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
{ {
'chromium_checkout': 'refs/tags/125.0.6422.26', 'chromium_checkout': 'refs/tags/125.0.6422.41',
'depot_tools_checkout': '19199514e8' 'depot_tools_checkout': '19199514e8'
} }

View File

@ -574,7 +574,7 @@ index e21d5dbffda0b..113df89dcd68a 100644
#endif #endif
diff --git chrome/browser/prefs/browser_prefs.cc chrome/browser/prefs/browser_prefs.cc diff --git chrome/browser/prefs/browser_prefs.cc chrome/browser/prefs/browser_prefs.cc
index 6ace1e4dfe2ff..1ed97635c9502 100644 index 934683953cd7d..8f17a64145bd8 100644
--- chrome/browser/prefs/browser_prefs.cc --- chrome/browser/prefs/browser_prefs.cc
+++ chrome/browser/prefs/browser_prefs.cc +++ chrome/browser/prefs/browser_prefs.cc
@@ -16,6 +16,7 @@ @@ -16,6 +16,7 @@
@ -618,7 +618,7 @@ index 6ace1e4dfe2ff..1ed97635c9502 100644
} }
// Register prefs applicable to all profiles. // Register prefs applicable to all profiles.
@@ -2215,6 +2226,10 @@ void RegisterUserProfilePrefs(user_prefs::PrefRegistrySyncable* registry, @@ -2216,6 +2227,10 @@ void RegisterUserProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
const std::string& locale) { const std::string& locale) {
RegisterProfilePrefs(registry, locale); RegisterProfilePrefs(registry, locale);

View File

@ -402,7 +402,7 @@ index 2e973c9e279b0..8662f9cf14b17 100644
// regenerated. // regenerated.
bool RegenerateFrameOnThemeChange(BrowserThemeChangeType theme_change_type); bool RegenerateFrameOnThemeChange(BrowserThemeChangeType theme_change_type);
diff --git chrome/browser/ui/views/frame/browser_view.cc chrome/browser/ui/views/frame/browser_view.cc diff --git chrome/browser/ui/views/frame/browser_view.cc chrome/browser/ui/views/frame/browser_view.cc
index 110812d2874d7..89b28bdb32d90 100644 index 46723938c5456..f7585de92bd66 100644
--- chrome/browser/ui/views/frame/browser_view.cc --- chrome/browser/ui/views/frame/browser_view.cc
+++ chrome/browser/ui/views/frame/browser_view.cc +++ chrome/browser/ui/views/frame/browser_view.cc
@@ -346,11 +346,10 @@ using content::NativeWebKeyboardEvent; @@ -346,11 +346,10 @@ using content::NativeWebKeyboardEvent;
@ -476,7 +476,7 @@ index 110812d2874d7..89b28bdb32d90 100644
contents_separator_ = contents_separator_ =
top_container_->AddChildView(std::make_unique<ContentsSeparator>()); top_container_->AddChildView(std::make_unique<ContentsSeparator>());
@@ -1017,7 +1041,9 @@ BrowserView::~BrowserView() { @@ -1016,7 +1040,9 @@ BrowserView::~BrowserView() {
// All the tabs should have been destroyed already. If we were closed by the // All the tabs should have been destroyed already. If we were closed by the
// OS with some tabs than the NativeBrowserFrame should have destroyed them. // OS with some tabs than the NativeBrowserFrame should have destroyed them.
@ -486,7 +486,7 @@ index 110812d2874d7..89b28bdb32d90 100644
// Stop the animation timer explicitly here to avoid running it in a nested // Stop the animation timer explicitly here to avoid running it in a nested
// message loop, which may run by Browser destructor. // message loop, which may run by Browser destructor.
@@ -1031,12 +1057,14 @@ BrowserView::~BrowserView() { @@ -1030,12 +1056,14 @@ BrowserView::~BrowserView() {
// child views and it is an observer for avatar toolbar button if any. // child views and it is an observer for avatar toolbar button if any.
autofill_bubble_handler_.reset(); autofill_bubble_handler_.reset();
@ -501,7 +501,7 @@ index 110812d2874d7..89b28bdb32d90 100644
// The TabStrip attaches a listener to the model. Make sure we shut down the // The TabStrip attaches a listener to the model. Make sure we shut down the
// TabStrip first so that it can cleanly remove the listener. // TabStrip first so that it can cleanly remove the listener.
@@ -1060,7 +1088,9 @@ BrowserView::~BrowserView() { @@ -1059,7 +1087,9 @@ BrowserView::~BrowserView() {
// `SidePanelUI::RemoveSidePanelUIForBrowser()` deletes the // `SidePanelUI::RemoveSidePanelUIForBrowser()` deletes the
// SidePanelCoordinator. // SidePanelCoordinator.
@ -511,7 +511,7 @@ index 110812d2874d7..89b28bdb32d90 100644
} }
// static // static
@@ -2032,9 +2062,14 @@ void BrowserView::OnExclusiveAccessUserInput() { @@ -2031,9 +2061,14 @@ void BrowserView::OnExclusiveAccessUserInput() {
bool BrowserView::ShouldHideUIForFullscreen() const { bool BrowserView::ShouldHideUIForFullscreen() const {
// Immersive mode needs UI for the slide-down top panel. // Immersive mode needs UI for the slide-down top panel.
@ -527,7 +527,7 @@ index 110812d2874d7..89b28bdb32d90 100644
return frame_->GetFrameView()->ShouldHideTopUIForFullscreen(); return frame_->GetFrameView()->ShouldHideTopUIForFullscreen();
} }
@@ -3170,7 +3205,8 @@ DownloadShelf* BrowserView::GetDownloadShelf() { @@ -3169,7 +3204,8 @@ DownloadShelf* BrowserView::GetDownloadShelf() {
} }
DownloadBubbleUIController* BrowserView::GetDownloadBubbleUIController() { DownloadBubbleUIController* BrowserView::GetDownloadBubbleUIController() {
@ -537,7 +537,7 @@ index 110812d2874d7..89b28bdb32d90 100644
if (auto* download_button = toolbar_button_provider_->GetDownloadButton()) if (auto* download_button = toolbar_button_provider_->GetDownloadButton())
return download_button->bubble_controller(); return download_button->bubble_controller();
return nullptr; return nullptr;
@@ -3725,7 +3761,8 @@ void BrowserView::ReparentTopContainerForEndOfImmersive() { @@ -3724,7 +3760,8 @@ void BrowserView::ReparentTopContainerForEndOfImmersive() {
if (top_container()->parent() == this) if (top_container()->parent() == this)
return; return;
@ -547,7 +547,7 @@ index 110812d2874d7..89b28bdb32d90 100644
top_container()->DestroyLayer(); top_container()->DestroyLayer();
AddChildViewAt(top_container(), 0); AddChildViewAt(top_container(), 0);
EnsureFocusOrder(); EnsureFocusOrder();
@@ -4207,11 +4244,38 @@ void BrowserView::GetAccessiblePanes(std::vector<views::View*>* panes) { @@ -4206,11 +4243,38 @@ void BrowserView::GetAccessiblePanes(std::vector<views::View*>* panes) {
bool BrowserView::ShouldDescendIntoChildForEventHandling( bool BrowserView::ShouldDescendIntoChildForEventHandling(
gfx::NativeView child, gfx::NativeView child,
const gfx::Point& location) { const gfx::Point& location) {
@ -588,7 +588,7 @@ index 110812d2874d7..89b28bdb32d90 100644
// Draggable regions are defined relative to the web contents. // Draggable regions are defined relative to the web contents.
gfx::Point point_in_contents_web_view_coords(location); gfx::Point point_in_contents_web_view_coords(location);
views::View::ConvertPointToTarget(GetWidget()->GetRootView(), views::View::ConvertPointToTarget(GetWidget()->GetRootView(),
@@ -4220,7 +4284,7 @@ bool BrowserView::ShouldDescendIntoChildForEventHandling( @@ -4219,7 +4283,7 @@ bool BrowserView::ShouldDescendIntoChildForEventHandling(
// Draggable regions should be ignored for clicks into any browser view's // Draggable regions should be ignored for clicks into any browser view's
// owned widgets, for example alerts, permission prompts or find bar. // owned widgets, for example alerts, permission prompts or find bar.
@ -597,7 +597,7 @@ index 110812d2874d7..89b28bdb32d90 100644
point_in_contents_web_view_coords.x(), point_in_contents_web_view_coords.x(),
point_in_contents_web_view_coords.y()) || point_in_contents_web_view_coords.y()) ||
WidgetOwnedByAnchorContainsPoint(point_in_contents_web_view_coords); WidgetOwnedByAnchorContainsPoint(point_in_contents_web_view_coords);
@@ -4331,8 +4395,10 @@ void BrowserView::Layout(PassKey) { @@ -4330,8 +4394,10 @@ void BrowserView::Layout(PassKey) {
// TODO(jamescook): Why was this in the middle of layout code? // TODO(jamescook): Why was this in the middle of layout code?
toolbar_->location_bar()->omnibox_view()->SetFocusBehavior( toolbar_->location_bar()->omnibox_view()->SetFocusBehavior(
@ -610,7 +610,7 @@ index 110812d2874d7..89b28bdb32d90 100644
// Some of the situations when the BrowserView is laid out are: // Some of the situations when the BrowserView is laid out are:
// - Enter/exit immersive fullscreen mode. // - Enter/exit immersive fullscreen mode.
@@ -4398,6 +4464,11 @@ void BrowserView::AddedToWidget() { @@ -4397,6 +4463,11 @@ void BrowserView::AddedToWidget() {
SetThemeProfileForWindow(GetNativeWindow(), browser_->profile()); SetThemeProfileForWindow(GetNativeWindow(), browser_->profile());
#endif #endif
@ -622,7 +622,7 @@ index 110812d2874d7..89b28bdb32d90 100644
toolbar_->Init(); toolbar_->Init();
// TODO(pbos): Investigate whether the side panels should be creatable when // TODO(pbos): Investigate whether the side panels should be creatable when
@@ -4445,13 +4516,9 @@ void BrowserView::AddedToWidget() { @@ -4444,13 +4515,9 @@ void BrowserView::AddedToWidget() {
EnsureFocusOrder(); EnsureFocusOrder();
@ -638,7 +638,7 @@ index 110812d2874d7..89b28bdb32d90 100644
using_native_frame_ = frame_->ShouldUseNativeFrame(); using_native_frame_ = frame_->ShouldUseNativeFrame();
MaybeInitializeWebUITabStrip(); MaybeInitializeWebUITabStrip();
@@ -4882,7 +4949,8 @@ void BrowserView::ProcessFullscreen(bool fullscreen, @@ -4881,7 +4948,8 @@ void BrowserView::ProcessFullscreen(bool fullscreen,
// Undo our anti-jankiness hacks and force a re-layout. // Undo our anti-jankiness hacks and force a re-layout.
in_process_fullscreen_ = false; in_process_fullscreen_ = false;
ToolbarSizeChanged(false); ToolbarSizeChanged(false);
@ -648,7 +648,7 @@ index 110812d2874d7..89b28bdb32d90 100644
} }
bool BrowserView::ShouldUseImmersiveFullscreenForUrl(const GURL& url) const { bool BrowserView::ShouldUseImmersiveFullscreenForUrl(const GURL& url) const {
@@ -5304,6 +5372,8 @@ Profile* BrowserView::GetProfile() { @@ -5303,6 +5371,8 @@ Profile* BrowserView::GetProfile() {
} }
void BrowserView::UpdateUIForTabFullscreen() { void BrowserView::UpdateUIForTabFullscreen() {
@ -657,7 +657,7 @@ index 110812d2874d7..89b28bdb32d90 100644
frame()->GetFrameView()->UpdateFullscreenTopUI(); frame()->GetFrameView()->UpdateFullscreenTopUI();
} }
@@ -5326,6 +5396,8 @@ void BrowserView::HideDownloadShelf() { @@ -5325,6 +5395,8 @@ void BrowserView::HideDownloadShelf() {
} }
bool BrowserView::CanUserExitFullscreen() const { bool BrowserView::CanUserExitFullscreen() const {

View File

@ -1,8 +1,8 @@
diff --git content/browser/renderer_host/render_process_host_impl.cc content/browser/renderer_host/render_process_host_impl.cc diff --git content/browser/renderer_host/render_process_host_impl.cc content/browser/renderer_host/render_process_host_impl.cc
index 1dcae1e41f4dc..43951c1c55f1a 100644 index 6cb4496b03c26..323c87c5fbf55 100644
--- content/browser/renderer_host/render_process_host_impl.cc --- content/browser/renderer_host/render_process_host_impl.cc
+++ content/browser/renderer_host/render_process_host_impl.cc +++ content/browser/renderer_host/render_process_host_impl.cc
@@ -1624,7 +1624,8 @@ bool RenderProcessHostImpl::Init() { @@ -1628,7 +1628,8 @@ bool RenderProcessHostImpl::Init() {
// initialized because in tests the factory may never have been initialized. // initialized because in tests the factory may never have been initialized.
if (!GetBrowserContext()->IsOffTheRecord() && if (!GetBrowserContext()->IsOffTheRecord() &&
!base::CommandLine::ForCurrentProcess()->HasSwitch( !base::CommandLine::ForCurrentProcess()->HasSwitch(