Update to Chromium version 125.0.6422.112
This commit is contained in:
parent
e997249d53
commit
3d8f1c9064
|
@ -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.41',
|
'chromium_checkout': 'refs/tags/125.0.6422.112',
|
||||||
'depot_tools_checkout': '19199514e8'
|
'depot_tools_checkout': '19199514e8'
|
||||||
}
|
}
|
||||||
|
|
|
@ -74,7 +74,7 @@ index 8fbc9ab537c6d..e87d068678767 100644
|
||||||
}
|
}
|
||||||
|
|
||||||
diff --git chrome/browser/ui/BUILD.gn chrome/browser/ui/BUILD.gn
|
diff --git chrome/browser/ui/BUILD.gn chrome/browser/ui/BUILD.gn
|
||||||
index d6c14b3d70a75..577586f0dd8b4 100644
|
index aba6af9ae6940..6904372deb361 100644
|
||||||
--- chrome/browser/ui/BUILD.gn
|
--- chrome/browser/ui/BUILD.gn
|
||||||
+++ chrome/browser/ui/BUILD.gn
|
+++ chrome/browser/ui/BUILD.gn
|
||||||
@@ -8,6 +8,7 @@ import("//build/config/compiler/compiler.gni")
|
@@ -8,6 +8,7 @@ import("//build/config/compiler/compiler.gni")
|
||||||
|
@ -113,7 +113,7 @@ index d6c14b3d70a75..577586f0dd8b4 100644
|
||||||
"views/apps/app_info_dialog/arc_app_info_links_panel.cc",
|
"views/apps/app_info_dialog/arc_app_info_links_panel.cc",
|
||||||
"views/apps/app_info_dialog/arc_app_info_links_panel.h",
|
"views/apps/app_info_dialog/arc_app_info_links_panel.h",
|
||||||
"views/apps/chrome_app_window_client_views_chromeos.cc",
|
"views/apps/chrome_app_window_client_views_chromeos.cc",
|
||||||
@@ -5062,8 +5070,6 @@ static_library("ui") {
|
@@ -5063,8 +5071,6 @@ static_library("ui") {
|
||||||
"views/accessibility/theme_tracking_non_accessible_image_view.h",
|
"views/accessibility/theme_tracking_non_accessible_image_view.h",
|
||||||
"views/apps/app_dialog/app_dialog_view.cc",
|
"views/apps/app_dialog/app_dialog_view.cc",
|
||||||
"views/apps/app_dialog/app_dialog_view.h",
|
"views/apps/app_dialog/app_dialog_view.h",
|
||||||
|
@ -122,7 +122,7 @@ index d6c14b3d70a75..577586f0dd8b4 100644
|
||||||
"views/apps/app_info_dialog/app_info_dialog_container.cc",
|
"views/apps/app_info_dialog/app_info_dialog_container.cc",
|
||||||
"views/apps/app_info_dialog/app_info_dialog_container.h",
|
"views/apps/app_info_dialog/app_info_dialog_container.h",
|
||||||
"views/apps/app_info_dialog/app_info_dialog_views.cc",
|
"views/apps/app_info_dialog/app_info_dialog_views.cc",
|
||||||
@@ -6895,6 +6901,7 @@ static_library("ui") {
|
@@ -6896,6 +6902,7 @@ static_library("ui") {
|
||||||
if (enable_printing) {
|
if (enable_printing) {
|
||||||
deps += [
|
deps += [
|
||||||
"//components/printing/browser",
|
"//components/printing/browser",
|
||||||
|
|
|
@ -61,7 +61,7 @@ index 1a49cf67e0b17..edf5896d3594e 100644
|
||||||
case ui::SHOW_STATE_MAXIMIZED:
|
case ui::SHOW_STATE_MAXIMIZED:
|
||||||
return kSerializedShowStateMaximized;
|
return kSerializedShowStateMaximized;
|
||||||
diff --git content/browser/renderer_host/render_widget_host_view_base.cc content/browser/renderer_host/render_widget_host_view_base.cc
|
diff --git content/browser/renderer_host/render_widget_host_view_base.cc content/browser/renderer_host/render_widget_host_view_base.cc
|
||||||
index b1fd8fe22daa6..290912f76fb02 100644
|
index c87f6ad832393..23cd3314c1bfe 100644
|
||||||
--- content/browser/renderer_host/render_widget_host_view_base.cc
|
--- content/browser/renderer_host/render_widget_host_view_base.cc
|
||||||
+++ content/browser/renderer_host/render_widget_host_view_base.cc
|
+++ content/browser/renderer_host/render_widget_host_view_base.cc
|
||||||
@@ -669,6 +669,14 @@ float RenderWidgetHostViewBase::GetScaleOverrideForCapture() const {
|
@@ -669,6 +669,14 @@ float RenderWidgetHostViewBase::GetScaleOverrideForCapture() const {
|
||||||
|
@ -350,7 +350,7 @@ index 3151a2c872f4e..e14caeb1e6645 100644
|
||||||
base::WeakPtrFactory<DesktopWindowTreeHostLinux> weak_factory_{this};
|
base::WeakPtrFactory<DesktopWindowTreeHostLinux> weak_factory_{this};
|
||||||
};
|
};
|
||||||
diff --git ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc
|
diff --git ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc
|
||||||
index 26b46d12db49d..4d591f6453b3d 100644
|
index 44462f6079955..88b24cb1a2a71 100644
|
||||||
--- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc
|
--- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc
|
||||||
+++ ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc
|
+++ ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc
|
||||||
@@ -285,8 +285,8 @@ void DesktopWindowTreeHostPlatform::Init(const Widget::InitParams& params) {
|
@@ -285,8 +285,8 @@ void DesktopWindowTreeHostPlatform::Init(const Widget::InitParams& params) {
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
diff --git content/browser/web_contents/web_contents_impl.cc content/browser/web_contents/web_contents_impl.cc
|
diff --git content/browser/web_contents/web_contents_impl.cc content/browser/web_contents/web_contents_impl.cc
|
||||||
index c455f395b3d89..f39ffa5e1a7a4 100644
|
index f1a5a2e1f4d66..262bcc0181333 100644
|
||||||
--- content/browser/web_contents/web_contents_impl.cc
|
--- content/browser/web_contents/web_contents_impl.cc
|
||||||
+++ content/browser/web_contents/web_contents_impl.cc
|
+++ content/browser/web_contents/web_contents_impl.cc
|
||||||
@@ -3551,6 +3551,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
|
@@ -3551,6 +3551,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
|
||||||
|
@ -33,7 +33,7 @@ index c455f395b3d89..f39ffa5e1a7a4 100644
|
||||||
}
|
}
|
||||||
|
|
||||||
void WebContentsImpl::RenderWidgetDeleted(
|
void WebContentsImpl::RenderWidgetDeleted(
|
||||||
@@ -4583,6 +4593,15 @@ FrameTree* WebContentsImpl::CreateNewWindow(
|
@@ -4584,6 +4594,15 @@ FrameTree* WebContentsImpl::CreateNewWindow(
|
||||||
create_params.picture_in_picture_options = *(params.pip_options);
|
create_params.picture_in_picture_options = *(params.pip_options);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -49,7 +49,7 @@ index c455f395b3d89..f39ffa5e1a7a4 100644
|
||||||
// Check whether there is an available prerendered page for this navigation if
|
// Check whether there is an available prerendered page for this navigation if
|
||||||
// this is not for guest. If it exists, take WebContents pre-created for
|
// this is not for guest. If it exists, take WebContents pre-created for
|
||||||
// hosting the prerendered page instead of creating new WebContents.
|
// hosting the prerendered page instead of creating new WebContents.
|
||||||
@@ -8894,6 +8913,9 @@ void WebContentsImpl::SetFocusedFrame(FrameTreeNode* node,
|
@@ -8895,6 +8914,9 @@ void WebContentsImpl::SetFocusedFrame(FrameTreeNode* node,
|
||||||
}
|
}
|
||||||
|
|
||||||
CloseListenerManager::DidChangeFocusedFrame(this);
|
CloseListenerManager::DidChangeFocusedFrame(this);
|
||||||
|
|
Loading…
Reference in New Issue