diff --git a/DEPS b/DEPS index 12a325062923..51dfb85fd45b 100644 --- a/DEPS +++ b/DEPS @@ -2,7 +2,7 @@ gclient_gn_args_from = 'src' vars = { 'chromium_version': - '113.0.5660.0', + '113.0.5664.0', 'node_version': 'v18.15.0', 'nan_version': diff --git a/patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch b/patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch index ee9f3ca50278..3d3ee7e044c0 100644 --- a/patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch +++ b/patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch @@ -46,7 +46,7 @@ index 23fb26e3d3a490840a902eeacbf0f6399d57a606..3a171224b6b39300aada31cb530bbc2a sources += [ "certificate_viewer_stub.cc" ] } diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn -index 431ae4fdd73850a5c193bfd9d7d43b7cc0249091..fdcac26778eb066b4ed267739369c6efc78fcbcd 100644 +index 7cc9a6150d66e7c1af61092122eea0546f67ee85..177b5298c0aa10eb5bcb8890e628d4f3808c6dcf 100644 --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn @@ -6381,7 +6381,6 @@ test("unit_tests") { diff --git a/patches/chromium/printing.patch b/patches/chromium/printing.patch index 12eeef880370..aae77e4cc5f6 100644 --- a/patches/chromium/printing.patch +++ b/patches/chromium/printing.patch @@ -11,10 +11,10 @@ majority of changes originally come from these PRs: This patch also fixes callback for manual user cancellation and success. diff --git a/BUILD.gn b/BUILD.gn -index 66eee9bd513696b0ee86250e19e225260592ff97..ae4c221935790b1c4552576241b433553088e4ed 100644 +index 8f9e4ec219354a5408d76e089080d6c56c9af021..912f2c2568aba2ca08e1ea12d973e2c2974016ed 100644 --- a/BUILD.gn +++ b/BUILD.gn -@@ -978,7 +978,6 @@ if (is_win) { +@@ -983,7 +983,6 @@ if (is_win) { "//media:media_unittests", "//media/midi:midi_unittests", "//net:net_unittests", @@ -22,7 +22,7 @@ index 66eee9bd513696b0ee86250e19e225260592ff97..ae4c221935790b1c4552576241b43355 "//sql:sql_unittests", "//third_party/breakpad:symupload($host_toolchain)", "//ui/base:ui_base_unittests", -@@ -987,6 +986,10 @@ if (is_win) { +@@ -992,6 +991,10 @@ if (is_win) { "//ui/views:views_unittests", "//url:url_unittests", ] @@ -78,7 +78,7 @@ index 044b34d3738985f3e38476c37a189a5c06ed5353..8cf9832ca1ba864860bccb9b8cb4180d : PdfRenderSettings::Mode::POSTSCRIPT_LEVEL3; } diff --git a/chrome/browser/printing/print_view_manager_base.cc b/chrome/browser/printing/print_view_manager_base.cc -index 58a8f21df0925d8f9b0e7effce83aab1c031d45e..93eaad3275257228ad1c20b3408bb21e014f3e9b 100644 +index 4f9fe268ab1391b02b7c8a8feb6a4c1a66692003..65fffb51eef37df9499e96d008b7a65434322b2b 100644 --- a/chrome/browser/printing/print_view_manager_base.cc +++ b/chrome/browser/printing/print_view_manager_base.cc @@ -23,7 +23,9 @@ @@ -407,7 +407,7 @@ index 58a8f21df0925d8f9b0e7effce83aab1c031d45e..93eaad3275257228ad1c20b3408bb21e return true; if (!cookie) { -@@ -1116,7 +1176,7 @@ void PrintViewManagerBase::ReleasePrinterQuery() { +@@ -1115,7 +1175,7 @@ void PrintViewManagerBase::ReleasePrinterQuery() { } void PrintViewManagerBase::CompletePrintNow(content::RenderFrameHost* rfh) { @@ -416,7 +416,7 @@ index 58a8f21df0925d8f9b0e7effce83aab1c031d45e..93eaad3275257228ad1c20b3408bb21e for (auto& observer : GetObservers()) observer.OnPrintNow(rfh); -@@ -1164,7 +1224,7 @@ void PrintViewManagerBase::CompleteScriptedPrintAfterContentAnalysis( +@@ -1163,7 +1223,7 @@ void PrintViewManagerBase::CompleteScriptedPrintAfterContentAnalysis( bool allowed) { if (!allowed || !printing_rfh_ || IsCrashed() || !printing_rfh_->IsRenderFrameLive()) { @@ -604,7 +604,7 @@ index c440ebb5c43d7d6bd6aa1a32aad77980644f9f3e..6a1872f69998fb7dbcef048eb580fdf9 // Tells the browser printing failed. PrintingFailed(int32 cookie, PrintFailureReason reason); diff --git a/components/printing/renderer/print_render_frame_helper.cc b/components/printing/renderer/print_render_frame_helper.cc -index 7e7acaa2b35a931ba1c52191a816dd5b93c98b11..a7f5581bc26354014a73544ad8a7997464b4061c 100644 +index 3e98d89aa80f0c2907930c1ee6c4f65de6d9e3ee..f7ea78767b8f3b0bb28aa6fa942b0ae05ea84599 100644 --- a/components/printing/renderer/print_render_frame_helper.cc +++ b/components/printing/renderer/print_render_frame_helper.cc @@ -45,6 +45,7 @@ @@ -643,7 +643,7 @@ index 7e7acaa2b35a931ba1c52191a816dd5b93c98b11..a7f5581bc26354014a73544ad8a79974 if (!render_frame_gone_) frame->DispatchAfterPrintEvent(); -@@ -1441,7 +1443,8 @@ void PrintRenderFrameHelper::PrintForSystemDialog() { +@@ -1439,7 +1441,8 @@ void PrintRenderFrameHelper::PrintForSystemDialog() { } Print(frame, print_preview_context_.source_node(), @@ -653,7 +653,7 @@ index 7e7acaa2b35a931ba1c52191a816dd5b93c98b11..a7f5581bc26354014a73544ad8a79974 if (!render_frame_gone_) print_preview_context_.DispatchAfterPrintEvent(); // WARNING: |this| may be gone at this point. Do not do any more work here and -@@ -1490,6 +1493,8 @@ void PrintRenderFrameHelper::PrintPreview(base::Value::Dict settings) { +@@ -1488,6 +1491,8 @@ void PrintRenderFrameHelper::PrintPreview(base::Value::Dict settings) { if (ipc_nesting_level_ > kAllowedIpcDepthForPrint) return; @@ -662,7 +662,7 @@ index 7e7acaa2b35a931ba1c52191a816dd5b93c98b11..a7f5581bc26354014a73544ad8a79974 print_preview_context_.OnPrintPreview(); #if BUILDFLAG(IS_CHROMEOS_ASH) -@@ -2104,7 +2109,8 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) { +@@ -2105,7 +2110,8 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) { return; Print(duplicate_node.GetDocument().GetFrame(), duplicate_node, @@ -672,7 +672,7 @@ index 7e7acaa2b35a931ba1c52191a816dd5b93c98b11..a7f5581bc26354014a73544ad8a79974 // Check if |this| is still valid. if (!weak_this) return; -@@ -2119,7 +2125,9 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) { +@@ -2120,7 +2126,9 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) { void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame, const blink::WebNode& node, @@ -683,7 +683,7 @@ index 7e7acaa2b35a931ba1c52191a816dd5b93c98b11..a7f5581bc26354014a73544ad8a79974 // If still not finished with earlier print request simply ignore. if (prep_frame_view_) return; -@@ -2127,7 +2135,7 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame, +@@ -2128,7 +2136,7 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame, FrameReference frame_ref(frame); uint32_t expected_page_count = 0; @@ -692,7 +692,7 @@ index 7e7acaa2b35a931ba1c52191a816dd5b93c98b11..a7f5581bc26354014a73544ad8a79974 DidFinishPrinting(FAIL_PRINT_INIT); return; // Failed to init print page settings. } -@@ -2146,8 +2154,15 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame, +@@ -2147,8 +2155,15 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame, print_pages_params_->params->print_scaling_option; auto self = weak_ptr_factory_.GetWeakPtr(); @@ -709,7 +709,7 @@ index 7e7acaa2b35a931ba1c52191a816dd5b93c98b11..a7f5581bc26354014a73544ad8a79974 // Check if |this| is still valid. if (!self) return; -@@ -2402,37 +2417,49 @@ void PrintRenderFrameHelper::IPCProcessed() { +@@ -2402,35 +2417,47 @@ void PrintRenderFrameHelper::IPCProcessed() { } } @@ -744,10 +744,7 @@ index 7e7acaa2b35a931ba1c52191a816dd5b93c98b11..a7f5581bc26354014a73544ad8a79974 + settings->params->print_scaling_option = fit_to_paper_size ? mojom::PrintScalingOption::kFitToPrintableArea : mojom::PrintScalingOption::kSourceSize; - -- CHECK(PrintMsgPrintParamsIsValid(*settings.params)); - SetPrintPagesParams(settings); -+ CHECK(PrintMsgPrintParamsIsValid(*settings->params)); + SetPrintPagesParams(*settings); return true; } @@ -770,7 +767,7 @@ index 7e7acaa2b35a931ba1c52191a816dd5b93c98b11..a7f5581bc26354014a73544ad8a79974 return false; } -@@ -2537,7 +2564,7 @@ mojom::PrintPagesParamsPtr PrintRenderFrameHelper::GetPrintSettingsFromUser( +@@ -2534,7 +2561,7 @@ mojom::PrintPagesParamsPtr PrintRenderFrameHelper::GetPrintSettingsFromUser( std::move(params), base::BindOnce( [](base::OnceClosure quit_closure, mojom::PrintPagesParamsPtr* output, @@ -780,7 +777,7 @@ index 7e7acaa2b35a931ba1c52191a816dd5b93c98b11..a7f5581bc26354014a73544ad8a79974 std::move(quit_closure).Run(); }, diff --git a/components/printing/renderer/print_render_frame_helper.h b/components/printing/renderer/print_render_frame_helper.h -index 12dab2542d58b5a61eefd38420ee68687274b461..737a67a59f7a3e6fe026631def02d4c196b8875d 100644 +index 146fbcb2e6bd4348110ecc3220d6ac0ac59babf3..eecc3118033ef7fe1f17aba48cd19b17c334c942 100644 --- a/components/printing/renderer/print_render_frame_helper.h +++ b/components/printing/renderer/print_render_frame_helper.h @@ -253,7 +253,7 @@ class PrintRenderFrameHelper diff --git a/patches/chromium/refactor_restore_base_adaptcallbackforrepeating.patch b/patches/chromium/refactor_restore_base_adaptcallbackforrepeating.patch index 6e0a005c6344..2a8b8607e1ed 100644 --- a/patches/chromium/refactor_restore_base_adaptcallbackforrepeating.patch +++ b/patches/chromium/refactor_restore_base_adaptcallbackforrepeating.patch @@ -12,7 +12,7 @@ should be removed as soon as those have been updated. Patching because every instance is a FTBFS that prevents testing any one instance's fix. diff --git a/base/functional/callback_helpers.h b/base/functional/callback_helpers.h -index 19d605162f11a09123d4e32336ce961817d780de..2ab5a2b70dc89229225d52ff23d9d80952ca685d 100644 +index 8bb763638e14d226103338202d617e8836d21389..4b7e96c02da2337478e5b4ed67d293b4e8a036bf 100644 --- a/base/functional/callback_helpers.h +++ b/base/functional/callback_helpers.h @@ -97,6 +97,22 @@ class OnceCallbackHolder final { diff --git a/patches/chromium/webview_cross_drag.patch b/patches/chromium/webview_cross_drag.patch index e42b08ebde13..592c0f1b285a 100644 --- a/patches/chromium/webview_cross_drag.patch +++ b/patches/chromium/webview_cross_drag.patch @@ -8,7 +8,7 @@ This allows dragging and dropping between s. Originally landed in https://github.com/electron/libchromiumcontent/pull/267 diff --git a/content/browser/web_contents/web_contents_view_aura.cc b/content/browser/web_contents/web_contents_view_aura.cc -index 37b75adc1ef25d1688ea63da083c8dd764e953c8..63175581edc351e3dc13caa97ab0b86d1a7791c8 100644 +index d85232514f1a272e435489f7baecfa12b61288b8..07c20acd985351117edd270f65d9569c138742c4 100644 --- a/content/browser/web_contents/web_contents_view_aura.cc +++ b/content/browser/web_contents/web_contents_view_aura.cc @@ -919,10 +919,7 @@ bool WebContentsViewAura::IsValidDragTarget( diff --git a/patches/chromium/worker_context_will_destroy.patch b/patches/chromium/worker_context_will_destroy.patch index 1d51cf4f9c5e..a767dad189ba 100644 --- a/patches/chromium/worker_context_will_destroy.patch +++ b/patches/chromium/worker_context_will_destroy.patch @@ -67,10 +67,10 @@ index 7b45e20cd208ffe01005898b5345a478b74fb96a..0933ffefcb4e736607f42729d334b161 const WebSecurityOrigin& script_origin) { return false; diff --git a/third_party/blink/renderer/core/workers/worker_thread.cc b/third_party/blink/renderer/core/workers/worker_thread.cc -index 1073865e634bb5a435ec638a4abc14462e4b16cb..33408c339c21704c433377ed3c7462c7f4b0b8f3 100644 +index b52cbc1f1393551e95f885b415ae12a1c2d58ab0..3fbdd5054881fef201158a8b71279fadf1f87fe9 100644 --- a/third_party/blink/renderer/core/workers/worker_thread.cc +++ b/third_party/blink/renderer/core/workers/worker_thread.cc -@@ -754,6 +754,12 @@ void WorkerThread::PrepareForShutdownOnWorkerThread() { +@@ -767,6 +767,12 @@ void WorkerThread::PrepareForShutdownOnWorkerThread() { } pause_handle_.reset(); diff --git a/patches/v8/build_gn.patch b/patches/v8/build_gn.patch index 6e20517f0589..343aade44d34 100644 --- a/patches/v8/build_gn.patch +++ b/patches/v8/build_gn.patch @@ -9,7 +9,7 @@ necessary for native modules to load. Also, some fixes relating to mksnapshot on ARM. diff --git a/BUILD.gn b/BUILD.gn -index c9ffeb8601d2929e115ff73e7af762be3df5a6b8..c9ef4bb0d47af0688bbc32e3ab2c1ccda3190a7d 100644 +index 0d309f4b58076f5e9d12e19040457336e9ca3abd..d9c438ad5c01375ebea66fdb7697941c660d4c6e 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -688,7 +688,7 @@ config("internal_config") { @@ -21,7 +21,7 @@ index c9ffeb8601d2929e115ff73e7af762be3df5a6b8..c9ef4bb0d47af0688bbc32e3ab2c1ccd defines += [ "BUILDING_V8_SHARED" ] } -@@ -6397,7 +6397,7 @@ if (current_toolchain == v8_generator_toolchain) { +@@ -6378,7 +6378,7 @@ if (current_toolchain == v8_generator_toolchain) { "src/interpreter/bytecodes.h", ] diff --git a/patches/v8/do_not_export_private_v8_symbols_on_windows.patch b/patches/v8/do_not_export_private_v8_symbols_on_windows.patch index 141dea5b485b..2efdd0b7a275 100644 --- a/patches/v8/do_not_export_private_v8_symbols_on_windows.patch +++ b/patches/v8/do_not_export_private_v8_symbols_on_windows.patch @@ -12,7 +12,7 @@ This patch can be safely removed if, when it is removed, `node.lib` does not contain any standard C++ library exports (e.g. `std::ostringstream`). diff --git a/BUILD.gn b/BUILD.gn -index 8bd530b943f8a23c853a47850aebd924c363745f..c4b233efe42950a38ed0fae2308e059ed0327347 100644 +index 44c0836956a0a4f4188b3bf08ceee5f9bf2d6f23..2299f58d167937e8e86943764f979e75c14c9ee6 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -688,6 +688,10 @@ config("internal_config") { diff --git a/patches/v8/expose_mksnapshot.patch b/patches/v8/expose_mksnapshot.patch index c519c9745a6b..ac5c2b430861 100644 --- a/patches/v8/expose_mksnapshot.patch +++ b/patches/v8/expose_mksnapshot.patch @@ -6,10 +6,10 @@ Subject: expose_mksnapshot.patch Needed in order to target mksnapshot for mksnapshot zip. diff --git a/BUILD.gn b/BUILD.gn -index c9ef4bb0d47af0688bbc32e3ab2c1ccda3190a7d..8bd530b943f8a23c853a47850aebd924c363745f 100644 +index d9c438ad5c01375ebea66fdb7697941c660d4c6e..44c0836956a0a4f4188b3bf08ceee5f9bf2d6f23 100644 --- a/BUILD.gn +++ b/BUILD.gn -@@ -6409,7 +6409,6 @@ if (current_toolchain == v8_generator_toolchain) { +@@ -6390,7 +6390,6 @@ if (current_toolchain == v8_generator_toolchain) { if (current_toolchain == v8_snapshot_toolchain) { v8_executable("mksnapshot") { diff --git a/shell/browser/ui/webui/accessibility_ui.cc b/shell/browser/ui/webui/accessibility_ui.cc index e086ce289f4f..48ea4add9af1 100644 --- a/shell/browser/ui/webui/accessibility_ui.cc +++ b/shell/browser/ui/webui/accessibility_ui.cc @@ -307,7 +307,9 @@ ElectronAccessibilityUI::ElectronAccessibilityUI(content::WebUI* web_ui) : content::WebUIController(web_ui) { // Set up the chrome://accessibility source. content::WebUIDataSource* html_source = - content::WebUIDataSource::Create(chrome::kChromeUIAccessibilityHost); + content::WebUIDataSource::CreateAndAdd( + web_ui->GetWebContents()->GetBrowserContext(), + chrome::kChromeUIAccessibilityHost); // Add required resources. html_source->UseStringsJs(); @@ -319,10 +321,6 @@ ElectronAccessibilityUI::ElectronAccessibilityUI(content::WebUI* web_ui) base::BindRepeating(&HandleAccessibilityRequestCallback, web_ui->GetWebContents()->GetBrowserContext())); - content::BrowserContext* browser_context = - web_ui->GetWebContents()->GetBrowserContext(); - content::WebUIDataSource::Add(browser_context, html_source); - web_ui->AddMessageHandler( std::make_unique()); }