Update to Chromium version 112.0.5615.49
This commit is contained in:
parent
aad7246e7f
commit
ef29713a46
|
@ -7,6 +7,6 @@
|
|||
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
|
||||
|
||||
{
|
||||
'chromium_checkout': 'refs/tags/112.0.5615.29',
|
||||
'chromium_checkout': 'refs/tags/112.0.5615.49',
|
||||
'depot_tools_checkout': '424814829a'
|
||||
}
|
||||
|
|
|
@ -20,10 +20,10 @@ index 4dbf8a2811c9e..917b6a2e7b56f 100644
|
|||
|
||||
// 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
|
||||
index 05de1c051b9c5..cc54536c2237a 100644
|
||||
index d979fc0def505..aa41b2a792e4e 100644
|
||||
--- content/browser/renderer_host/navigation_request.cc
|
||||
+++ content/browser/renderer_host/navigation_request.cc
|
||||
@@ -7002,10 +7002,22 @@ NavigationRequest::GetOriginForURLLoaderFactoryBeforeResponseWithDebugInfo(
|
||||
@@ -7021,10 +7021,22 @@ NavigationRequest::GetOriginForURLLoaderFactoryBeforeResponseWithDebugInfo(
|
||||
bool use_opaque_origin =
|
||||
(sandbox_flags & network::mojom::WebSandboxFlags::kOrigin) ==
|
||||
network::mojom::WebSandboxFlags::kOrigin;
|
||||
|
@ -47,7 +47,7 @@ index 05de1c051b9c5..cc54536c2237a 100644
|
|||
}
|
||||
|
||||
return origin_and_debug_info;
|
||||
@@ -7035,6 +7047,15 @@ NavigationRequest::GetOriginForURLLoaderFactoryAfterResponseWithDebugInfo() {
|
||||
@@ -7054,6 +7066,15 @@ NavigationRequest::GetOriginForURLLoaderFactoryAfterResponseWithDebugInfo() {
|
||||
GetOriginForURLLoaderFactoryBeforeResponseWithDebugInfo(
|
||||
SandboxFlagsToCommit());
|
||||
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
diff --git chrome/browser/BUILD.gn chrome/browser/BUILD.gn
|
||||
index d04103392bf00..fe8a89a40274f 100644
|
||||
index 0ddbd541f7ef4..a0d78f2db93a6 100644
|
||||
--- chrome/browser/BUILD.gn
|
||||
+++ chrome/browser/BUILD.gn
|
||||
@@ -11,6 +11,7 @@ import("//build/config/compiler/pgo/pgo.gni")
|
||||
|
@ -29,7 +29,7 @@ index d04103392bf00..fe8a89a40274f 100644
|
|||
if (is_android) {
|
||||
sources += [
|
||||
"after_startup_task_utils_android.cc",
|
||||
@@ -6100,8 +6106,6 @@ static_library("browser") {
|
||||
@@ -6102,8 +6108,6 @@ static_library("browser") {
|
||||
sources += [
|
||||
"enterprise/chrome_browser_main_extra_parts_enterprise.cc",
|
||||
"enterprise/chrome_browser_main_extra_parts_enterprise.h",
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
diff --git printing/printing_context_linux.cc printing/printing_context_linux.cc
|
||||
index 5520e15c232c8..2648037fcf37e 100644
|
||||
index 63af3dd95eada..dc89a9c5c5e47 100644
|
||||
--- printing/printing_context_linux.cc
|
||||
+++ printing/printing_context_linux.cc
|
||||
@@ -69,11 +69,11 @@ mojom::ResultCode PrintingContextLinux::UseDefaultSettings() {
|
||||
|
@ -13,10 +13,10 @@ index 5520e15c232c8..2648037fcf37e 100644
|
|||
if (!print_dialog_)
|
||||
- print_dialog_ = ui::LinuxUi::instance()->CreatePrintDialog(this);
|
||||
+ print_dialog_ = ui::PrintingContextLinuxDelegate::instance()->CreatePrintDialog(this);
|
||||
print_dialog_->UseDefaultSettings();
|
||||
#endif
|
||||
|
||||
@@ -82,8 +82,8 @@ mojom::ResultCode PrintingContextLinux::UseDefaultSettings() {
|
||||
if (print_dialog_) {
|
||||
print_dialog_->UseDefaultSettings();
|
||||
@@ -85,8 +85,8 @@ mojom::ResultCode PrintingContextLinux::UseDefaultSettings() {
|
||||
|
||||
gfx::Size PrintingContextLinux::GetPdfPaperSizeDeviceUnits() {
|
||||
#if BUILDFLAG(IS_LINUX)
|
||||
|
@ -27,7 +27,7 @@ index 5520e15c232c8..2648037fcf37e 100644
|
|||
#endif
|
||||
|
||||
return gfx::Size();
|
||||
@@ -95,11 +95,11 @@ mojom::ResultCode PrintingContextLinux::UpdatePrinterSettings(
|
||||
@@ -98,11 +98,11 @@ mojom::ResultCode PrintingContextLinux::UpdatePrinterSettings(
|
||||
DCHECK(!in_print_job_);
|
||||
|
||||
#if BUILDFLAG(IS_LINUX)
|
||||
|
@ -39,8 +39,8 @@ index 5520e15c232c8..2648037fcf37e 100644
|
|||
- print_dialog_ = ui::LinuxUi::instance()->CreatePrintDialog(this);
|
||||
+ print_dialog_ = ui::PrintingContextLinuxDelegate::instance()->CreatePrintDialog(this);
|
||||
|
||||
if (print_dialog_) {
|
||||
// PrintDialogGtk::UpdateSettings() calls InitWithSettings() so settings_ will
|
||||
// remain non-null after this line.
|
||||
diff --git ui/linux/linux_ui.cc ui/linux/linux_ui.cc
|
||||
index 29db798e8b171..f8b9546b90321 100644
|
||||
--- ui/linux/linux_ui.cc
|
||||
|
@ -76,7 +76,7 @@ index 29db798e8b171..f8b9546b90321 100644
|
|||
}
|
||||
|
||||
diff --git ui/linux/linux_ui.h ui/linux/linux_ui.h
|
||||
index b5fd57741d2f4..eaab5f1bd2b0b 100644
|
||||
index 82d40cb5fa1b9..0a08bec8a6e61 100644
|
||||
--- ui/linux/linux_ui.h
|
||||
+++ ui/linux/linux_ui.h
|
||||
@@ -18,6 +18,10 @@
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
diff --git content/browser/web_contents/web_contents_impl.cc content/browser/web_contents/web_contents_impl.cc
|
||||
index b04b88882583c..845ed246b53e3 100644
|
||||
index ddfd5e91cf73a..a859c3cbb5b73 100644
|
||||
--- content/browser/web_contents/web_contents_impl.cc
|
||||
+++ content/browser/web_contents/web_contents_impl.cc
|
||||
@@ -3165,6 +3165,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
|
||||
|
@ -49,7 +49,7 @@ index b04b88882583c..845ed246b53e3 100644
|
|||
// 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
|
||||
// hosting the prerendered page instead of creating new WebContents.
|
||||
@@ -7991,6 +8010,9 @@ void WebContentsImpl::SetFocusedFrame(FrameTreeNode* node,
|
||||
@@ -7997,6 +8016,9 @@ void WebContentsImpl::SetFocusedFrame(FrameTreeNode* node,
|
||||
// frames).
|
||||
SetFocusedFrameTree(&node->frame_tree());
|
||||
}
|
||||
|
|
|
@ -62,10 +62,10 @@ index dcd53ce7503b0..a30c89bf46884 100644
|
|||
gfx::Transform device_emulation_transform_;
|
||||
|
||||
diff --git third_party/blink/renderer/core/page/chrome_client_impl.cc third_party/blink/renderer/core/page/chrome_client_impl.cc
|
||||
index c1e0b9eff83cb..333ad8c8e2990 100644
|
||||
index 77260f7c32736..3958ea3f812c2 100644
|
||||
--- third_party/blink/renderer/core/page/chrome_client_impl.cc
|
||||
+++ third_party/blink/renderer/core/page/chrome_client_impl.cc
|
||||
@@ -916,7 +916,7 @@ bool ChromeClientImpl::HasOpenedPopup() const {
|
||||
@@ -913,7 +913,7 @@ bool ChromeClientImpl::HasOpenedPopup() const {
|
||||
PopupMenu* ChromeClientImpl::OpenPopupMenu(LocalFrame& frame,
|
||||
HTMLSelectElement& select) {
|
||||
NotifyPopupOpeningObservers();
|
||||
|
|
Loading…
Reference in New Issue