mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 126.0.6478.183
This commit is contained in:
committed by
Marshall Greenblatt
parent
c23cfb8b01
commit
dca51c71fd
@@ -7,5 +7,5 @@
|
|||||||
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
|
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
|
||||||
|
|
||||||
{
|
{
|
||||||
'chromium_checkout': 'refs/tags/126.0.6478.127'
|
'chromium_checkout': 'refs/tags/126.0.6478.183'
|
||||||
}
|
}
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
diff --git DEPS DEPS
|
diff --git DEPS DEPS
|
||||||
index cf0643c7479f8..1b8ca66068aa0 100644
|
index faa0c930d80f9..093beb1feafca 100644
|
||||||
--- DEPS
|
--- DEPS
|
||||||
+++ DEPS
|
+++ DEPS
|
||||||
@@ -2102,16 +2102,16 @@ deps = {
|
@@ -2102,16 +2102,16 @@ deps = {
|
||||||
|
@@ -20,7 +20,7 @@ index 7822aeab4826a..fa72112bfee98 100644
|
|||||||
|
|
||||||
// Make an exception to allow most visited tiles to commit in
|
// Make an exception to allow most visited tiles to commit in
|
||||||
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 77ee94a9c99b6..524828a13d762 100644
|
index 6edf9572aec89..0bd41f059307d 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
|
||||||
@@ -7974,10 +7974,22 @@ NavigationRequest::GetOriginForURLLoaderFactoryBeforeResponseWithDebugInfo(
|
@@ -7974,10 +7974,22 @@ NavigationRequest::GetOriginForURLLoaderFactoryBeforeResponseWithDebugInfo(
|
||||||
|
@@ -76,7 +76,7 @@ index 1da479dd5eebc..ff9c7e467997c 100644
|
|||||||
- visual_studio_runtime_dirs = []
|
- visual_studio_runtime_dirs = []
|
||||||
}
|
}
|
||||||
diff --git chrome/chrome_paks.gni chrome/chrome_paks.gni
|
diff --git chrome/chrome_paks.gni chrome/chrome_paks.gni
|
||||||
index 87e4b167b6a55..6dafb9ac4ed94 100644
|
index 55de354155c57..f0af186ba8c8d 100644
|
||||||
--- chrome/chrome_paks.gni
|
--- chrome/chrome_paks.gni
|
||||||
+++ chrome/chrome_paks.gni
|
+++ chrome/chrome_paks.gni
|
||||||
@@ -5,6 +5,7 @@
|
@@ -5,6 +5,7 @@
|
||||||
|
@@ -1,8 +1,8 @@
|
|||||||
diff --git tools/gritsettings/resource_ids.spec tools/gritsettings/resource_ids.spec
|
diff --git tools/gritsettings/resource_ids.spec tools/gritsettings/resource_ids.spec
|
||||||
index 06d0495497697..320803be93f6b 100644
|
index 76c5e6b9e2cd2..d55c6665a9411 100644
|
||||||
--- tools/gritsettings/resource_ids.spec
|
--- tools/gritsettings/resource_ids.spec
|
||||||
+++ tools/gritsettings/resource_ids.spec
|
+++ tools/gritsettings/resource_ids.spec
|
||||||
@@ -1312,6 +1312,15 @@
|
@@ -1315,6 +1315,15 @@
|
||||||
# END "everything else" section.
|
# END "everything else" section.
|
||||||
# Everything but chrome/, components/, content/, and ios/
|
# Everything but chrome/, components/, content/, and ios/
|
||||||
|
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
diff --git ui/base/models/simple_menu_model.cc ui/base/models/simple_menu_model.cc
|
diff --git ui/base/models/simple_menu_model.cc ui/base/models/simple_menu_model.cc
|
||||||
index 88e27362452e5..9c18ac5c77544 100644
|
index bd42c5630ccf0..0c4efb9d44fa9 100644
|
||||||
--- ui/base/models/simple_menu_model.cc
|
--- ui/base/models/simple_menu_model.cc
|
||||||
+++ ui/base/models/simple_menu_model.cc
|
+++ ui/base/models/simple_menu_model.cc
|
||||||
@@ -10,6 +10,7 @@
|
@@ -10,6 +10,7 @@
|
||||||
|
@@ -350,7 +350,7 @@ index e698f71577c51..8a6e28128564d 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 0490b0f83b8e6..66c2858145e42 100644
|
index fef32675148d1..ac0f316f475f6 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
|
||||||
@@ -281,8 +281,8 @@ void DesktopWindowTreeHostPlatform::Init(const Widget::InitParams& params) {
|
@@ -281,8 +281,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 d08ad3ae25ab3..0979551ef5fcb 100644
|
index eb1953c745c77..03b1d98c1bb07 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
|
||||||
@@ -3578,6 +3578,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
|
@@ -3578,6 +3578,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
|
||||||
|
Reference in New Issue
Block a user