From b8d13a584a017f52255fdcfc156dd8d3d8beebd0 Mon Sep 17 00:00:00 2001 From: "electron-roller[bot]" <84116207+electron-roller[bot]@users.noreply.github.com> Date: Sat, 26 Mar 2022 13:00:18 +0000 Subject: [PATCH 01/18] chore: bump chromium in DEPS to 102.0.4965.0 --- DEPS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEPS b/DEPS index 00113fcca6410..5637ed7c95268 100644 --- a/DEPS +++ b/DEPS @@ -2,7 +2,7 @@ gclient_gn_args_from = 'src' vars = { 'chromium_version': - '102.0.4962.3', + '102.0.4965.0', 'node_version': 'v16.14.2', 'nan_version': From 98922e1483ff05de5dd474e2aa117f0cbe4f8a3c Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Sat, 26 Mar 2022 15:07:51 -0500 Subject: [PATCH 02/18] chore: 3-way merge of chromium/printing.patch --- patches/chromium/printing.patch | 80 +++++++++++++++++---------------- 1 file changed, 41 insertions(+), 39 deletions(-) diff --git a/patches/chromium/printing.patch b/patches/chromium/printing.patch index 6aae32dba1e9f..6c573f3a23def 100644 --- a/patches/chromium/printing.patch +++ b/patches/chromium/printing.patch @@ -10,6 +10,8 @@ majority of changes originally come from these PRs: This patch also fixes callback for manual user cancellation and success. +Patch-Filename: printing.patch + diff --git a/chrome/browser/printing/print_job.cc b/chrome/browser/printing/print_job.cc index 8d40bbf98d4d58704f118cb42039b0956a9f6639..06196c0fa02012a5faa82471bd39fac087918f54 100644 --- a/chrome/browser/printing/print_job.cc @@ -127,7 +129,7 @@ index 52a13c0c47f7f3f18c4f552806add67291ce8726..765bde402fec094b51faea68e67d3782 void PrintJobWorkerOop::UnregisterServiceManagerClient() { diff --git a/chrome/browser/printing/print_view_manager_base.cc b/chrome/browser/printing/print_view_manager_base.cc -index 1f37c11047d47bb2d65975fa69f33d822206dd08..d13ee6a81cd7edc5be99f595515ca521e01702ac 100644 +index 8765dc3c49ce8a77bc7f4f5979591a5a193757ca..c2ed5bee02b6d814cae63a9089c0ebdca36b5173 100644 --- a/chrome/browser/printing/print_view_manager_base.cc +++ b/chrome/browser/printing/print_view_manager_base.cc @@ -30,10 +30,10 @@ @@ -151,7 +153,7 @@ index 1f37c11047d47bb2d65975fa69f33d822206dd08..d13ee6a81cd7edc5be99f595515ca521 #include "mojo/public/cpp/system/buffer.h" #include "printing/buildflags/buildflags.h" #include "printing/metafile_skia.h" -@@ -86,6 +87,8 @@ using PrintSettingsCallback = +@@ -87,6 +88,8 @@ using PrintSettingsCallback = base::OnceCallback)>; void ShowWarningMessageBox(const std::u16string& message) { @@ -160,7 +162,7 @@ index 1f37c11047d47bb2d65975fa69f33d822206dd08..d13ee6a81cd7edc5be99f595515ca521 // Runs always on the UI thread. static bool is_dialog_shown = false; if (is_dialog_shown) -@@ -94,6 +97,7 @@ void ShowWarningMessageBox(const std::u16string& message) { +@@ -95,6 +98,7 @@ void ShowWarningMessageBox(const std::u16string& message) { base::AutoReset auto_reset(&is_dialog_shown, true); chrome::ShowWarningMessageBox(nullptr, std::u16string(), message); @@ -168,7 +170,7 @@ index 1f37c11047d47bb2d65975fa69f33d822206dd08..d13ee6a81cd7edc5be99f595515ca521 } #if BUILDFLAG(ENABLE_PRINT_PREVIEW) -@@ -191,7 +195,9 @@ void UpdatePrintSettingsReplyOnIO( +@@ -192,7 +196,9 @@ void UpdatePrintSettingsReplyOnIO( DCHECK_CURRENTLY_ON(content::BrowserThread::IO); DCHECK(printer_query); mojom::PrintPagesParamsPtr params = CreateEmptyPrintPagesParamsPtr(); @@ -179,7 +181,7 @@ index 1f37c11047d47bb2d65975fa69f33d822206dd08..d13ee6a81cd7edc5be99f595515ca521 RenderParamsFromPrintSettings(printer_query->settings(), params->params.get()); params->params->document_cookie = printer_query->cookie(); -@@ -244,6 +250,7 @@ void ScriptedPrintReplyOnIO( +@@ -245,6 +251,7 @@ void ScriptedPrintReplyOnIO( mojom::PrintManagerHost::ScriptedPrintCallback callback) { DCHECK_CURRENTLY_ON(content::BrowserThread::IO); mojom::PrintPagesParamsPtr params = CreateEmptyPrintPagesParamsPtr(); @@ -187,7 +189,7 @@ index 1f37c11047d47bb2d65975fa69f33d822206dd08..d13ee6a81cd7edc5be99f595515ca521 if (printer_query->last_status() == mojom::ResultCode::kSuccess && printer_query->settings().dpi()) { RenderParamsFromPrintSettings(printer_query->settings(), -@@ -253,8 +260,9 @@ void ScriptedPrintReplyOnIO( +@@ -254,8 +261,9 @@ void ScriptedPrintReplyOnIO( } bool has_valid_cookie = params->params->document_cookie; bool has_dpi = !params->params->dpi.IsEmpty(); @@ -198,7 +200,7 @@ index 1f37c11047d47bb2d65975fa69f33d822206dd08..d13ee6a81cd7edc5be99f595515ca521 if (has_dpi && has_valid_cookie) { queue->QueuePrinterQuery(std::move(printer_query)); -@@ -292,12 +300,14 @@ PrintViewManagerBase::PrintViewManagerBase(content::WebContents* web_contents) +@@ -293,12 +301,14 @@ PrintViewManagerBase::PrintViewManagerBase(content::WebContents* web_contents) : PrintManager(web_contents), queue_(g_browser_process->print_job_manager()->queue()) { DCHECK(queue_); @@ -213,7 +215,7 @@ index 1f37c11047d47bb2d65975fa69f33d822206dd08..d13ee6a81cd7edc5be99f595515ca521 } PrintViewManagerBase::~PrintViewManagerBase() { -@@ -305,7 +315,10 @@ PrintViewManagerBase::~PrintViewManagerBase() { +@@ -306,7 +316,10 @@ PrintViewManagerBase::~PrintViewManagerBase() { DisconnectFromCurrentPrintJob(); } @@ -225,7 +227,7 @@ index 1f37c11047d47bb2d65975fa69f33d822206dd08..d13ee6a81cd7edc5be99f595515ca521 // Remember the ID for `rfh`, to enable checking that the `RenderFrameHost` // is still valid after a possible inner message loop runs in // `DisconnectFromCurrentPrintJob()`. -@@ -328,7 +341,9 @@ bool PrintViewManagerBase::PrintNow(content::RenderFrameHost* rfh) { +@@ -329,7 +342,9 @@ bool PrintViewManagerBase::PrintNow(content::RenderFrameHost* rfh) { // go in `ReleasePrintJob()`. SetPrintingRFH(rfh); @@ -236,7 +238,7 @@ index 1f37c11047d47bb2d65975fa69f33d822206dd08..d13ee6a81cd7edc5be99f595515ca521 for (auto& observer : GetObservers()) observer.OnPrintNow(rfh); -@@ -471,7 +486,8 @@ void PrintViewManagerBase::GetDefaultPrintSettingsReply( +@@ -472,7 +487,8 @@ void PrintViewManagerBase::GetDefaultPrintSettingsReply( void PrintViewManagerBase::ScriptedPrintReply( ScriptedPrintCallback callback, int process_id, @@ -246,7 +248,7 @@ index 1f37c11047d47bb2d65975fa69f33d822206dd08..d13ee6a81cd7edc5be99f595515ca521 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); if (!content::RenderProcessHost::FromID(process_id)) { -@@ -479,16 +495,19 @@ void PrintViewManagerBase::ScriptedPrintReply( +@@ -480,16 +496,19 @@ void PrintViewManagerBase::ScriptedPrintReply( return; } @@ -270,7 +272,7 @@ index 1f37c11047d47bb2d65975fa69f33d822206dd08..d13ee6a81cd7edc5be99f595515ca521 } void PrintViewManagerBase::NavigationStopped() { -@@ -602,12 +621,13 @@ void PrintViewManagerBase::DidPrintDocument( +@@ -605,12 +624,13 @@ void PrintViewManagerBase::DidPrintDocument( void PrintViewManagerBase::GetDefaultPrintSettings( GetDefaultPrintSettingsCallback callback) { DCHECK_CURRENTLY_ON(content::BrowserThread::UI); @@ -285,7 +287,7 @@ index 1f37c11047d47bb2d65975fa69f33d822206dd08..d13ee6a81cd7edc5be99f595515ca521 content::RenderFrameHost* render_frame_host = GetCurrentTargetFrame(); auto callback_wrapper = base::BindOnce(&PrintViewManagerBase::GetDefaultPrintSettingsReply, -@@ -624,18 +644,20 @@ void PrintViewManagerBase::UpdatePrintSettings( +@@ -627,18 +647,20 @@ void PrintViewManagerBase::UpdatePrintSettings( base::Value job_settings, UpdatePrintSettingsCallback callback) { DCHECK_CURRENTLY_ON(content::BrowserThread::UI); @@ -307,7 +309,7 @@ index 1f37c11047d47bb2d65975fa69f33d822206dd08..d13ee6a81cd7edc5be99f595515ca521 content::BrowserContext* context = web_contents() ? web_contents()->GetBrowserContext() : nullptr; PrefService* prefs = -@@ -645,6 +667,7 @@ void PrintViewManagerBase::UpdatePrintSettings( +@@ -648,6 +670,7 @@ void PrintViewManagerBase::UpdatePrintSettings( if (value > 0) job_settings.SetIntKey(kSettingRasterizePdfDpi, value); } @@ -315,7 +317,7 @@ index 1f37c11047d47bb2d65975fa69f33d822206dd08..d13ee6a81cd7edc5be99f595515ca521 auto callback_wrapper = base::BindOnce(&PrintViewManagerBase::UpdatePrintSettingsReply, -@@ -670,7 +693,7 @@ void PrintViewManagerBase::ScriptedPrint(mojom::ScriptedPrintParamsPtr params, +@@ -673,7 +696,7 @@ void PrintViewManagerBase::ScriptedPrint(mojom::ScriptedPrintParamsPtr params, // didn't happen for some reason. bad_message::ReceivedBadMessage( render_process_host, bad_message::PVMB_SCRIPTED_PRINT_FENCED_FRAME); @@ -324,7 +326,7 @@ index 1f37c11047d47bb2d65975fa69f33d822206dd08..d13ee6a81cd7edc5be99f595515ca521 return; } auto callback_wrapper = base::BindOnce( -@@ -691,7 +714,6 @@ void PrintViewManagerBase::PrintingFailed(int32_t cookie) { +@@ -694,7 +717,6 @@ void PrintViewManagerBase::PrintingFailed(int32_t cookie) { PrintManager::PrintingFailed(cookie); #if !BUILDFLAG(IS_ANDROID) // Android does not implement this function. @@ -332,7 +334,7 @@ index 1f37c11047d47bb2d65975fa69f33d822206dd08..d13ee6a81cd7edc5be99f595515ca521 #endif ReleasePrinterQuery(); -@@ -706,6 +728,11 @@ void PrintViewManagerBase::RemoveObserver(Observer& observer) { +@@ -709,6 +731,11 @@ void PrintViewManagerBase::RemoveObserver(Observer& observer) { } void PrintViewManagerBase::ShowInvalidPrinterSettingsError() { @@ -344,7 +346,7 @@ index 1f37c11047d47bb2d65975fa69f33d822206dd08..d13ee6a81cd7edc5be99f595515ca521 base::ThreadTaskRunnerHandle::Get()->PostTask( FROM_HERE, base::BindOnce(&ShowWarningMessageBox, l10n_util::GetStringUTF16( -@@ -716,10 +743,12 @@ void PrintViewManagerBase::RenderFrameHostStateChanged( +@@ -719,10 +746,12 @@ void PrintViewManagerBase::RenderFrameHostStateChanged( content::RenderFrameHost* render_frame_host, content::RenderFrameHost::LifecycleState /*old_state*/, content::RenderFrameHost::LifecycleState new_state) { @@ -357,7 +359,7 @@ index 1f37c11047d47bb2d65975fa69f33d822206dd08..d13ee6a81cd7edc5be99f595515ca521 } void PrintViewManagerBase::DidStartLoading() { -@@ -779,6 +808,11 @@ void PrintViewManagerBase::OnJobDone() { +@@ -782,6 +811,11 @@ void PrintViewManagerBase::OnJobDone() { ReleasePrintJob(); } @@ -369,7 +371,7 @@ index 1f37c11047d47bb2d65975fa69f33d822206dd08..d13ee6a81cd7edc5be99f595515ca521 void PrintViewManagerBase::OnFailed() { TerminatePrintJob(true); } -@@ -840,7 +874,10 @@ bool PrintViewManagerBase::CreateNewPrintJob( +@@ -843,7 +877,10 @@ bool PrintViewManagerBase::CreateNewPrintJob( // Disconnect the current |print_job_|. auto weak_this = weak_ptr_factory_.GetWeakPtr(); @@ -381,7 +383,7 @@ index 1f37c11047d47bb2d65975fa69f33d822206dd08..d13ee6a81cd7edc5be99f595515ca521 if (!weak_this) return false; -@@ -915,6 +952,13 @@ void PrintViewManagerBase::ReleasePrintJob() { +@@ -918,6 +955,13 @@ void PrintViewManagerBase::ReleasePrintJob() { content::RenderFrameHost* rfh = printing_rfh_; printing_rfh_ = nullptr; @@ -395,7 +397,7 @@ index 1f37c11047d47bb2d65975fa69f33d822206dd08..d13ee6a81cd7edc5be99f595515ca521 if (!print_job_) return; -@@ -964,7 +1008,7 @@ bool PrintViewManagerBase::RunInnerMessageLoop() { +@@ -967,7 +1011,7 @@ bool PrintViewManagerBase::RunInnerMessageLoop() { } bool PrintViewManagerBase::OpportunisticallyCreatePrintJob(int cookie) { @@ -539,10 +541,10 @@ index 66810a2a5f0c77ba107c71d2abaef8692bda0fea..cd6103af4571f82f11652a3c7ecf0e53 void PdfPrintManager::ShowInvalidPrinterSettingsError() { diff --git a/components/printing/common/print.mojom b/components/printing/common/print.mojom -index 5afad24754e12554368a6619466ca025edc26180..e2e786692bd877d3b8bf7c31829496afa99ed539 100644 +index 7a79f3b0b1b810139503ade9ff83a78f204374a3..c9ca0914d4155842ff568101640e5a9251874a8a 100644 --- a/components/printing/common/print.mojom +++ b/components/printing/common/print.mojom -@@ -274,7 +274,7 @@ interface PrintPreviewUI { +@@ -276,7 +276,7 @@ interface PrintPreviewUI { interface PrintRenderFrame { // Tells the RenderFrame to switch the CSS to print media type, render every // requested page, and then switch back the CSS to display media type. @@ -551,7 +553,7 @@ index 5afad24754e12554368a6619466ca025edc26180..e2e786692bd877d3b8bf7c31829496af // Tells the RenderFrame to switch the CSS to print media type, render every // requested page using the print preview document's frame/node, and then -@@ -341,7 +341,7 @@ interface PrintManagerHost { +@@ -343,7 +343,7 @@ interface PrintManagerHost { // Request the print settings from the user. This step is about showing // UI to the user to select the final print settings. [Sync] @@ -561,7 +563,7 @@ index 5afad24754e12554368a6619466ca025edc26180..e2e786692bd877d3b8bf7c31829496af // Tells the browser that there are invalid printer settings. ShowInvalidPrinterSettingsError(); diff --git a/components/printing/renderer/print_render_frame_helper.cc b/components/printing/renderer/print_render_frame_helper.cc -index 066521576d021cbd3e68057f68199c23a8a30437..72777428d2456191875806bc3c57d0801b43a8ea 100644 +index eb2ccdf293bfb850777216304a3f951680f3875d..0c33c4f04dfbf457c74439e8adf463eb3bc6e4c7 100644 --- a/components/printing/renderer/print_render_frame_helper.cc +++ b/components/printing/renderer/print_render_frame_helper.cc @@ -40,6 +40,7 @@ @@ -610,7 +612,7 @@ index 066521576d021cbd3e68057f68199c23a8a30437..72777428d2456191875806bc3c57d080 if (!render_frame_gone_) print_preview_context_.DispatchAfterPrintEvent(); // WARNING: |this| may be gone at this point. Do not do any more work here and -@@ -1387,6 +1390,8 @@ void PrintRenderFrameHelper::PrintPreview(base::Value settings) { +@@ -1389,6 +1392,8 @@ void PrintRenderFrameHelper::PrintPreview(base::Value settings) { if (ipc_nesting_level_ > kAllowedIpcDepthForPrint) return; @@ -618,8 +620,8 @@ index 066521576d021cbd3e68057f68199c23a8a30437..72777428d2456191875806bc3c57d080 + print_preview_context_.InitWithFrame(frame); print_preview_context_.OnPrintPreview(); - if (print_preview_context_.IsForArc()) { -@@ -1924,7 +1929,8 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) { + #if BUILDFLAG(IS_CHROMEOS_ASH) +@@ -1941,7 +1946,8 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) { return; Print(duplicate_node.GetDocument().GetFrame(), duplicate_node, @@ -629,7 +631,7 @@ index 066521576d021cbd3e68057f68199c23a8a30437..72777428d2456191875806bc3c57d080 // Check if |this| is still valid. if (!weak_this) return; -@@ -1939,7 +1945,9 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) { +@@ -1956,7 +1962,9 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) { void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame, const blink::WebNode& node, @@ -640,7 +642,7 @@ index 066521576d021cbd3e68057f68199c23a8a30437..72777428d2456191875806bc3c57d080 // If still not finished with earlier print request simply ignore. if (prep_frame_view_) return; -@@ -1947,7 +1955,7 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame, +@@ -1964,7 +1972,7 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame, FrameReference frame_ref(frame); uint32_t expected_page_count = 0; @@ -649,7 +651,7 @@ index 066521576d021cbd3e68057f68199c23a8a30437..72777428d2456191875806bc3c57d080 DidFinishPrinting(FAIL_PRINT_INIT); return; // Failed to init print page settings. } -@@ -1966,8 +1974,15 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame, +@@ -1983,8 +1991,15 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame, print_pages_params_->params->print_scaling_option; auto self = weak_ptr_factory_.GetWeakPtr(); @@ -666,7 +668,7 @@ index 066521576d021cbd3e68057f68199c23a8a30437..72777428d2456191875806bc3c57d080 // Check if |this| is still valid. if (!self) return; -@@ -2215,36 +2230,51 @@ void PrintRenderFrameHelper::IPCProcessed() { +@@ -2232,36 +2247,51 @@ void PrintRenderFrameHelper::IPCProcessed() { } } @@ -730,7 +732,7 @@ index 066521576d021cbd3e68057f68199c23a8a30437..72777428d2456191875806bc3c57d080 notify_browser_of_print_failure_ = false; GetPrintManagerHost()->ShowInvalidPrinterSettingsError(); return false; -@@ -2389,7 +2419,7 @@ mojom::PrintPagesParamsPtr PrintRenderFrameHelper::GetPrintSettingsFromUser( +@@ -2406,7 +2436,7 @@ mojom::PrintPagesParamsPtr PrintRenderFrameHelper::GetPrintSettingsFromUser( std::move(params), base::BindOnce( [](base::OnceClosure quit_closure, mojom::PrintPagesParamsPtr* output, @@ -739,7 +741,7 @@ index 066521576d021cbd3e68057f68199c23a8a30437..72777428d2456191875806bc3c57d080 *output = std::move(input); std::move(quit_closure).Run(); }, -@@ -2634,18 +2664,7 @@ void PrintRenderFrameHelper::RequestPrintPreview(PrintPreviewRequestType type, +@@ -2657,18 +2687,7 @@ void PrintRenderFrameHelper::RequestPrintPreview(PrintPreviewRequestType type, } bool PrintRenderFrameHelper::CheckForCancel() { @@ -760,10 +762,10 @@ index 066521576d021cbd3e68057f68199c23a8a30437..72777428d2456191875806bc3c57d080 bool PrintRenderFrameHelper::PreviewPageRendered( diff --git a/components/printing/renderer/print_render_frame_helper.h b/components/printing/renderer/print_render_frame_helper.h -index 2b703118bf94a82262adc293368dcfcdb67807ff..a07f307ff48f3ce5409354a5ba8d54b43325da73 100644 +index 023594185e3aa9c79e8c5179c40ce867a5bb80e9..312cf5d4dbdb130dee3a07f970c9d92d6cd2cdbf 100644 --- a/components/printing/renderer/print_render_frame_helper.h +++ b/components/printing/renderer/print_render_frame_helper.h -@@ -254,7 +254,7 @@ class PrintRenderFrameHelper +@@ -256,7 +256,7 @@ class PrintRenderFrameHelper mojo::PendingAssociatedReceiver receiver); // printing::mojom::PrintRenderFrame: @@ -772,7 +774,7 @@ index 2b703118bf94a82262adc293368dcfcdb67807ff..a07f307ff48f3ce5409354a5ba8d54b4 #if BUILDFLAG(ENABLE_PRINT_PREVIEW) void PrintForSystemDialog() override; void SetPrintPreviewUI( -@@ -321,7 +321,9 @@ class PrintRenderFrameHelper +@@ -323,7 +323,9 @@ class PrintRenderFrameHelper // WARNING: |this| may be gone after this method returns. void Print(blink::WebLocalFrame* frame, const blink::WebNode& node, @@ -783,7 +785,7 @@ index 2b703118bf94a82262adc293368dcfcdb67807ff..a07f307ff48f3ce5409354a5ba8d54b4 // Notification when printing is done - signal tear-down/free resources. void DidFinishPrinting(PrintingResult result); -@@ -330,12 +332,14 @@ class PrintRenderFrameHelper +@@ -332,12 +334,14 @@ class PrintRenderFrameHelper // Initialize print page settings with default settings. // Used only for native printing workflow. From 47a8fd642ed3f415ce75aa2d15b473c94d1ba4dd Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Sat, 26 Mar 2022 15:19:48 -0500 Subject: [PATCH 03/18] chore: update patch shear in chromium/picture-in-picture.patch --- .../add_didinstallconditionalfeatures.patch | 6 ++-- ..._secondary_label_via_simplemenumodel.patch | 2 +- patches/chromium/blink_local_frame.patch | 2 +- ..._depend_on_packed_resource_integrity.patch | 16 +++++----- patches/chromium/can_create_window.patch | 28 ++++++++--------- ..._v8_initialization_isolate_callbacks.patch | 2 +- ...screationoverridden_with_full_params.patch | 12 ++++---- ...esources_not_chrome_for_spellchecker.patch | 4 +-- .../disable_color_correct_rendering.patch | 6 ++-- ...ll_getwebframe_-_view_when_get_blink.patch | 2 +- ...rmissions_checks_in_exclusive_access.patch | 8 ++--- patches/chromium/frame_host_manager.patch | 4 +-- .../chromium/gritsettings_resource_ids.patch | 4 +-- ...sync_with_host_os_mac_on_linux_in_ci.patch | 2 +- .../load_v8_snapshot_in_browser_process.patch | 2 +- .../chromium/notification_provenance.patch | 2 +- patches/chromium/picture-in-picture.patch | 30 +++++++++---------- patches/chromium/printing.patch | 2 -- ...r_changes_to_the_webcontentsobserver.patch | 4 +-- patches/chromium/resource_file_conflict.patch | 6 ++-- .../support_mixed_sandbox_with_zygote.patch | 2 +- patches/chromium/web_contents.patch | 6 ++-- patches/chromium/webview_cross_drag.patch | 4 +-- patches/chromium/webview_fullscreen.patch | 4 +-- .../worker_context_will_destroy.patch | 6 ++-- ...feat_add_hook_to_notify_script_ready.patch | 2 +- 26 files changed, 83 insertions(+), 85 deletions(-) diff --git a/patches/chromium/add_didinstallconditionalfeatures.patch b/patches/chromium/add_didinstallconditionalfeatures.patch index 18a816de672d4..95daef0066cae 100644 --- a/patches/chromium/add_didinstallconditionalfeatures.patch +++ b/patches/chromium/add_didinstallconditionalfeatures.patch @@ -10,10 +10,10 @@ DidCreateScriptContext is called, not all JS APIs are available in the context, which can cause some preload scripts to trip. diff --git a/content/public/renderer/render_frame_observer.h b/content/public/renderer/render_frame_observer.h -index 19c936be477f944d62e85cec81359a71bbcfa45d..b02bb1cd67488f996b6142058c52c34dfe523fff 100644 +index d55a1b4f71224a2156eb5f3b0b32f41643b3dc28..f41c8f3d74f72d6e2220af527500749ef7409d77 100644 --- a/content/public/renderer/render_frame_observer.h +++ b/content/public/renderer/render_frame_observer.h -@@ -132,6 +132,8 @@ class CONTENT_EXPORT RenderFrameObserver : public IPC::Listener, +@@ -131,6 +131,8 @@ class CONTENT_EXPORT RenderFrameObserver : public IPC::Listener, virtual void DidHandleOnloadEvents() {} virtual void DidCreateScriptContext(v8::Local context, int32_t world_id) {} @@ -23,7 +23,7 @@ index 19c936be477f944d62e85cec81359a71bbcfa45d..b02bb1cd67488f996b6142058c52c34d int32_t world_id) {} virtual void DidClearWindowObject() {} diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc -index c9296960c76e34646bf7cb3195b80c0cbc483b58..bc8bdba3facba81c572d43b85881ec02ad7d2f00 100644 +index 78696a7474b07851c72e4d8643a977d2afe4be07..5099849c21ffc780a488c73f15cfc6f2206ff31a 100644 --- a/content/renderer/render_frame_impl.cc +++ b/content/renderer/render_frame_impl.cc @@ -4423,6 +4423,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local context, diff --git a/patches/chromium/allow_setting_secondary_label_via_simplemenumodel.patch b/patches/chromium/allow_setting_secondary_label_via_simplemenumodel.patch index 8ce5997c5cb9f..1b4e797564bb2 100644 --- a/patches/chromium/allow_setting_secondary_label_via_simplemenumodel.patch +++ b/patches/chromium/allow_setting_secondary_label_via_simplemenumodel.patch @@ -6,7 +6,7 @@ Subject: Allow setting secondary label via SimpleMenuModel Builds on https://chromium-review.googlesource.com/c/chromium/src/+/2208976 diff --git a/ui/base/models/simple_menu_model.cc b/ui/base/models/simple_menu_model.cc -index 746dffb1defec9d776f681d41325a65b02cbdd0f..05a7f20f10e3ff514aa3b3b5386980ddfcc586eb 100644 +index a787411f89e2d95e2fa636a7cc6723bdd227e563..f8c67d10957c26fbcd21fa1fe05507efd78f1c29 100644 --- a/ui/base/models/simple_menu_model.cc +++ b/ui/base/models/simple_menu_model.cc @@ -53,6 +53,11 @@ std::u16string SimpleMenuModel::Delegate::GetLabelForCommandId( diff --git a/patches/chromium/blink_local_frame.patch b/patches/chromium/blink_local_frame.patch index 6ed95034fa73c..c0cd3c9e741c2 100644 --- a/patches/chromium/blink_local_frame.patch +++ b/patches/chromium/blink_local_frame.patch @@ -49,7 +49,7 @@ index da12f2f47f97628f1adeabc8900ffd16132afd7e..61d373f78520a063c7f86bde6869af9d // its owning reference back to our owning LocalFrame. client_->Detached(type); diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc -index 1efaff0e92061bc97dcbf3105f6b6c1dcefff17c..ec2e19c3ccf60f01b73259e1e6eff405ebf15f07 100644 +index 85849e45352bb8d95f82419424c07e5455680e58..97a97e8084a3e194322311b8791e09cde81d8b55 100644 --- a/third_party/blink/renderer/core/frame/local_frame.cc +++ b/third_party/blink/renderer/core/frame/local_frame.cc @@ -545,10 +545,6 @@ bool LocalFrame::DetachImpl(FrameDetachType type) { 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 d6d7b7c762219..0d68072b1160b 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 @@ -11,7 +11,7 @@ if we ever align our .pak file generation with Chrome we can remove this patch. diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn -index a6e0a53d4ebbd585114bc0cda2e2d1caaab4a015..95a7e70eee0303471702b81c68f46a0fea2b6f0e 100644 +index 1f86073736f849e797e029678bc212ce96ba0bd9..b8abc10e48bdff0f4e6c3f8e1c4927bc6e0c2f79 100644 --- a/chrome/BUILD.gn +++ b/chrome/BUILD.gn @@ -171,11 +171,16 @@ if (!is_android && !is_mac) { @@ -33,10 +33,10 @@ index a6e0a53d4ebbd585114bc0cda2e2d1caaab4a015..95a7e70eee0303471702b81c68f46a0f "//base", "//build:branding_buildflags", diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn -index 5bbb64d83e2024feeb7a2eae45f6b8e937fc927c..20004fb890e726d11dc672894cdba4645b0a3606 100644 +index a55851c719657b3e136c2ef31028798b509a8287..8718160f42a6527fd2df797ea5266ecc16dcd549 100644 --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -4508,7 +4508,7 @@ static_library("browser") { +@@ -4515,7 +4515,7 @@ static_library("browser") { # On Windows, the hashes are embedded in //chrome:chrome_initial rather # than here in :chrome_dll. @@ -46,10 +46,10 @@ index 5bbb64d83e2024feeb7a2eae45f6b8e937fc927c..20004fb890e726d11dc672894cdba464 sources += [ "certificate_viewer_stub.cc" ] } diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn -index 3d7606b8d7d5f1ec61c9c00be0cc530967985e4b..044b52e00d8b334e90a9f1126b5bc3df916a1af3 100644 +index d91d4dd2d27f25d8109b00f4e7c0239e43b2d070..57c7ae8011f99c33ab1b5dd5f1a777738063dcdc 100644 --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn -@@ -5907,7 +5907,6 @@ test("unit_tests") { +@@ -5916,7 +5916,6 @@ test("unit_tests") { deps += [ "//chrome:other_version", @@ -57,7 +57,7 @@ index 3d7606b8d7d5f1ec61c9c00be0cc530967985e4b..044b52e00d8b334e90a9f1126b5bc3df "//chrome//services/util_win:unit_tests", "//chrome/app:chrome_dll_resources", "//chrome/browser:chrome_process_finder", -@@ -5930,6 +5929,10 @@ test("unit_tests") { +@@ -5939,6 +5938,10 @@ test("unit_tests") { "//ui/resources", ] @@ -68,7 +68,7 @@ index 3d7606b8d7d5f1ec61c9c00be0cc530967985e4b..044b52e00d8b334e90a9f1126b5bc3df ldflags = [ "/DELAYLOAD:api-ms-win-core-winrt-error-l1-1-0.dll", "/DELAYLOAD:api-ms-win-core-winrt-l1-1-0.dll", -@@ -6619,7 +6622,6 @@ test("unit_tests") { +@@ -6629,7 +6632,6 @@ test("unit_tests") { } deps += [ @@ -76,7 +76,7 @@ index 3d7606b8d7d5f1ec61c9c00be0cc530967985e4b..044b52e00d8b334e90a9f1126b5bc3df "//chrome/browser:cart_db_content_proto", "//chrome/browser:coupon_db_content_proto", "//chrome/browser/media/router:test_support", -@@ -6664,6 +6666,11 @@ test("unit_tests") { +@@ -6674,6 +6676,11 @@ test("unit_tests") { "//ui/native_theme:test_support", "//ui/webui/resources/js/browser_command:mojo_bindings", ] diff --git a/patches/chromium/can_create_window.patch b/patches/chromium/can_create_window.patch index 21f6a27357742..f126f8eb85275 100644 --- a/patches/chromium/can_create_window.patch +++ b/patches/chromium/can_create_window.patch @@ -9,10 +9,10 @@ potentially prevent a window from being created. TODO(loc): this patch is currently broken. diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc -index dc75ab59ff7af972c950a9be682ebd9cddce2627..a969bbaaecb4b589808413d40299b68f3bc1fd3e 100644 +index 331688ff923a3785818e826897736ae7d0d9a85a..54c4ae9fc1ca2fec473c960300ca94af8394473f 100644 --- a/content/browser/renderer_host/render_frame_host_impl.cc +++ b/content/browser/renderer_host/render_frame_host_impl.cc -@@ -6880,6 +6880,7 @@ void RenderFrameHostImpl::CreateNewWindow( +@@ -6908,6 +6908,7 @@ void RenderFrameHostImpl::CreateNewWindow( last_committed_origin_, params->window_container_type, params->target_url, params->referrer.To(), params->frame_name, params->disposition, *params->features, @@ -21,10 +21,10 @@ index dc75ab59ff7af972c950a9be682ebd9cddce2627..a969bbaaecb4b589808413d40299b68f &no_javascript_access); diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc -index 2afbf96abef912bf483d08f6c011aa4a2e515e25..92dcf2308842ce8922426b0cafdd5a3e83f4bd52 100644 +index 143dc4bd1561fb3b0423ecb01c09547844bfbf90..42ebfe6570acb972055b3971817ae68fd92e073b 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc -@@ -3931,6 +3931,14 @@ FrameTree* WebContentsImpl::CreateNewWindow( +@@ -3937,6 +3937,14 @@ FrameTree* WebContentsImpl::CreateNewWindow( } auto* new_contents_impl = new_contents.get(); @@ -39,7 +39,7 @@ index 2afbf96abef912bf483d08f6c011aa4a2e515e25..92dcf2308842ce8922426b0cafdd5a3e new_contents_impl->GetController().SetSessionStorageNamespace( partition_config, session_storage_namespace); -@@ -3975,12 +3983,6 @@ FrameTree* WebContentsImpl::CreateNewWindow( +@@ -3981,12 +3989,6 @@ FrameTree* WebContentsImpl::CreateNewWindow( AddWebContentsDestructionObserver(new_contents_impl); } @@ -53,7 +53,7 @@ index 2afbf96abef912bf483d08f6c011aa4a2e515e25..92dcf2308842ce8922426b0cafdd5a3e new_contents_impl, opener, params.target_url, params.referrer.To(), params.disposition, diff --git a/content/common/frame.mojom b/content/common/frame.mojom -index afc0dc34e4a1f6c06e96d7fa09922e8aaf4bab28..f3d13fc719324e064f70077deb5d95cb9e467820 100644 +index ec594f27e94bf0b95967c4d816c9b1e159e4a08d..de908becd59392db284c60f61d97f8b2210aa888 100644 --- a/content/common/frame.mojom +++ b/content/common/frame.mojom @@ -550,6 +550,10 @@ struct CreateNewWindowParams { @@ -68,10 +68,10 @@ index afc0dc34e4a1f6c06e96d7fa09922e8aaf4bab28..f3d13fc719324e064f70077deb5d95cb // Operation result when the renderer asks the browser to create a new window. diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc -index d832c0c37554dafad0c44c78f6dc9233015b152f..654abc174a237a90225ad7be7f1180e929b9829b 100644 +index fbf6817479cace0ca06065eef3aa70aae2a0ebe1..cef6a18df7cfb8528ea07e808c3e539726ea815d 100644 --- a/content/public/browser/content_browser_client.cc +++ b/content/public/browser/content_browser_client.cc -@@ -576,6 +576,8 @@ bool ContentBrowserClient::CanCreateWindow( +@@ -577,6 +577,8 @@ bool ContentBrowserClient::CanCreateWindow( const std::string& frame_name, WindowOpenDisposition disposition, const blink::mojom::WindowFeatures& features, @@ -81,10 +81,10 @@ index d832c0c37554dafad0c44c78f6dc9233015b152f..654abc174a237a90225ad7be7f1180e9 bool opener_suppressed, bool* no_javascript_access) { diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h -index e142bc65c2a0fe06a1cf59621c424170dc2d641c..8573ea54135e363f83bd786db3483d1c539e4bb1 100644 +index f5c434fd7080faf5000c5d260bf66fcb2b7b868b..5b49830578b996fb1b6ed8cbe4d66085220213d0 100644 --- a/content/public/browser/content_browser_client.h +++ b/content/public/browser/content_browser_client.h -@@ -169,6 +169,7 @@ class NetworkService; +@@ -170,6 +170,7 @@ class NetworkService; class TrustedURLLoaderHeaderClient; } // namespace mojom struct ResourceRequest; @@ -92,7 +92,7 @@ index e142bc65c2a0fe06a1cf59621c424170dc2d641c..8573ea54135e363f83bd786db3483d1c } // namespace network namespace sandbox { -@@ -958,6 +959,8 @@ class CONTENT_EXPORT ContentBrowserClient { +@@ -959,6 +960,8 @@ class CONTENT_EXPORT ContentBrowserClient { const std::string& frame_name, WindowOpenDisposition disposition, const blink::mojom::WindowFeatures& features, @@ -124,7 +124,7 @@ index f132199113778f6b50972419b61a187e6272300c..7bb1680553c405a9016cfd67eca5fa3c const OpenURLParams& params) { return nullptr; diff --git a/content/public/browser/web_contents_delegate.h b/content/public/browser/web_contents_delegate.h -index 9c70cc90402dd1541b2b58b3be2fa7ff215f8f57..a998c64237a7ffd6583a33cd54fe3229196300a6 100644 +index 85335ff06c87ea3986360fad18df6cf01a4a7cca..eeafde1fa6067804665954525eafdd482d8eb3f3 100644 --- a/content/public/browser/web_contents_delegate.h +++ b/content/public/browser/web_contents_delegate.h @@ -16,6 +16,7 @@ @@ -135,7 +135,7 @@ index 9c70cc90402dd1541b2b58b3be2fa7ff215f8f57..a998c64237a7ffd6583a33cd54fe3229 #include "content/public/browser/eye_dropper.h" #include "content/public/browser/invalidate_type.h" #include "content/public/browser/media_stream_request.h" -@@ -339,6 +340,13 @@ class CONTENT_EXPORT WebContentsDelegate { +@@ -338,6 +339,13 @@ class CONTENT_EXPORT WebContentsDelegate { const StoragePartitionConfig& partition_config, SessionStorageNamespace* session_storage_namespace); @@ -220,7 +220,7 @@ index 84d32491a56528a84b4395fba1d54cdbb38d522b..09998a83c449ef8cd9f360fbcdcf7edc } // namespace blink diff --git a/third_party/blink/renderer/core/frame/local_dom_window.cc b/third_party/blink/renderer/core/frame/local_dom_window.cc -index c18012a217bfc492ac2cdef5776bb23099df57ae..b96bd45cfee98c8177b3ac5979273d1f9ba47388 100644 +index b48d3dbf9868d12412a34a6430d4e6bf2d4b27f3..d0d1ada0300163c8be4c9fb7cc7fb2f43efcc355 100644 --- a/third_party/blink/renderer/core/frame/local_dom_window.cc +++ b/third_party/blink/renderer/core/frame/local_dom_window.cc @@ -2069,6 +2069,7 @@ DOMWindow* LocalDOMWindow::open(v8::Isolate* isolate, diff --git a/patches/chromium/chore_expose_v8_initialization_isolate_callbacks.patch b/patches/chromium/chore_expose_v8_initialization_isolate_callbacks.patch index 00838845586bb..574913f05552a 100644 --- a/patches/chromium/chore_expose_v8_initialization_isolate_callbacks.patch +++ b/patches/chromium/chore_expose_v8_initialization_isolate_callbacks.patch @@ -9,7 +9,7 @@ we're running with contextIsolation enabled, we should be falling back to Blink's logic. This will be upstreamed in some form. diff --git a/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc b/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc -index 5040ec838c64ffa8aa58ba43f51df649443b2f81..7a7a87d00fa392b7bd07267d9059664d5d472252 100644 +index 66dddc124ca48024cb9539529b787f6e9aa1fd5c..fd6dc712df185724ae88a40e643a26126e54d712 100644 --- a/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc +++ b/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc @@ -446,8 +446,9 @@ CodeGenerationCheckCallbackInMainThread(v8::Local context, diff --git a/patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch b/patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch index 04ad43d0a65ff..ea4e084796fb2 100644 --- a/patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch +++ b/patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch @@ -108,10 +108,10 @@ index 6688ba8ba2fb7d930773144cdbc43f1f6fa2b685..22015c7b9b50e1264551ce226757f90e } diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc -index ace0c593debb46c9238e5708634fc6088a1bc715..31d5c0f00ae43706f16fc8615761e96eab31f1f3 100644 +index 70ee9049e3cb73f55bed81c3e08037df2f4c9e07..8d230826aaf867d9046a6b9ac93a60f4750e52be 100644 --- a/chrome/browser/ui/browser.cc +++ b/chrome/browser/ui/browser.cc -@@ -1770,12 +1770,11 @@ bool Browser::IsWebContentsCreationOverridden( +@@ -1786,12 +1786,11 @@ bool Browser::IsWebContentsCreationOverridden( content::SiteInstance* source_site_instance, content::mojom::WindowContainerType window_container_type, const GURL& opener_url, @@ -246,10 +246,10 @@ index c6bd5c19f8a7ceec17c9e32af5296a9617f3a619..02199b439fba7fdc617b7f7980d958b7 void AddNewContents(content::WebContents* source, std::unique_ptr new_contents, diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc -index d69e028b34ab4407abcdea3ece93db39926c587e..a82b571fdabe90771bc8f8ed4ae40df3085592c7 100644 +index cdbdf2b824fb2643f4182c283a01410e682913e9..70831b3506a2b2711e3a465d542eda1bfeb0a287 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc -@@ -3879,8 +3879,7 @@ FrameTree* WebContentsImpl::CreateNewWindow( +@@ -3885,8 +3885,7 @@ FrameTree* WebContentsImpl::CreateNewWindow( if (delegate_ && delegate_->IsWebContentsCreationOverridden( source_site_instance, params.window_container_type, @@ -274,10 +274,10 @@ index 7bb1680553c405a9016cfd67eca5fa3c6439b692..3aa2cca04340098859e1072eaa80a46a } diff --git a/content/public/browser/web_contents_delegate.h b/content/public/browser/web_contents_delegate.h -index a998c64237a7ffd6583a33cd54fe3229196300a6..4f57227a9033f905be13bc5166d0324d495a6531 100644 +index eeafde1fa6067804665954525eafdd482d8eb3f3..b17f371aa489a5b61c28fbcd316b19815f072df9 100644 --- a/content/public/browser/web_contents_delegate.h +++ b/content/public/browser/web_contents_delegate.h -@@ -318,8 +318,7 @@ class CONTENT_EXPORT WebContentsDelegate { +@@ -317,8 +317,7 @@ class CONTENT_EXPORT WebContentsDelegate { SiteInstance* source_site_instance, content::mojom::WindowContainerType window_container_type, const GURL& opener_url, diff --git a/patches/chromium/chore_use_electron_resources_not_chrome_for_spellchecker.patch b/patches/chromium/chore_use_electron_resources_not_chrome_for_spellchecker.patch index 5c092bf9ad23d..2de14ada23bf8 100644 --- a/patches/chromium/chore_use_electron_resources_not_chrome_for_spellchecker.patch +++ b/patches/chromium/chore_use_electron_resources_not_chrome_for_spellchecker.patch @@ -7,10 +7,10 @@ spellchecker uses a few IDS_ resources. We need to load these from Electrons grit header instead of Chromes diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn -index 5f43b35aab6c2f277f0d021b378bee55f97572aa..5bbb64d83e2024feeb7a2eae45f6b8e937fc927c 100644 +index db6fc6ae990f7e3bd15920a04101db2b9e3b2787..a55851c719657b3e136c2ef31028798b509a8287 100644 --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -7126,6 +7126,7 @@ static_library("browser") { +@@ -7132,6 +7132,7 @@ static_library("browser") { deps += [ "//components/spellcheck/browser", "//components/spellcheck/common", diff --git a/patches/chromium/disable_color_correct_rendering.patch b/patches/chromium/disable_color_correct_rendering.patch index 24227afe87461..4d0d3ef337593 100644 --- a/patches/chromium/disable_color_correct_rendering.patch +++ b/patches/chromium/disable_color_correct_rendering.patch @@ -80,7 +80,7 @@ index 6a830ec9f29b9764cd425f0681dafbb18d90b457..a7a095ceb9e626c79db21e0d16c8ef47 !command_line->HasSwitch(switches::kUIDisablePartialSwap); diff --git a/components/viz/service/display/gl_renderer.cc b/components/viz/service/display/gl_renderer.cc -index 553c3be2562e836e2ce6d6f44997cebf3cba7466..fbe38d97a8d1861ecfb5ccb583d050a28b9ab108 100644 +index 23eed6772dd7edd77378f3bf4cff9d6bb5274894..69056d1121eb833393aba362d71c52cc9c51c6d3 100644 --- a/components/viz/service/display/gl_renderer.cc +++ b/components/viz/service/display/gl_renderer.cc @@ -86,6 +86,9 @@ @@ -228,7 +228,7 @@ index 553c3be2562e836e2ce6d6f44997cebf3cba7466..fbe38d97a8d1861ecfb5ccb583d050a2 + +#undef PATCH_CS diff --git a/content/browser/gpu/gpu_process_host.cc b/content/browser/gpu/gpu_process_host.cc -index 90c7ace352fe909e3f521403c2a7fbf030ccc31e..f011183e21921f38ce5062079e8430a030159bc1 100644 +index 8b32bf5455183ff7bb6295d7922e76a6593b8ee0..041ffe9d26ef3401179eb57917f5585497500689 100644 --- a/content/browser/gpu/gpu_process_host.cc +++ b/content/browser/gpu/gpu_process_host.cc @@ -227,6 +227,7 @@ GpuTerminationStatus ConvertToGpuTerminationStatus( @@ -240,7 +240,7 @@ index 90c7ace352fe909e3f521403c2a7fbf030ccc31e..f011183e21921f38ce5062079e8430a0 sandbox::policy::switches::kGpuSandboxAllowSysVShm, sandbox::policy::switches::kGpuSandboxFailuresFatal, diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc -index d8939c1936830b101d6bb4079cd99e6015b481c4..366f801cbe84a28ef462037a26da47c9f65057b4 100644 +index ca056c66af681548ba01bd07db7dadc5ce2a5280..f5025422ebdb9fe35ee5e4e1ed647bc05028d4a8 100644 --- a/content/browser/renderer_host/render_process_host_impl.cc +++ b/content/browser/renderer_host/render_process_host_impl.cc @@ -197,6 +197,7 @@ diff --git a/patches/chromium/don_t_use_potentially_null_getwebframe_-_view_when_get_blink.patch b/patches/chromium/don_t_use_potentially_null_getwebframe_-_view_when_get_blink.patch index d8cdef4d187c5..597f58db3043d 100644 --- a/patches/chromium/don_t_use_potentially_null_getwebframe_-_view_when_get_blink.patch +++ b/patches/chromium/don_t_use_potentially_null_getwebframe_-_view_when_get_blink.patch @@ -11,7 +11,7 @@ This regressed in https://chromium-review.googlesource.com/c/chromium/src/+/2572 Upstream: https://chromium-review.googlesource.com/c/chromium/src/+/2598393 diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc -index bc8bdba3facba81c572d43b85881ec02ad7d2f00..3b12ab113f7c159beb74a09f95335977b4ee2b4f 100644 +index 5099849c21ffc780a488c73f15cfc6f2206ff31a..305e05ad5ac43503c6da571ade21168c1301a833 100644 --- a/content/renderer/render_frame_impl.cc +++ b/content/renderer/render_frame_impl.cc @@ -2367,7 +2367,7 @@ const blink::WebView* RenderFrameImpl::GetWebView() const { diff --git a/patches/chromium/fix_patch_out_permissions_checks_in_exclusive_access.patch b/patches/chromium/fix_patch_out_permissions_checks_in_exclusive_access.patch index dfbc1343d6826..873952c92c3bd 100644 --- a/patches/chromium/fix_patch_out_permissions_checks_in_exclusive_access.patch +++ b/patches/chromium/fix_patch_out_permissions_checks_in_exclusive_access.patch @@ -14,10 +14,10 @@ but it's not strictly necessary for this API to work to spec. Profile check has been upstreamed at https://chromium-review.googlesource.com/c/chromium/src/+/3247196 diff --git a/chrome/browser/ui/exclusive_access/fullscreen_controller.cc b/chrome/browser/ui/exclusive_access/fullscreen_controller.cc -index 8d6f8aedab475c1a553949bfcba3753ebed87778..e379e4995b0812be5970cf9741a00e4f99dea3f1 100644 +index f1b9597ea5070ac1847355833a751c72abc0e917..c1dcc26f44318a12977196d59f6d7ab7237ed781 100644 --- a/chrome/browser/ui/exclusive_access/fullscreen_controller.cc +++ b/chrome/browser/ui/exclusive_access/fullscreen_controller.cc -@@ -384,13 +384,9 @@ void FullscreenController::EnterFullscreenModeInternal( +@@ -402,13 +402,9 @@ void FullscreenController::EnterFullscreenModeInternal( // Do not enter fullscreen mode if disallowed by pref. This prevents the user // from manually entering fullscreen mode and also disables kiosk mode on // desktop platforms. @@ -33,7 +33,7 @@ index 8d6f8aedab475c1a553949bfcba3753ebed87778..e379e4995b0812be5970cf9741a00e4f #endif toggled_into_fullscreen_ = true; -@@ -403,6 +399,7 @@ void FullscreenController::EnterFullscreenModeInternal( +@@ -421,6 +417,7 @@ void FullscreenController::EnterFullscreenModeInternal( url = extension_caused_fullscreen_; } @@ -41,7 +41,7 @@ index 8d6f8aedab475c1a553949bfcba3753ebed87778..e379e4995b0812be5970cf9741a00e4f if (display_id != display::kInvalidDisplayId) { // Check, but do not prompt, for permission to request a specific screen. // Sites generally need permission to get the display id in the first place. -@@ -415,6 +412,7 @@ void FullscreenController::EnterFullscreenModeInternal( +@@ -434,6 +431,7 @@ void FullscreenController::EnterFullscreenModeInternal( display_id = display::kInvalidDisplayId; } } diff --git a/patches/chromium/frame_host_manager.patch b/patches/chromium/frame_host_manager.patch index 80c56304eadfc..4659ba259f98b 100644 --- a/patches/chromium/frame_host_manager.patch +++ b/patches/chromium/frame_host_manager.patch @@ -20,10 +20,10 @@ index 6ecce70efe2d63259f8de512de276a49da1ee9c0..3068a27d60c109156d91dee68715d00a } diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h -index 8573ea54135e363f83bd786db3483d1c539e4bb1..11036e52affafe46bab3146184b8d89696d4163c 100644 +index 5b49830578b996fb1b6ed8cbe4d66085220213d0..764e9d279b476b9999857147f954a7a1193e8604 100644 --- a/content/public/browser/content_browser_client.h +++ b/content/public/browser/content_browser_client.h -@@ -276,6 +276,11 @@ class CONTENT_EXPORT ContentBrowserClient { +@@ -277,6 +277,11 @@ class CONTENT_EXPORT ContentBrowserClient { virtual ~ContentBrowserClient() = default; diff --git a/patches/chromium/gritsettings_resource_ids.patch b/patches/chromium/gritsettings_resource_ids.patch index ea0050fc48222..c8d8f95b97aec 100644 --- a/patches/chromium/gritsettings_resource_ids.patch +++ b/patches/chromium/gritsettings_resource_ids.patch @@ -6,10 +6,10 @@ Subject: gritsettings_resource_ids.patch Add electron resources file to the list of resource ids generation. diff --git a/tools/gritsettings/resource_ids.spec b/tools/gritsettings/resource_ids.spec -index 22896db086972ff3865df9cbb4d904f1e00b7321..8e23293f8cd7f0a4203b3d5fdae24aa5e26fc2ec 100644 +index 862a5fa7d1f388c9e6cda18416fb5d9ae56cca4b..2da5d367dacd557bcca79412ed77fd74d37241f4 100644 --- a/tools/gritsettings/resource_ids.spec +++ b/tools/gritsettings/resource_ids.spec -@@ -955,6 +955,11 @@ +@@ -950,6 +950,11 @@ "includes": [4960], }, diff --git a/patches/chromium/hack_to_allow_gclient_sync_with_host_os_mac_on_linux_in_ci.patch b/patches/chromium/hack_to_allow_gclient_sync_with_host_os_mac_on_linux_in_ci.patch index 13e3eec7f04d0..c558d7e41b89e 100644 --- a/patches/chromium/hack_to_allow_gclient_sync_with_host_os_mac_on_linux_in_ci.patch +++ b/patches/chromium/hack_to_allow_gclient_sync_with_host_os_mac_on_linux_in_ci.patch @@ -11,7 +11,7 @@ If removing this patch causes no sync failures, it's safe to delete :+1: Ref https://chromium-review.googlesource.com/c/chromium/src/+/2953903 diff --git a/tools/clang/scripts/update.py b/tools/clang/scripts/update.py -index 8cf820d7d1f5d9e85156a18e9ec573dbeb63d41a..a7d6ea676aaba90220761fa7ecc4569012806581 100755 +index ceeeedc42d9fe86383f9fda2b1a26d39119e655c..ff3b3cb47cbce01bcdcb28f1ef8a360143b2488f 100755 --- a/tools/clang/scripts/update.py +++ b/tools/clang/scripts/update.py @@ -298,6 +298,8 @@ def GetDefaultHostOs(): diff --git a/patches/chromium/load_v8_snapshot_in_browser_process.patch b/patches/chromium/load_v8_snapshot_in_browser_process.patch index d8a9cd23bbe73..bfb6ba3121608 100644 --- a/patches/chromium/load_v8_snapshot_in_browser_process.patch +++ b/patches/chromium/load_v8_snapshot_in_browser_process.patch @@ -9,7 +9,7 @@ but due to the nature of electron, we need to load the v8 snapshot in the browser process. diff --git a/content/app/content_main_runner_impl.cc b/content/app/content_main_runner_impl.cc -index 7074141f95253587ae3ca156118ac6b10dd60e26..0476d00de005060c991cd6fa9ccd323ef5d56ea3 100644 +index ce5f2904c283643558375a84453073f7ea8aba3e..a17bf60c79fdd2511a46796b80879ed7926c706d 100644 --- a/content/app/content_main_runner_impl.cc +++ b/content/app/content_main_runner_impl.cc @@ -248,11 +248,8 @@ void LoadV8SnapshotFile(const base::CommandLine& command_line) { diff --git a/patches/chromium/notification_provenance.patch b/patches/chromium/notification_provenance.patch index ff03cd3658ee0..f9c04cc3c1735 100644 --- a/patches/chromium/notification_provenance.patch +++ b/patches/chromium/notification_provenance.patch @@ -131,7 +131,7 @@ index 951075749b24814606f494c5a89ee2adf527f512..7036323ff8ee38ae92790dfd2e216df6 const GURL& document_url, mojo::PendingReceiver receiver); diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc -index cc5f7c8d616ec9a433da428f180483da60736a9d..fb25a7c19f20ca690963c5a15bd09224687b5f57 100644 +index a188b1282e7ceca3fe24cb2d82c644bf0c21bc6f..f0b6fa61bb24d5b5fc4cf9cb8fc2f635f515f3f6 100644 --- a/content/browser/renderer_host/render_process_host_impl.cc +++ b/content/browser/renderer_host/render_process_host_impl.cc @@ -2083,7 +2083,7 @@ void RenderProcessHostImpl::CreateNotificationService( diff --git a/patches/chromium/picture-in-picture.patch b/patches/chromium/picture-in-picture.patch index ff258785cd530..f0cbb1c9966b8 100644 --- a/patches/chromium/picture-in-picture.patch +++ b/patches/chromium/picture-in-picture.patch @@ -35,7 +35,7 @@ index 7d0e39968bf34cdc99549cb48f6bf0a11c182565..f21c1672abf34dc9d19cd39c5d09083a #include "ui/base/cursor/cursor.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/ui/views/overlay/close_image_button.cc b/chrome/browser/ui/views/overlay/close_image_button.cc -index d3400d7b02edc9cffba4cb53ec601b6e4cfea3b2..8e620ad6172a650ea96f80c0b44035932471d88b 100644 +index a3d9c0f03c8ade2553bad5721d4e15e6fd658074..b3b043cbf9144013bf7903121575b31b348ea87e 100644 --- a/chrome/browser/ui/views/overlay/close_image_button.cc +++ b/chrome/browser/ui/views/overlay/close_image_button.cc @@ -6,7 +6,7 @@ @@ -162,13 +162,13 @@ index 86d385842501d28b5eb42f841822294eb597e6ed..43c19dfa6ec6b48f8694636cc184dd61 // OverlayWindowViews bool ControlsHitTestContainsPoint(const gfx::Point& point) override; diff --git a/chrome/browser/ui/views/overlay/hang_up_button.cc b/chrome/browser/ui/views/overlay/hang_up_button.cc -index 26f8f5ffa444d874b229b5e8debf087e4469dfd1..10149e812a43e3d5c92701e9b2ae8d68ed8395c7 100644 +index 75bfe0f7a4d759f677cad5c365fa7f98121d54de..cb251381f1c77ad01d4906132f3d68865aaace10 100644 --- a/chrome/browser/ui/views/overlay/hang_up_button.cc +++ b/chrome/browser/ui/views/overlay/hang_up_button.cc -@@ -5,7 +5,7 @@ - #include "chrome/browser/ui/views/overlay/hang_up_button.h" +@@ -6,7 +6,7 @@ #include "chrome/browser/ui/color/chrome_color_id.h" + #include "chrome/browser/ui/views/overlay/constants.h" -#include "chrome/grit/generated_resources.h" +#include "electron/grit/electron_resources.h" #include "components/vector_icons/vector_icons.h" @@ -205,13 +205,13 @@ index 850b34e3b40f7ff1848c66158976db079e0853bd..105dbc3661eb2710b2f10ca6584e85c3 #include "ui/aura/window.h" #include "ui/aura/window_tree_host.h" diff --git a/chrome/browser/ui/views/overlay/playback_image_button.cc b/chrome/browser/ui/views/overlay/playback_image_button.cc -index bcd3b2e1038786b660a4b91fbc20d9d8b4afffb4..a953c9d0ee0b49d6cc096e3eb236296b57cbc6c0 100644 +index cb1621a9deefcec601d7537e2cc2fbd24e5f7f64..2d74ab12e1eaf77a6f9dde13e894172d6835e061 100644 --- a/chrome/browser/ui/views/overlay/playback_image_button.cc +++ b/chrome/browser/ui/views/overlay/playback_image_button.cc -@@ -6,7 +6,7 @@ - +@@ -7,7 +7,7 @@ #include "chrome/app/vector_icons/vector_icons.h" #include "chrome/browser/ui/color/chrome_color_id.h" + #include "chrome/browser/ui/views/overlay/constants.h" -#include "chrome/grit/generated_resources.h" +#include "electron/grit/electron_resources.h" #include "components/vector_icons/vector_icons.h" @@ -244,26 +244,26 @@ index 51c7db1bfbd3c03b9cb2786c8c7482b33e3aca0b..2890f7420d2fd258f84019963eab6c96 #include "ui/base/metadata/metadata_impl_macros.h" #include "ui/gfx/color_palette.h" diff --git a/chrome/browser/ui/views/overlay/toggle_camera_button.cc b/chrome/browser/ui/views/overlay/toggle_camera_button.cc -index 46ec4441ddb227325b319359f9d33a80aa856d85..57957d72310c0a232c78489fba5a07cdf475dc53 100644 +index 20b82ff4dcf7fef3315b2b47bb480446509c6541..244a50e57b6c12680405c92f0ecbdbdb8bcfcb4f 100644 --- a/chrome/browser/ui/views/overlay/toggle_camera_button.cc +++ b/chrome/browser/ui/views/overlay/toggle_camera_button.cc -@@ -5,7 +5,7 @@ - #include "chrome/browser/ui/views/overlay/toggle_camera_button.h" +@@ -6,7 +6,7 @@ #include "chrome/browser/ui/color/chrome_color_id.h" + #include "chrome/browser/ui/views/overlay/constants.h" -#include "chrome/grit/generated_resources.h" +#include "electron/grit/electron_resources.h" #include "components/vector_icons/vector_icons.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/metadata/metadata_impl_macros.h" diff --git a/chrome/browser/ui/views/overlay/toggle_microphone_button.cc b/chrome/browser/ui/views/overlay/toggle_microphone_button.cc -index 59b9a5442185bfb9efd8ed571ec63d56e3bc3326..34d58bf54019e0b8001c29cb301861d045c60214 100644 +index 1a1edb6321490fdbf5cd347cb3d2cb9a6a5b1080..1e959cf1c8fe356ab4427e4bf4f8da1028f4575f 100644 --- a/chrome/browser/ui/views/overlay/toggle_microphone_button.cc +++ b/chrome/browser/ui/views/overlay/toggle_microphone_button.cc -@@ -5,7 +5,7 @@ - #include "chrome/browser/ui/views/overlay/toggle_microphone_button.h" +@@ -6,7 +6,7 @@ #include "chrome/browser/ui/color/chrome_color_id.h" + #include "chrome/browser/ui/views/overlay/constants.h" -#include "chrome/grit/generated_resources.h" +#include "electron/grit/electron_resources.h" #include "components/vector_icons/vector_icons.h" @@ -283,7 +283,7 @@ index 5e136488b37887e9523ac04a9ff4ccdfaf96c104..24899f4c2b6fe66b96a6728bf747f1aa #include "ui/base/l10n/l10n_util.h" #include "ui/base/metadata/metadata_impl_macros.h" diff --git a/chrome/browser/ui/views/overlay/video_overlay_window_views.cc b/chrome/browser/ui/views/overlay/video_overlay_window_views.cc -index b2e281840f48592eb773c16042fb6b56a0fa132b..d5156bab0c81ca508733a8d3ba95f052ff6d83e6 100644 +index 6d2744b673ecb31464d4aa9b0d11177892c030f4..f9ea66415b85ce385be429ead5e04c8a96dc31c4 100644 --- a/chrome/browser/ui/views/overlay/video_overlay_window_views.cc +++ b/chrome/browser/ui/views/overlay/video_overlay_window_views.cc @@ -15,9 +15,11 @@ @@ -319,7 +319,7 @@ index b2e281840f48592eb773c16042fb6b56a0fa132b..d5156bab0c81ca508733a8d3ba95f052 #include "chrome/browser/shell_integration_win.h" #include "ui/aura/window.h" #include "ui/aura/window_tree_host.h" -@@ -148,7 +150,7 @@ std::unique_ptr VideoOverlayWindowViews::Create( +@@ -167,7 +169,7 @@ std::unique_ptr VideoOverlayWindowViews::Create( overlay_window->Init(std::move(params)); overlay_window->OnRootViewReady(); diff --git a/patches/chromium/printing.patch b/patches/chromium/printing.patch index 6c573f3a23def..fd65bbd3c5314 100644 --- a/patches/chromium/printing.patch +++ b/patches/chromium/printing.patch @@ -10,8 +10,6 @@ majority of changes originally come from these PRs: This patch also fixes callback for manual user cancellation and success. -Patch-Filename: printing.patch - diff --git a/chrome/browser/printing/print_job.cc b/chrome/browser/printing/print_job.cc index 8d40bbf98d4d58704f118cb42039b0956a9f6639..06196c0fa02012a5faa82471bd39fac087918f54 100644 --- a/chrome/browser/printing/print_job.cc diff --git a/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch b/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch index a4aa00e1ae186..4448f96777587 100644 --- a/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch +++ b/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch @@ -43,10 +43,10 @@ index ed56e947fa137cbaddaa12503ae983d7acd4463f..e1d77416991bac0178935b1bd255947d void RenderWidgetHostImpl::ShowContextMenuAtPoint( diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc -index 92dcf2308842ce8922426b0cafdd5a3e83f4bd52..d69e028b34ab4407abcdea3ece93db39926c587e 100644 +index 42ebfe6570acb972055b3971817ae68fd92e073b..cdbdf2b824fb2643f4182c283a01410e682913e9 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc -@@ -4494,6 +4494,11 @@ TextInputManager* WebContentsImpl::GetTextInputManager() { +@@ -4500,6 +4500,11 @@ TextInputManager* WebContentsImpl::GetTextInputManager() { return text_input_manager_.get(); } diff --git a/patches/chromium/resource_file_conflict.patch b/patches/chromium/resource_file_conflict.patch index 536be6ee276a4..f37fd4c085d93 100644 --- a/patches/chromium/resource_file_conflict.patch +++ b/patches/chromium/resource_file_conflict.patch @@ -52,10 +52,10 @@ Some alternatives to this patch: None of these options seems like a substantial maintainability win over this patch to me (@nornagon). diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn -index 6a696e816a185f8492674fcaf1cbbf7e2faabf99..a6e0a53d4ebbd585114bc0cda2e2d1caaab4a015 100644 +index f1e0552dedf377238e9cd9d24a5ebea77ed83717..1f86073736f849e797e029678bc212ce96ba0bd9 100644 --- a/chrome/BUILD.gn +++ b/chrome/BUILD.gn -@@ -1545,7 +1545,7 @@ if (is_chrome_branded && !is_android) { +@@ -1547,7 +1547,7 @@ if (is_chrome_branded && !is_android) { } } @@ -64,7 +64,7 @@ index 6a696e816a185f8492674fcaf1cbbf7e2faabf99..a6e0a53d4ebbd585114bc0cda2e2d1ca chrome_paks("packed_resources") { if (is_mac) { output_dir = "$root_gen_dir/repack" -@@ -1574,6 +1574,12 @@ if (!is_android) { +@@ -1576,6 +1576,12 @@ if (!is_android) { } } diff --git a/patches/chromium/support_mixed_sandbox_with_zygote.patch b/patches/chromium/support_mixed_sandbox_with_zygote.patch index b40543e80b56a..ea511b50b2598 100644 --- a/patches/chromium/support_mixed_sandbox_with_zygote.patch +++ b/patches/chromium/support_mixed_sandbox_with_zygote.patch @@ -22,7 +22,7 @@ However, the patch would need to be reviewed by the security team, as it does touch a security-sensitive class. diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc -index fb25a7c19f20ca690963c5a15bd09224687b5f57..d8939c1936830b101d6bb4079cd99e6015b481c4 100644 +index f0b6fa61bb24d5b5fc4cf9cb8fc2f635f515f3f6..ca056c66af681548ba01bd07db7dadc5ce2a5280 100644 --- a/content/browser/renderer_host/render_process_host_impl.cc +++ b/content/browser/renderer_host/render_process_host_impl.cc @@ -1786,9 +1786,15 @@ bool RenderProcessHostImpl::Init() { diff --git a/patches/chromium/web_contents.patch b/patches/chromium/web_contents.patch index 0eea1a2d4de6d..c78d2515a5904 100644 --- a/patches/chromium/web_contents.patch +++ b/patches/chromium/web_contents.patch @@ -9,10 +9,10 @@ is needed for OSR. Originally landed in https://github.com/electron/libchromiumcontent/pull/226. diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc -index a82b571fdabe90771bc8f8ed4ae40df3085592c7..1942d3446225411bdce80628e219641b3089d4a3 100644 +index 70831b3506a2b2711e3a465d542eda1bfeb0a287..5bc2c7e6567d798cf54a2b3497cfc6e7ed2a5ca6 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc -@@ -3045,6 +3045,13 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params, +@@ -3051,6 +3051,13 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params, site_instance.get(), params.renderer_initiated_creation, params.main_frame_name, GetOriginalOpener(), primary_main_frame_policy); @@ -26,7 +26,7 @@ index a82b571fdabe90771bc8f8ed4ae40df3085592c7..1942d3446225411bdce80628e219641b WebContentsViewDelegate* delegate = GetContentClient()->browser()->GetWebContentsViewDelegate(this); -@@ -3055,6 +3062,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params, +@@ -3061,6 +3068,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params, view_.reset(CreateWebContentsView(this, delegate, &render_view_host_delegate_view_)); } diff --git a/patches/chromium/webview_cross_drag.patch b/patches/chromium/webview_cross_drag.patch index 45933f1ae2cd9..365473fa3413c 100644 --- a/patches/chromium/webview_cross_drag.patch +++ b/patches/chromium/webview_cross_drag.patch @@ -24,10 +24,10 @@ index 4095ee0ef25226180acb35d320630f971305528e..a0aff5ad93e7644211a2c15553b3d098 //////////////////////////////////////////////////////////////////////////////// diff --git a/content/browser/web_contents/web_drag_dest_mac.mm b/content/browser/web_contents/web_drag_dest_mac.mm -index 6455404fdccab1fffceef4b8d291c137d3a448c4..483b0b5b689da03f0d7e43576fa73275197f5a95 100644 +index dab3703cc4469802bae9e4d45c3e7d0f0857f577..ecd8af37c681ae5c97060af00bbeb8ebddb72b26 100644 --- a/content/browser/web_contents/web_drag_dest_mac.mm +++ b/content/browser/web_contents/web_drag_dest_mac.mm -@@ -385,9 +385,7 @@ - (void)setDragStartTrackersForProcess:(int)processID { +@@ -388,9 +388,7 @@ - (void)setDragStartTrackersForProcess:(int)processID { } - (bool)isValidDragTarget:(content::RenderWidgetHostImpl*)targetRWH { diff --git a/patches/chromium/webview_fullscreen.patch b/patches/chromium/webview_fullscreen.patch index 4eb68495cc7ec..4aefeaa2e6074 100644 --- a/patches/chromium/webview_fullscreen.patch +++ b/patches/chromium/webview_fullscreen.patch @@ -14,10 +14,10 @@ Note that we also need to manually update embedder's `api::WebContents::IsFullscreenForTabOrPending` value. diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc -index a969bbaaecb4b589808413d40299b68f3bc1fd3e..6e5d3ae228b98295bd95bad3cc58215a13c20106 100644 +index 54c4ae9fc1ca2fec473c960300ca94af8394473f..a0d58c2d76c0302bab367e4ad3413a97c34be69c 100644 --- a/content/browser/renderer_host/render_frame_host_impl.cc +++ b/content/browser/renderer_host/render_frame_host_impl.cc -@@ -6267,6 +6267,15 @@ void RenderFrameHostImpl::EnterFullscreen( +@@ -6293,6 +6293,15 @@ void RenderFrameHostImpl::EnterFullscreen( notified_instances.insert(parent_site_instance); } diff --git a/patches/chromium/worker_context_will_destroy.patch b/patches/chromium/worker_context_will_destroy.patch index 0ba771e680e52..9f544d32fe5d5 100644 --- a/patches/chromium/worker_context_will_destroy.patch +++ b/patches/chromium/worker_context_will_destroy.patch @@ -55,7 +55,7 @@ index 8cbfe0a939e97de8dd8d4b5e4d741fb46e94fd45..2bc2ef61890a4c189613ae8a3f61c746 const blink::WebSecurityOrigin& script_origin) override; blink::ProtocolHandlerSecurityLevel GetProtocolHandlerSecurityLevel() diff --git a/third_party/blink/public/platform/platform.h b/third_party/blink/public/platform/platform.h -index ced2c8e433d5b807bd4f1aa44c6af53e93261c23..53b1ebb708e2332e38090d1adba88dbe850bf02d 100644 +index 8cc6400fcaa563e7f4d3f74734724d5aec12fb4d..49ca4f23c84a1d6a8df5b011f9c530053bdd693d 100644 --- a/third_party/blink/public/platform/platform.h +++ b/third_party/blink/public/platform/platform.h @@ -716,6 +716,7 @@ class BLINK_PLATFORM_EXPORT Platform { @@ -67,10 +67,10 @@ index ced2c8e433d5b807bd4f1aa44c6af53e93261c23..53b1ebb708e2332e38090d1adba88dbe 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 2406a8b438de5f01f5354e08bcfc8810238b1bea..e7a60f6cae0fabeac6a5adec633ad5f45d43ef33 100644 +index 68c38d2045c7c23650bd56717081bb001a4e690e..e0e08d4bdf9521ed5c1940d31665d1b675119f0d 100644 --- a/third_party/blink/renderer/core/workers/worker_thread.cc +++ b/third_party/blink/renderer/core/workers/worker_thread.cc -@@ -731,6 +731,12 @@ void WorkerThread::PrepareForShutdownOnWorkerThread() { +@@ -732,6 +732,12 @@ void WorkerThread::PrepareForShutdownOnWorkerThread() { nested_runner_->QuitNow(); } diff --git a/patches/chromium/worker_feat_add_hook_to_notify_script_ready.patch b/patches/chromium/worker_feat_add_hook_to_notify_script_ready.patch index 6608ad6735fa2..dcaebb1c75010 100644 --- a/patches/chromium/worker_feat_add_hook_to_notify_script_ready.patch +++ b/patches/chromium/worker_feat_add_hook_to_notify_script_ready.patch @@ -65,7 +65,7 @@ index 2bc2ef61890a4c189613ae8a3f61c746ffc5d310..36661d62ec1e6f7966b0789326fcbefa bool AllowScriptExtensionForServiceWorker( const blink::WebSecurityOrigin& script_origin) override; diff --git a/third_party/blink/public/platform/platform.h b/third_party/blink/public/platform/platform.h -index 53b1ebb708e2332e38090d1adba88dbe850bf02d..8e86b79cf98c5e2429d0ec54b27eb950c6ce6303 100644 +index 49ca4f23c84a1d6a8df5b011f9c530053bdd693d..770b1295f2fa18a16ee86623206d88ec6a69ae3a 100644 --- a/third_party/blink/public/platform/platform.h +++ b/third_party/blink/public/platform/platform.h @@ -716,6 +716,8 @@ class BLINK_PLATFORM_EXPORT Platform { From ebbfa40d54d77a0ad31893d7d060464a11aa52e2 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Sat, 26 Mar 2022 15:22:56 -0500 Subject: [PATCH 04/18] chore: update patches --- patches/v8/build_gn.patch | 8 ++++---- .../v8/do_not_export_private_v8_symbols_on_windows.patch | 4 ++-- patches/v8/export_symbols_needed_for_windows_build.patch | 4 ++-- patches/v8/expose_mksnapshot.patch | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/patches/v8/build_gn.patch b/patches/v8/build_gn.patch index 6cc87c66110b0..c2913a2287457 100644 --- a/patches/v8/build_gn.patch +++ b/patches/v8/build_gn.patch @@ -9,10 +9,10 @@ necessary for native modules to load. Also, some fixes relating to mksnapshot on ARM. diff --git a/BUILD.gn b/BUILD.gn -index 8a09944249fb0c9ee77c49ed018d6e145265df6b..0fdbf62eae3e5bc2d3b16a2084a59ba9c394446f 100644 +index 5417fe5ed9a87ebecc0c43ac0355707df96f039a..8227d25aad08b1f9e93980129449414662009bfb 100644 --- a/BUILD.gn +++ b/BUILD.gn -@@ -605,7 +605,7 @@ config("internal_config") { +@@ -606,7 +606,7 @@ config("internal_config") { ":cppgc_header_features", ] @@ -21,7 +21,7 @@ index 8a09944249fb0c9ee77c49ed018d6e145265df6b..0fdbf62eae3e5bc2d3b16a2084a59ba9 defines += [ "BUILDING_V8_SHARED" ] } -@@ -5818,7 +5818,7 @@ if (current_toolchain == v8_generator_toolchain) { +@@ -5823,7 +5823,7 @@ if (current_toolchain == v8_generator_toolchain) { "src/interpreter/bytecodes.h", ] @@ -30,7 +30,7 @@ index 8a09944249fb0c9ee77c49ed018d6e145265df6b..0fdbf62eae3e5bc2d3b16a2084a59ba9 deps = [ ":v8_libbase", -@@ -5856,6 +5856,8 @@ if (current_toolchain == v8_snapshot_toolchain) { +@@ -5861,6 +5861,8 @@ if (current_toolchain == v8_snapshot_toolchain) { configs = [ ":internal_config" ] 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 6fff7c78b7faf..7200648644d4b 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,10 +12,10 @@ 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 2262d19f0f9ced2c9e69862252d94ecb885c839f..2e5dcdd037f29cf51b2ff5d325a43036c8713f33 100644 +index d1d5eb7bbfc8562628aef5e22307ced78839d9b5..b18a322ac746273ebb8c761ac55b9248f0f360bc 100644 --- a/BUILD.gn +++ b/BUILD.gn -@@ -605,6 +605,10 @@ config("internal_config") { +@@ -606,6 +606,10 @@ config("internal_config") { ":cppgc_header_features", ] diff --git a/patches/v8/export_symbols_needed_for_windows_build.patch b/patches/v8/export_symbols_needed_for_windows_build.patch index 1cbc270ca4e70..a38ff09275019 100644 --- a/patches/v8/export_symbols_needed_for_windows_build.patch +++ b/patches/v8/export_symbols_needed_for_windows_build.patch @@ -6,10 +6,10 @@ Subject: Export symbols needed for Windows build These symbols are required to build v8 with BUILD_V8_SHARED on Windows. diff --git a/src/objects/objects.h b/src/objects/objects.h -index 1e3950ab2292ce6a3e6a4e469d8327da28f2d899..5e9b17acc59590147d8b3e2d74f62050e6b5a7ec 100644 +index 316f870e31f33c990793fdfe7ecb69bb120bb024..5db324b2bf0169657fc6e9dc3b15fa3ccaeac9c4 100644 --- a/src/objects/objects.h +++ b/src/objects/objects.h -@@ -911,7 +911,7 @@ enum AccessorComponent { ACCESSOR_GETTER, ACCESSOR_SETTER }; +@@ -927,7 +927,7 @@ enum AccessorComponent { ACCESSOR_GETTER, ACCESSOR_SETTER }; // Utility superclass for stack-allocated objects that must be updated // on gc. It provides two ways for the gc to update instances, either // iterating or updating after gc. diff --git a/patches/v8/expose_mksnapshot.patch b/patches/v8/expose_mksnapshot.patch index d1c6b34213e4c..3e56beab4890f 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 0fdbf62eae3e5bc2d3b16a2084a59ba9c394446f..2262d19f0f9ced2c9e69862252d94ecb885c839f 100644 +index 8227d25aad08b1f9e93980129449414662009bfb..d1d5eb7bbfc8562628aef5e22307ced78839d9b5 100644 --- a/BUILD.gn +++ b/BUILD.gn -@@ -5830,7 +5830,6 @@ if (current_toolchain == v8_generator_toolchain) { +@@ -5835,7 +5835,6 @@ if (current_toolchain == v8_generator_toolchain) { if (current_toolchain == v8_snapshot_toolchain) { v8_executable("mksnapshot") { From 0188366c6b775c6e42da94c0b9a4d4d889ceddb4 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Sat, 26 Mar 2022 22:48:38 -0500 Subject: [PATCH 05/18] 3101519: Window Placement: Prototype fullscreen companion window support Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3101519 build: add popup_preventer.cc, .h to our library. It's needed because FullscreenController, we were already using, started aggregating a PopupPreventer in 3101519. --- chromium_src/BUILD.gn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/chromium_src/BUILD.gn b/chromium_src/BUILD.gn index 7db91d633a5d0..47316008e2b39 100644 --- a/chromium_src/BUILD.gn +++ b/chromium_src/BUILD.gn @@ -55,6 +55,8 @@ static_library("chrome") { "//chrome/browser/process_singleton.h", "//chrome/browser/process_singleton_internal.cc", "//chrome/browser/process_singleton_internal.h", + "//chrome/browser/ui/blocked_content/popunder_preventer.cc", + "//chrome/browser/ui/blocked_content/popunder_preventer.h", "//chrome/browser/ui/exclusive_access/exclusive_access_bubble_type.cc", "//chrome/browser/ui/exclusive_access/exclusive_access_bubble_type.h", "//chrome/browser/ui/exclusive_access/exclusive_access_controller_base.cc", From a23ba62fc5a6c17e4ffc8634c927ea9a6b76dcff Mon Sep 17 00:00:00 2001 From: "electron-roller[bot]" <84116207+electron-roller[bot]@users.noreply.github.com> Date: Sun, 27 Mar 2022 13:00:27 +0000 Subject: [PATCH 06/18] chore: bump chromium in DEPS to 102.0.4967.0 --- DEPS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEPS b/DEPS index 5637ed7c95268..80de971616375 100644 --- a/DEPS +++ b/DEPS @@ -2,7 +2,7 @@ gclient_gn_args_from = 'src' vars = { 'chromium_version': - '102.0.4965.0', + '102.0.4967.0', 'node_version': 'v16.14.2', 'nan_version': From ffaacb94b8bd394acb4ec08f5744aa7e3535baaa Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Sun, 27 Mar 2022 10:31:13 -0500 Subject: [PATCH 07/18] Revert "3101519: Window Placement: Prototype fullscreen companion window support" This reverts commit fc215cb99c464e939882ed3f5cf8e9874a8e3311. Adding popup_preventer might not be the right solution; there are cascading dependencies. --- chromium_src/BUILD.gn | 2 -- 1 file changed, 2 deletions(-) diff --git a/chromium_src/BUILD.gn b/chromium_src/BUILD.gn index 47316008e2b39..7db91d633a5d0 100644 --- a/chromium_src/BUILD.gn +++ b/chromium_src/BUILD.gn @@ -55,8 +55,6 @@ static_library("chrome") { "//chrome/browser/process_singleton.h", "//chrome/browser/process_singleton_internal.cc", "//chrome/browser/process_singleton_internal.h", - "//chrome/browser/ui/blocked_content/popunder_preventer.cc", - "//chrome/browser/ui/blocked_content/popunder_preventer.h", "//chrome/browser/ui/exclusive_access/exclusive_access_bubble_type.cc", "//chrome/browser/ui/exclusive_access/exclusive_access_bubble_type.h", "//chrome/browser/ui/exclusive_access/exclusive_access_controller_base.cc", From cc7884eb6104ed26ca52b8a9c32de92e0ad8c119 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Sun, 27 Mar 2022 10:42:41 -0500 Subject: [PATCH 08/18] 3551449: Add service-based usage for system print settings Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3551449 chore: fix code shear in patches/chromium/printing.patch --- patches/chromium/printing.patch | 84 ++++++++++++++++++--------------- 1 file changed, 46 insertions(+), 38 deletions(-) diff --git a/patches/chromium/printing.patch b/patches/chromium/printing.patch index fd65bbd3c5314..860fc3d7f8623 100644 --- a/patches/chromium/printing.patch +++ b/patches/chromium/printing.patch @@ -69,7 +69,7 @@ index 650c78f16c812170aeda99d75300ff88f47347a0..c33ce445a23f97a744db3a4ac30ef471 NEW_DOC, diff --git a/chrome/browser/printing/print_job_worker.cc b/chrome/browser/printing/print_job_worker.cc -index 27305997182f0a669291d2f36dd6b0b98c43f314..cbb83e1f5661852d84468ec9d342af1b2d05ae45 100644 +index b11b8f34cf7e252a8d22e167d6555f3aa432e5c4..a5950a9d4c823e3df145c365bb499c0163fe3e77 100644 --- a/chrome/browser/printing/print_job_worker.cc +++ b/chrome/browser/printing/print_job_worker.cc @@ -20,7 +20,6 @@ @@ -88,7 +88,7 @@ index 27305997182f0a669291d2f36dd6b0b98c43f314..cbb83e1f5661852d84468ec9d342af1b #include "printing/backend/print_backend.h" #include "printing/buildflags/buildflags.h" #include "printing/mojom/print.mojom.h" -@@ -234,16 +234,21 @@ void PrintJobWorker::UpdatePrintSettings(base::Value new_settings, +@@ -229,16 +229,21 @@ void PrintJobWorker::UpdatePrintSettings(base::Value new_settings, #endif // BUILDFLAG(IS_LINUX) && defined(USE_CUPS) } @@ -114,10 +114,10 @@ index 27305997182f0a669291d2f36dd6b0b98c43f314..cbb83e1f5661852d84468ec9d342af1b #if BUILDFLAG(IS_CHROMEOS) diff --git a/chrome/browser/printing/print_job_worker_oop.cc b/chrome/browser/printing/print_job_worker_oop.cc -index 52a13c0c47f7f3f18c4f552806add67291ce8726..765bde402fec094b51faea68e67d3782bbc06564 100644 +index 56232bf979e90a01bb580c0a1972ae0860d994e9..96e05b5cd4b556a6ddb41664b5ff999b899e5972 100644 --- a/chrome/browser/printing/print_job_worker_oop.cc +++ b/chrome/browser/printing/print_job_worker_oop.cc -@@ -226,7 +226,7 @@ void PrintJobWorkerOop::OnFailure() { +@@ -305,7 +305,7 @@ void PrintJobWorkerOop::OnFailure() { } void PrintJobWorkerOop::ShowErrorDialog() { @@ -127,7 +127,7 @@ index 52a13c0c47f7f3f18c4f552806add67291ce8726..765bde402fec094b51faea68e67d3782 void PrintJobWorkerOop::UnregisterServiceManagerClient() { diff --git a/chrome/browser/printing/print_view_manager_base.cc b/chrome/browser/printing/print_view_manager_base.cc -index 8765dc3c49ce8a77bc7f4f5979591a5a193757ca..c2ed5bee02b6d814cae63a9089c0ebdca36b5173 100644 +index 818eee61fd42cdfda868beb974786c3bf4e21961..97d43d0d8a8bd53b66292cc728f271c7e6630064 100644 --- a/chrome/browser/printing/print_view_manager_base.cc +++ b/chrome/browser/printing/print_view_manager_base.cc @@ -30,10 +30,10 @@ @@ -151,7 +151,7 @@ index 8765dc3c49ce8a77bc7f4f5979591a5a193757ca..c2ed5bee02b6d814cae63a9089c0ebdc #include "mojo/public/cpp/system/buffer.h" #include "printing/buildflags/buildflags.h" #include "printing/metafile_skia.h" -@@ -87,6 +88,8 @@ using PrintSettingsCallback = +@@ -88,6 +89,8 @@ using PrintSettingsCallback = base::OnceCallback)>; void ShowWarningMessageBox(const std::u16string& message) { @@ -160,7 +160,7 @@ index 8765dc3c49ce8a77bc7f4f5979591a5a193757ca..c2ed5bee02b6d814cae63a9089c0ebdc // Runs always on the UI thread. static bool is_dialog_shown = false; if (is_dialog_shown) -@@ -95,6 +98,7 @@ void ShowWarningMessageBox(const std::u16string& message) { +@@ -96,6 +99,7 @@ void ShowWarningMessageBox(const std::u16string& message) { base::AutoReset auto_reset(&is_dialog_shown, true); chrome::ShowWarningMessageBox(nullptr, std::u16string(), message); @@ -168,7 +168,7 @@ index 8765dc3c49ce8a77bc7f4f5979591a5a193757ca..c2ed5bee02b6d814cae63a9089c0ebdc } #if BUILDFLAG(ENABLE_PRINT_PREVIEW) -@@ -192,7 +196,9 @@ void UpdatePrintSettingsReplyOnIO( +@@ -193,7 +197,9 @@ void UpdatePrintSettingsReplyOnIO( DCHECK_CURRENTLY_ON(content::BrowserThread::IO); DCHECK(printer_query); mojom::PrintPagesParamsPtr params = CreateEmptyPrintPagesParamsPtr(); @@ -179,7 +179,7 @@ index 8765dc3c49ce8a77bc7f4f5979591a5a193757ca..c2ed5bee02b6d814cae63a9089c0ebdc RenderParamsFromPrintSettings(printer_query->settings(), params->params.get()); params->params->document_cookie = printer_query->cookie(); -@@ -245,6 +251,7 @@ void ScriptedPrintReplyOnIO( +@@ -246,6 +252,7 @@ void ScriptedPrintReplyOnIO( mojom::PrintManagerHost::ScriptedPrintCallback callback) { DCHECK_CURRENTLY_ON(content::BrowserThread::IO); mojom::PrintPagesParamsPtr params = CreateEmptyPrintPagesParamsPtr(); @@ -187,7 +187,7 @@ index 8765dc3c49ce8a77bc7f4f5979591a5a193757ca..c2ed5bee02b6d814cae63a9089c0ebdc if (printer_query->last_status() == mojom::ResultCode::kSuccess && printer_query->settings().dpi()) { RenderParamsFromPrintSettings(printer_query->settings(), -@@ -254,8 +261,9 @@ void ScriptedPrintReplyOnIO( +@@ -255,8 +262,9 @@ void ScriptedPrintReplyOnIO( } bool has_valid_cookie = params->params->document_cookie; bool has_dpi = !params->params->dpi.IsEmpty(); @@ -198,7 +198,7 @@ index 8765dc3c49ce8a77bc7f4f5979591a5a193757ca..c2ed5bee02b6d814cae63a9089c0ebdc if (has_dpi && has_valid_cookie) { queue->QueuePrinterQuery(std::move(printer_query)); -@@ -293,12 +301,14 @@ PrintViewManagerBase::PrintViewManagerBase(content::WebContents* web_contents) +@@ -294,12 +302,14 @@ PrintViewManagerBase::PrintViewManagerBase(content::WebContents* web_contents) : PrintManager(web_contents), queue_(g_browser_process->print_job_manager()->queue()) { DCHECK(queue_); @@ -213,7 +213,7 @@ index 8765dc3c49ce8a77bc7f4f5979591a5a193757ca..c2ed5bee02b6d814cae63a9089c0ebdc } PrintViewManagerBase::~PrintViewManagerBase() { -@@ -306,7 +316,10 @@ PrintViewManagerBase::~PrintViewManagerBase() { +@@ -307,7 +317,10 @@ PrintViewManagerBase::~PrintViewManagerBase() { DisconnectFromCurrentPrintJob(); } @@ -225,8 +225,8 @@ index 8765dc3c49ce8a77bc7f4f5979591a5a193757ca..c2ed5bee02b6d814cae63a9089c0ebdc // Remember the ID for `rfh`, to enable checking that the `RenderFrameHost` // is still valid after a possible inner message loop runs in // `DisconnectFromCurrentPrintJob()`. -@@ -329,7 +342,9 @@ bool PrintViewManagerBase::PrintNow(content::RenderFrameHost* rfh) { - // go in `ReleasePrintJob()`. +@@ -333,7 +346,9 @@ bool PrintViewManagerBase::PrintNow(content::RenderFrameHost* rfh) { + #endif SetPrintingRFH(rfh); - GetPrintRenderFrame(rfh)->PrintRequestedPages(); @@ -236,7 +236,7 @@ index 8765dc3c49ce8a77bc7f4f5979591a5a193757ca..c2ed5bee02b6d814cae63a9089c0ebdc for (auto& observer : GetObservers()) observer.OnPrintNow(rfh); -@@ -472,7 +487,8 @@ void PrintViewManagerBase::GetDefaultPrintSettingsReply( +@@ -486,7 +501,8 @@ void PrintViewManagerBase::GetDefaultPrintSettingsReply( void PrintViewManagerBase::ScriptedPrintReply( ScriptedPrintCallback callback, int process_id, @@ -245,8 +245,8 @@ index 8765dc3c49ce8a77bc7f4f5979591a5a193757ca..c2ed5bee02b6d814cae63a9089c0ebdc + bool canceled) { DCHECK_CURRENTLY_ON(content::BrowserThread::UI); - if (!content::RenderProcessHost::FromID(process_id)) { -@@ -480,16 +496,19 @@ void PrintViewManagerBase::ScriptedPrintReply( + #if BUILDFLAG(ENABLE_OOP_PRINTING) +@@ -499,16 +515,19 @@ void PrintViewManagerBase::ScriptedPrintReply( return; } @@ -270,22 +270,22 @@ index 8765dc3c49ce8a77bc7f4f5979591a5a193757ca..c2ed5bee02b6d814cae63a9089c0ebdc } void PrintViewManagerBase::NavigationStopped() { -@@ -605,12 +624,13 @@ void PrintViewManagerBase::DidPrintDocument( +@@ -624,11 +643,14 @@ void PrintViewManagerBase::DidPrintDocument( void PrintViewManagerBase::GetDefaultPrintSettings( GetDefaultPrintSettingsCallback callback) { DCHECK_CURRENTLY_ON(content::BrowserThread::UI); +#if 0 // Printing is always enabled. ++ if (!printing_enabled_.GetValue()) { GetDefaultPrintSettingsReply(std::move(callback), mojom::PrintParams::New()); return; } -- +#endif - content::RenderFrameHost* render_frame_host = GetCurrentTargetFrame(); - auto callback_wrapper = - base::BindOnce(&PrintViewManagerBase::GetDefaultPrintSettingsReply, -@@ -627,18 +647,20 @@ void PrintViewManagerBase::UpdatePrintSettings( + #if BUILDFLAG(ENABLE_OOP_PRINTING) + if (printing::features::kEnableOopPrintDriversJobPrint.Get() && + !service_manager_client_id_.has_value()) { +@@ -655,18 +677,20 @@ void PrintViewManagerBase::UpdatePrintSettings( base::Value job_settings, UpdatePrintSettingsCallback callback) { DCHECK_CURRENTLY_ON(content::BrowserThread::UI); @@ -307,7 +307,7 @@ index 8765dc3c49ce8a77bc7f4f5979591a5a193757ca..c2ed5bee02b6d814cae63a9089c0ebdc content::BrowserContext* context = web_contents() ? web_contents()->GetBrowserContext() : nullptr; PrefService* prefs = -@@ -648,6 +670,7 @@ void PrintViewManagerBase::UpdatePrintSettings( +@@ -676,6 +700,7 @@ void PrintViewManagerBase::UpdatePrintSettings( if (value > 0) job_settings.SetIntKey(kSettingRasterizePdfDpi, value); } @@ -315,7 +315,7 @@ index 8765dc3c49ce8a77bc7f4f5979591a5a193757ca..c2ed5bee02b6d814cae63a9089c0ebdc auto callback_wrapper = base::BindOnce(&PrintViewManagerBase::UpdatePrintSettingsReply, -@@ -673,7 +696,7 @@ void PrintViewManagerBase::ScriptedPrint(mojom::ScriptedPrintParamsPtr params, +@@ -701,14 +726,14 @@ void PrintViewManagerBase::ScriptedPrint(mojom::ScriptedPrintParamsPtr params, // didn't happen for some reason. bad_message::ReceivedBadMessage( render_process_host, bad_message::PVMB_SCRIPTED_PRINT_FENCED_FRAME); @@ -323,8 +323,16 @@ index 8765dc3c49ce8a77bc7f4f5979591a5a193757ca..c2ed5bee02b6d814cae63a9089c0ebdc + std::move(callback).Run(CreateEmptyPrintPagesParamsPtr(), false); return; } - auto callback_wrapper = base::BindOnce( -@@ -694,7 +717,6 @@ void PrintViewManagerBase::PrintingFailed(int32_t cookie) { + #if BUILDFLAG(ENABLE_OOP_PRINTING) + if (printing::features::kEnableOopPrintDriversJobPrint.Get() && + !service_manager_client_id_.has_value()) { + // Renderer process has requested settings outside of the expected setup. +- std::move(callback).Run(CreateEmptyPrintPagesParamsPtr()); ++ std::move(callback).Run(CreateEmptyPrintPagesParamsPtr(), false); + return; + } + #endif +@@ -730,7 +755,6 @@ void PrintViewManagerBase::PrintingFailed(int32_t cookie) { PrintManager::PrintingFailed(cookie); #if !BUILDFLAG(IS_ANDROID) // Android does not implement this function. @@ -332,7 +340,7 @@ index 8765dc3c49ce8a77bc7f4f5979591a5a193757ca..c2ed5bee02b6d814cae63a9089c0ebdc #endif ReleasePrinterQuery(); -@@ -709,6 +731,11 @@ void PrintViewManagerBase::RemoveObserver(Observer& observer) { +@@ -745,6 +769,11 @@ void PrintViewManagerBase::RemoveObserver(Observer& observer) { } void PrintViewManagerBase::ShowInvalidPrinterSettingsError() { @@ -344,7 +352,7 @@ index 8765dc3c49ce8a77bc7f4f5979591a5a193757ca..c2ed5bee02b6d814cae63a9089c0ebdc base::ThreadTaskRunnerHandle::Get()->PostTask( FROM_HERE, base::BindOnce(&ShowWarningMessageBox, l10n_util::GetStringUTF16( -@@ -719,10 +746,12 @@ void PrintViewManagerBase::RenderFrameHostStateChanged( +@@ -755,10 +784,12 @@ void PrintViewManagerBase::RenderFrameHostStateChanged( content::RenderFrameHost* render_frame_host, content::RenderFrameHost::LifecycleState /*old_state*/, content::RenderFrameHost::LifecycleState new_state) { @@ -357,7 +365,7 @@ index 8765dc3c49ce8a77bc7f4f5979591a5a193757ca..c2ed5bee02b6d814cae63a9089c0ebdc } void PrintViewManagerBase::DidStartLoading() { -@@ -782,6 +811,11 @@ void PrintViewManagerBase::OnJobDone() { +@@ -818,6 +849,11 @@ void PrintViewManagerBase::OnJobDone() { ReleasePrintJob(); } @@ -369,7 +377,7 @@ index 8765dc3c49ce8a77bc7f4f5979591a5a193757ca..c2ed5bee02b6d814cae63a9089c0ebdc void PrintViewManagerBase::OnFailed() { TerminatePrintJob(true); } -@@ -843,7 +877,10 @@ bool PrintViewManagerBase::CreateNewPrintJob( +@@ -879,7 +915,10 @@ bool PrintViewManagerBase::CreateNewPrintJob( // Disconnect the current |print_job_|. auto weak_this = weak_ptr_factory_.GetWeakPtr(); @@ -381,9 +389,9 @@ index 8765dc3c49ce8a77bc7f4f5979591a5a193757ca..c2ed5bee02b6d814cae63a9089c0ebdc if (!weak_this) return false; -@@ -918,6 +955,13 @@ void PrintViewManagerBase::ReleasePrintJob() { - content::RenderFrameHost* rfh = printing_rfh_; - printing_rfh_ = nullptr; +@@ -961,6 +1000,13 @@ void PrintViewManagerBase::ReleasePrintJob() { + UnregisterSystemPrintClient(); + #endif + if (!callback_.is_null()) { + std::string cb_str = ""; @@ -395,7 +403,7 @@ index 8765dc3c49ce8a77bc7f4f5979591a5a193757ca..c2ed5bee02b6d814cae63a9089c0ebdc if (!print_job_) return; -@@ -967,7 +1011,7 @@ bool PrintViewManagerBase::RunInnerMessageLoop() { +@@ -1010,7 +1056,7 @@ bool PrintViewManagerBase::RunInnerMessageLoop() { } bool PrintViewManagerBase::OpportunisticallyCreatePrintJob(int cookie) { @@ -405,7 +413,7 @@ index 8765dc3c49ce8a77bc7f4f5979591a5a193757ca..c2ed5bee02b6d814cae63a9089c0ebdc if (!cookie) { diff --git a/chrome/browser/printing/print_view_manager_base.h b/chrome/browser/printing/print_view_manager_base.h -index 2661776307f773ac8f2c62529ec86349b045ee8f..cb41b271adbb02517a5e1ad222d0320000437dfb 100644 +index 3a4cfa1e44d781a94030dec6992ffd6f6391020f..d14804d02cc61b6f75d47893f6dd61ddde6cd552 100644 --- a/chrome/browser/printing/print_view_manager_base.h +++ b/chrome/browser/printing/print_view_manager_base.h @@ -37,6 +37,8 @@ namespace printing { @@ -437,7 +445,7 @@ index 2661776307f773ac8f2c62529ec86349b045ee8f..cb41b271adbb02517a5e1ad222d03200 // Adds and removes observers for `PrintViewManagerBase` events. The order in // which notifications are sent to observers is undefined. Observers must be -@@ -193,7 +199,8 @@ class PrintViewManagerBase : public PrintManager, public PrintJob::Observer { +@@ -207,7 +213,8 @@ class PrintViewManagerBase : public PrintManager, public PrintJob::Observer { // Runs `callback` with `params` to reply to ScriptedPrint(). void ScriptedPrintReply(ScriptedPrintCallback callback, int process_id, @@ -447,7 +455,7 @@ index 2661776307f773ac8f2c62529ec86349b045ee8f..cb41b271adbb02517a5e1ad222d03200 // Requests the RenderView to render all the missing pages for the print job. // No-op if no print job is pending. Returns true if at least one page has -@@ -248,9 +255,15 @@ class PrintViewManagerBase : public PrintManager, public PrintJob::Observer { +@@ -262,9 +269,15 @@ class PrintViewManagerBase : public PrintManager, public PrintJob::Observer { // The current RFH that is printing with a system printing dialog. raw_ptr printing_rfh_ = nullptr; From b188c2530f22707d6670ac3cf9451c08cfc80d16 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Sun, 27 Mar 2022 11:42:03 -0500 Subject: [PATCH 09/18] chore: update patches --- patches/chromium/add_didinstallconditionalfeatures.patch | 4 ++-- ...isabling_blink_scheduler_throttling_per_renderview.patch | 4 ++-- patches/chromium/blink_local_frame.patch | 6 +++--- .../build_do_not_depend_on_packed_resource_integrity.patch | 4 ++-- patches/chromium/can_create_window.patch | 2 +- ...use_electron_resources_not_chrome_for_spellchecker.patch | 4 ++-- ...potentially_null_getwebframe_-_view_when_get_blink.patch | 2 +- .../chromium/fix_properly_honor_printing_page_ranges.patch | 4 ++-- patches/chromium/webview_fullscreen.patch | 2 +- 9 files changed, 16 insertions(+), 16 deletions(-) diff --git a/patches/chromium/add_didinstallconditionalfeatures.patch b/patches/chromium/add_didinstallconditionalfeatures.patch index 95daef0066cae..238c46109cc04 100644 --- a/patches/chromium/add_didinstallconditionalfeatures.patch +++ b/patches/chromium/add_didinstallconditionalfeatures.patch @@ -23,10 +23,10 @@ index d55a1b4f71224a2156eb5f3b0b32f41643b3dc28..f41c8f3d74f72d6e2220af527500749e int32_t world_id) {} virtual void DidClearWindowObject() {} diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc -index 78696a7474b07851c72e4d8643a977d2afe4be07..5099849c21ffc780a488c73f15cfc6f2206ff31a 100644 +index e0d4faf86b7afe7f29da5e5c8babc78a40e72ae1..1fbf6abed9c7d1bbec4478d022e1763ea8bfed8e 100644 --- a/content/renderer/render_frame_impl.cc +++ b/content/renderer/render_frame_impl.cc -@@ -4423,6 +4423,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local context, +@@ -4444,6 +4444,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local context, observer.DidCreateScriptContext(context, world_id); } diff --git a/patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch b/patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch index 04504a209f10a..dc944eefa587d 100644 --- a/patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch +++ b/patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch @@ -6,10 +6,10 @@ Subject: allow disabling blink scheduler throttling per RenderView This allows us to disable throttling for hidden windows. diff --git a/content/browser/renderer_host/render_view_host_impl.cc b/content/browser/renderer_host/render_view_host_impl.cc -index 84044606fb0644b2b6053c72a9750bae3729f666..995c5dfc49a392669f73d85a92fbdb54cf0e11ca 100644 +index 8ee02135efb64c57d0779faa96640aa8e7775b58..66007d67da1230740eb00e31b220ddb02fbf37d9 100644 --- a/content/browser/renderer_host/render_view_host_impl.cc +++ b/content/browser/renderer_host/render_view_host_impl.cc -@@ -649,6 +649,11 @@ void RenderViewHostImpl::SetBackgroundOpaque(bool opaque) { +@@ -650,6 +650,11 @@ void RenderViewHostImpl::SetBackgroundOpaque(bool opaque) { GetWidget()->GetAssociatedFrameWidget()->SetBackgroundOpaque(opaque); } diff --git a/patches/chromium/blink_local_frame.patch b/patches/chromium/blink_local_frame.patch index c0cd3c9e741c2..8acc606a3dbef 100644 --- a/patches/chromium/blink_local_frame.patch +++ b/patches/chromium/blink_local_frame.patch @@ -49,10 +49,10 @@ index da12f2f47f97628f1adeabc8900ffd16132afd7e..61d373f78520a063c7f86bde6869af9d // its owning reference back to our owning LocalFrame. client_->Detached(type); diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc -index 85849e45352bb8d95f82419424c07e5455680e58..97a97e8084a3e194322311b8791e09cde81d8b55 100644 +index ae445a52314d8581909f05a06442954f39b6b6d0..857715ca74b0f3a50953095d15237292e2a05510 100644 --- a/third_party/blink/renderer/core/frame/local_frame.cc +++ b/third_party/blink/renderer/core/frame/local_frame.cc -@@ -545,10 +545,6 @@ bool LocalFrame::DetachImpl(FrameDetachType type) { +@@ -543,10 +543,6 @@ bool LocalFrame::DetachImpl(FrameDetachType type) { } DCHECK(!view_ || !view_->IsAttached()); @@ -63,7 +63,7 @@ index 85849e45352bb8d95f82419424c07e5455680e58..97a97e8084a3e194322311b8791e09cd if (!Client()) return false; -@@ -594,6 +590,11 @@ bool LocalFrame::DetachImpl(FrameDetachType type) { +@@ -592,6 +588,11 @@ bool LocalFrame::DetachImpl(FrameDetachType type) { DCHECK(!view_->IsAttached()); Client()->WillBeDetached(); 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 0d68072b1160b..6edec0e4d855a 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 @@ -33,10 +33,10 @@ index 1f86073736f849e797e029678bc212ce96ba0bd9..b8abc10e48bdff0f4e6c3f8e1c4927bc "//base", "//build:branding_buildflags", diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn -index a55851c719657b3e136c2ef31028798b509a8287..8718160f42a6527fd2df797ea5266ecc16dcd549 100644 +index bdb5477f7e69f8530b9f0c5eef0ff1a95123085e..97ac33277c332639300933cb672eeefc8857c636 100644 --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -4515,7 +4515,7 @@ static_library("browser") { +@@ -4517,7 +4517,7 @@ static_library("browser") { # On Windows, the hashes are embedded in //chrome:chrome_initial rather # than here in :chrome_dll. diff --git a/patches/chromium/can_create_window.patch b/patches/chromium/can_create_window.patch index f126f8eb85275..4f2e2ea2d71a6 100644 --- a/patches/chromium/can_create_window.patch +++ b/patches/chromium/can_create_window.patch @@ -9,7 +9,7 @@ potentially prevent a window from being created. TODO(loc): this patch is currently broken. diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc -index 331688ff923a3785818e826897736ae7d0d9a85a..54c4ae9fc1ca2fec473c960300ca94af8394473f 100644 +index be7895586d64b0f8e7f122561d86f49479400a2b..5ad53ce87d8757b18e5ecedbd7ec9aec54bea165 100644 --- a/content/browser/renderer_host/render_frame_host_impl.cc +++ b/content/browser/renderer_host/render_frame_host_impl.cc @@ -6908,6 +6908,7 @@ void RenderFrameHostImpl::CreateNewWindow( diff --git a/patches/chromium/chore_use_electron_resources_not_chrome_for_spellchecker.patch b/patches/chromium/chore_use_electron_resources_not_chrome_for_spellchecker.patch index 2de14ada23bf8..668513fd616f2 100644 --- a/patches/chromium/chore_use_electron_resources_not_chrome_for_spellchecker.patch +++ b/patches/chromium/chore_use_electron_resources_not_chrome_for_spellchecker.patch @@ -7,10 +7,10 @@ spellchecker uses a few IDS_ resources. We need to load these from Electrons grit header instead of Chromes diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn -index db6fc6ae990f7e3bd15920a04101db2b9e3b2787..a55851c719657b3e136c2ef31028798b509a8287 100644 +index 30281f61876cf1d9bebb0035d5a20624427380f0..bdb5477f7e69f8530b9f0c5eef0ff1a95123085e 100644 --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -7132,6 +7132,7 @@ static_library("browser") { +@@ -7134,6 +7134,7 @@ static_library("browser") { deps += [ "//components/spellcheck/browser", "//components/spellcheck/common", diff --git a/patches/chromium/don_t_use_potentially_null_getwebframe_-_view_when_get_blink.patch b/patches/chromium/don_t_use_potentially_null_getwebframe_-_view_when_get_blink.patch index 597f58db3043d..2b2569457cc46 100644 --- a/patches/chromium/don_t_use_potentially_null_getwebframe_-_view_when_get_blink.patch +++ b/patches/chromium/don_t_use_potentially_null_getwebframe_-_view_when_get_blink.patch @@ -11,7 +11,7 @@ This regressed in https://chromium-review.googlesource.com/c/chromium/src/+/2572 Upstream: https://chromium-review.googlesource.com/c/chromium/src/+/2598393 diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc -index 5099849c21ffc780a488c73f15cfc6f2206ff31a..305e05ad5ac43503c6da571ade21168c1301a833 100644 +index 1fbf6abed9c7d1bbec4478d022e1763ea8bfed8e..e0d7367135abb08f9f303cc528a55d8ba026fa56 100644 --- a/content/renderer/render_frame_impl.cc +++ b/content/renderer/render_frame_impl.cc @@ -2367,7 +2367,7 @@ const blink::WebView* RenderFrameImpl::GetWebView() const { diff --git a/patches/chromium/fix_properly_honor_printing_page_ranges.patch b/patches/chromium/fix_properly_honor_printing_page_ranges.patch index fb162f70ab70e..6afb86bfb4a19 100644 --- a/patches/chromium/fix_properly_honor_printing_page_ranges.patch +++ b/patches/chromium/fix_properly_honor_printing_page_ranges.patch @@ -62,10 +62,10 @@ index 9e351c7e80a135adf0ebe011763f5164e51981bb..b9fcb4d2a8c7a22ebc7cd8434636454e PMPrintSettings print_settings = static_cast([print_info_.get() PMPrintSettings]); diff --git a/printing/printing_context_system_dialog_win.cc b/printing/printing_context_system_dialog_win.cc -index ba604d33cc0601276320f3f81f20e98cb2811f74..1da667c66b75ab44727c5029c02d44379f924007 100644 +index b7ba6ba4446963b08bce9fe416379169bd880378..7c621ea7a60725d08ee9ade68b65fd5bc88b0c2d 100644 --- a/printing/printing_context_system_dialog_win.cc +++ b/printing/printing_context_system_dialog_win.cc -@@ -53,14 +53,28 @@ void PrintingContextSystemDialogWin::AskUserForSettings( +@@ -75,14 +75,28 @@ void PrintingContextSystemDialogWin::AskUserForSettings( PRINTPAGERANGE ranges[32]; dialog_options.nStartPage = START_PAGE_GENERAL; if (max_pages) { diff --git a/patches/chromium/webview_fullscreen.patch b/patches/chromium/webview_fullscreen.patch index 4aefeaa2e6074..8bb0068ff0b9f 100644 --- a/patches/chromium/webview_fullscreen.patch +++ b/patches/chromium/webview_fullscreen.patch @@ -14,7 +14,7 @@ Note that we also need to manually update embedder's `api::WebContents::IsFullscreenForTabOrPending` value. diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc -index 54c4ae9fc1ca2fec473c960300ca94af8394473f..a0d58c2d76c0302bab367e4ad3413a97c34be69c 100644 +index 5ad53ce87d8757b18e5ecedbd7ec9aec54bea165..37f181f16cd2520de1cbec678e02061b165fed62 100644 --- a/content/browser/renderer_host/render_frame_host_impl.cc +++ b/content/browser/renderer_host/render_frame_host_impl.cc @@ -6293,6 +6293,15 @@ void RenderFrameHostImpl::EnterFullscreen( From 8e3aa89a98aab678bf94a910ac84c1103b0bf31b Mon Sep 17 00:00:00 2001 From: "electron-roller[bot]" <84116207+electron-roller[bot]@users.noreply.github.com> Date: Mon, 28 Mar 2022 13:00:22 +0000 Subject: [PATCH 10/18] chore: bump chromium in DEPS to 102.0.4969.0 --- DEPS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEPS b/DEPS index 80de971616375..af193944468d7 100644 --- a/DEPS +++ b/DEPS @@ -2,7 +2,7 @@ gclient_gn_args_from = 'src' vars = { 'chromium_version': - '102.0.4967.0', + '102.0.4969.0', 'node_version': 'v16.14.2', 'nan_version': From d14ef8cbda17f388ffabdcc44188c1839de2c53c Mon Sep 17 00:00:00 2001 From: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Date: Mon, 28 Mar 2022 13:26:11 +0000 Subject: [PATCH 11/18] chore: update patches --- ..._to_allow_gclient_sync_with_host_os_mac_on_linux_in_ci.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/patches/chromium/hack_to_allow_gclient_sync_with_host_os_mac_on_linux_in_ci.patch b/patches/chromium/hack_to_allow_gclient_sync_with_host_os_mac_on_linux_in_ci.patch index c558d7e41b89e..84f03a08c570c 100644 --- a/patches/chromium/hack_to_allow_gclient_sync_with_host_os_mac_on_linux_in_ci.patch +++ b/patches/chromium/hack_to_allow_gclient_sync_with_host_os_mac_on_linux_in_ci.patch @@ -11,7 +11,7 @@ If removing this patch causes no sync failures, it's safe to delete :+1: Ref https://chromium-review.googlesource.com/c/chromium/src/+/2953903 diff --git a/tools/clang/scripts/update.py b/tools/clang/scripts/update.py -index ceeeedc42d9fe86383f9fda2b1a26d39119e655c..ff3b3cb47cbce01bcdcb28f1ef8a360143b2488f 100755 +index 90f738057d3040b5421d51592097c7c30106a94f..3cb2f0880bb36f19fc9b55f2351f891088e8c304 100755 --- a/tools/clang/scripts/update.py +++ b/tools/clang/scripts/update.py @@ -298,6 +298,8 @@ def GetDefaultHostOs(): From 18097559fda8ab97abffc4f06832be5c3b8bf8f1 Mon Sep 17 00:00:00 2001 From: "electron-roller[bot]" <84116207+electron-roller[bot]@users.noreply.github.com> Date: Tue, 29 Mar 2022 13:00:29 +0000 Subject: [PATCH 12/18] chore: bump chromium in DEPS to 102.0.4971.0 --- DEPS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEPS b/DEPS index af193944468d7..087a1ca200ee2 100644 --- a/DEPS +++ b/DEPS @@ -2,7 +2,7 @@ gclient_gn_args_from = 'src' vars = { 'chromium_version': - '102.0.4969.0', + '102.0.4971.0', 'node_version': 'v16.14.2', 'nan_version': From 9e69ee38bb0b7d2eee39f12f11271c1f5bf4c766 Mon Sep 17 00:00:00 2001 From: deepak1556 Date: Tue, 29 Mar 2022 21:56:46 +0900 Subject: [PATCH 13/18] chore: update fix_patch_out_permissions_checks_in_exclusive_access.patch Refs https://chromium-review.googlesource.com/c/chromium/src/+/3101519 PopupunderPreventer is not useful in //electron since the window attributes are controlled by the user via setWindowOpenHandler. --- ...rmissions_checks_in_exclusive_access.patch | 82 ++++++++++++++++++- 1 file changed, 78 insertions(+), 4 deletions(-) diff --git a/patches/chromium/fix_patch_out_permissions_checks_in_exclusive_access.patch b/patches/chromium/fix_patch_out_permissions_checks_in_exclusive_access.patch index 873952c92c3bd..4ac4782be9141 100644 --- a/patches/chromium/fix_patch_out_permissions_checks_in_exclusive_access.patch +++ b/patches/chromium/fix_patch_out_permissions_checks_in_exclusive_access.patch @@ -14,10 +14,67 @@ but it's not strictly necessary for this API to work to spec. Profile check has been upstreamed at https://chromium-review.googlesource.com/c/chromium/src/+/3247196 diff --git a/chrome/browser/ui/exclusive_access/fullscreen_controller.cc b/chrome/browser/ui/exclusive_access/fullscreen_controller.cc -index f1b9597ea5070ac1847355833a751c72abc0e917..c1dcc26f44318a12977196d59f6d7ab7237ed781 100644 +index f1b9597ea5070ac1847355833a751c72abc0e917..caa82d39fbab39ce7c90dcec401aa8d54a5b39da 100644 --- a/chrome/browser/ui/exclusive_access/fullscreen_controller.cc +++ b/chrome/browser/ui/exclusive_access/fullscreen_controller.cc -@@ -402,13 +402,9 @@ void FullscreenController::EnterFullscreenModeInternal( +@@ -16,12 +16,16 @@ + #include "build/build_config.h" + #include "chrome/browser/app_mode/app_mode_utils.h" + #include "chrome/browser/profiles/profile.h" ++#if 0 + #include "chrome/browser/ui/blocked_content/popunder_preventer.h" ++#endif + #include "chrome/browser/ui/exclusive_access/exclusive_access_context.h" + #include "chrome/browser/ui/exclusive_access/exclusive_access_manager.h" + #include "chrome/browser/ui/exclusive_access/fullscreen_within_tab_helper.h" ++#if 0 + #include "chrome/browser/ui/status_bubble.h" + #include "chrome/browser/ui/tabs/tab_strip_model.h" ++#endif + #include "chrome/common/chrome_switches.h" + #include "content/public/browser/navigation_details.h" + #include "content/public/browser/navigation_entry.h" +@@ -161,6 +165,7 @@ void FullscreenController::EnterFullscreenModeForTab( + return; + } + ++#if 0 + if (base::FeatureList::IsEnabled( + blink::features::kWindowPlacementFullscreenCompanionWindow)) { + if (!popunder_preventer_) +@@ -168,6 +173,7 @@ void FullscreenController::EnterFullscreenModeForTab( + else + popunder_preventer_->WillActivateWebContents(web_contents); + } ++#endif + + SetTabWithExclusiveAccess(web_contents); + requesting_origin_ = +@@ -203,7 +209,9 @@ void FullscreenController::EnterFullscreenModeForTab( + } + + void FullscreenController::ExitFullscreenModeForTab(WebContents* web_contents) { ++#if 0 + popunder_preventer_.reset(); ++#endif + + if (MaybeToggleFullscreenWithinTab(web_contents, false)) { + // During tab capture of fullscreen-within-tab views, the browser window +@@ -248,11 +256,13 @@ void FullscreenController::ExitFullscreenModeForTab(WebContents* web_contents) { + void FullscreenController::FullscreenTabOpeningPopup( + content::WebContents* opener, + content::WebContents* popup) { ++#if 0 + DCHECK(base::FeatureList::IsEnabled( + blink::features::kWindowPlacementFullscreenCompanionWindow)); + DCHECK_EQ(exclusive_access_tab(), opener); + DCHECK(popunder_preventer_); + popunder_preventer_->AddPotentialPopunder(popup); ++#endif + } + + void FullscreenController::OnTabDeactivated( +@@ -402,13 +412,9 @@ void FullscreenController::EnterFullscreenModeInternal( // Do not enter fullscreen mode if disallowed by pref. This prevents the user // from manually entering fullscreen mode and also disables kiosk mode on // desktop platforms. @@ -33,7 +90,7 @@ index f1b9597ea5070ac1847355833a751c72abc0e917..c1dcc26f44318a12977196d59f6d7ab7 #endif toggled_into_fullscreen_ = true; -@@ -421,6 +417,7 @@ void FullscreenController::EnterFullscreenModeInternal( +@@ -421,6 +427,7 @@ void FullscreenController::EnterFullscreenModeInternal( url = extension_caused_fullscreen_; } @@ -41,7 +98,7 @@ index f1b9597ea5070ac1847355833a751c72abc0e917..c1dcc26f44318a12977196d59f6d7ab7 if (display_id != display::kInvalidDisplayId) { // Check, but do not prompt, for permission to request a specific screen. // Sites generally need permission to get the display id in the first place. -@@ -434,6 +431,7 @@ void FullscreenController::EnterFullscreenModeInternal( +@@ -434,6 +441,7 @@ void FullscreenController::EnterFullscreenModeInternal( display_id = display::kInvalidDisplayId; } } @@ -49,3 +106,20 @@ index f1b9597ea5070ac1847355833a751c72abc0e917..c1dcc26f44318a12977196d59f6d7ab7 if (option == BROWSER) base::RecordAction(base::UserMetricsAction("ToggleFullscreen")); +diff --git a/chrome/browser/ui/exclusive_access/fullscreen_controller.h b/chrome/browser/ui/exclusive_access/fullscreen_controller.h +index 7bd40f52ef5f6b04a7ea114ec4d18c8a98ec6d42..fb04fed5cc1e2e255c9e67c180fababe1fbb3fe0 100644 +--- a/chrome/browser/ui/exclusive_access/fullscreen_controller.h ++++ b/chrome/browser/ui/exclusive_access/fullscreen_controller.h +@@ -222,10 +222,12 @@ class FullscreenController : public ExclusiveAccessControllerBase { + // Used in testing to set the state to tab fullscreen. + bool is_tab_fullscreen_for_testing_ = false; + ++#if 0 + // Tracks related popups that lost activation or were shown without activation + // during content fullscreen sessions. This also activates the popups when + // fullscreen exits, to prevent sites from creating persisent popunders. + std::unique_ptr popunder_preventer_; ++#endif + + base::ObserverList observer_list_; + From 71b411128f619fae04faa03b6816543c46d219b7 Mon Sep 17 00:00:00 2001 From: deepak1556 Date: Wed, 30 Mar 2022 00:11:59 +0900 Subject: [PATCH 14/18] chore: update patches --- .../add_didinstallconditionalfeatures.patch | 2 +- ..._scheduler_throttling_per_renderview.patch | 6 +-- .../build_add_electron_tracing_category.patch | 2 +- ..._depend_on_packed_resource_integrity.patch | 20 ++++---- patches/chromium/can_create_window.patch | 8 ++-- ...screationoverridden_with_full_params.patch | 2 +- ...esources_not_chrome_for_spellchecker.patch | 4 +- patches/chromium/dcheck.patch | 4 +- .../extend_apply_webpreferences.patch | 2 +- ...screen_rendering_with_viz_compositor.patch | 10 ++-- ...x_crash_when_saving_edited_pdf_files.patch | 6 +-- patches/chromium/frame_host_manager.patch | 6 +-- patches/chromium/picture-in-picture.patch | 6 +-- patches/chromium/printing.patch | 48 +++++++++---------- ...r_changes_to_the_webcontentsobserver.patch | 2 +- patches/chromium/web_contents.patch | 2 +- .../worker_context_will_destroy.patch | 4 +- ...feat_add_hook_to_notify_script_ready.patch | 4 +- patches/v8/build_gn.patch | 8 ++-- ...export_private_v8_symbols_on_windows.patch | 4 +- patches/v8/expose_mksnapshot.patch | 4 +- 21 files changed, 77 insertions(+), 77 deletions(-) diff --git a/patches/chromium/add_didinstallconditionalfeatures.patch b/patches/chromium/add_didinstallconditionalfeatures.patch index 238c46109cc04..b5fd394b36e15 100644 --- a/patches/chromium/add_didinstallconditionalfeatures.patch +++ b/patches/chromium/add_didinstallconditionalfeatures.patch @@ -92,7 +92,7 @@ index bca4cbb2b2ba84fe58b5cfeaf190add5803e27c9..b6c9dd3a2a1c9b6667c563d5da86ccb4 int32_t world_id) = 0; virtual bool AllowScriptExtensions() = 0; diff --git a/third_party/blink/renderer/core/frame/local_frame_client_impl.cc b/third_party/blink/renderer/core/frame/local_frame_client_impl.cc -index e06c96c068139e829af7bd99ebb111507b2bddb0..a98bc22fc5c96ad1fd2071ea1c9e1aab2fb4d5ff 100644 +index b690ada2d46146b6da38cbb2c688f249ae558464..b03774140883c5bb7de6358f3df95ab8774b9dc7 100644 --- a/third_party/blink/renderer/core/frame/local_frame_client_impl.cc +++ b/third_party/blink/renderer/core/frame/local_frame_client_impl.cc @@ -275,6 +275,13 @@ void LocalFrameClientImpl::DidCreateScriptContext( diff --git a/patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch b/patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch index dc944eefa587d..e6dcf47aac97b 100644 --- a/patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch +++ b/patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch @@ -85,10 +85,10 @@ index 560b72dfbc70172bc668229b29fe0c9da139f320..13ec73b9d627259625d64f5b97838033 // Visibility ----------------------------------------------------------- diff --git a/third_party/blink/renderer/core/exported/web_view_impl.cc b/third_party/blink/renderer/core/exported/web_view_impl.cc -index daab024ee0e2010e177eabeb7e0fb964c631dd17..06d8ca44fb1dc3748d81b5c5a407dfdf7183f845 100644 +index dc63c0ba0cc8625ed5efb961a1c7f1d07fc72f5d..13a16ae577130d7520b47eb046b504ccd6796979 100644 --- a/third_party/blink/renderer/core/exported/web_view_impl.cc +++ b/third_party/blink/renderer/core/exported/web_view_impl.cc -@@ -3666,6 +3666,13 @@ PageScheduler* WebViewImpl::Scheduler() const { +@@ -3669,6 +3669,13 @@ PageScheduler* WebViewImpl::Scheduler() const { return GetPage()->GetPageScheduler(); } @@ -102,7 +102,7 @@ index daab024ee0e2010e177eabeb7e0fb964c631dd17..06d8ca44fb1dc3748d81b5c5a407dfdf void WebViewImpl::SetVisibilityState( mojom::blink::PageVisibilityState visibility_state, bool is_initial_state) { -@@ -3677,7 +3684,8 @@ void WebViewImpl::SetVisibilityState( +@@ -3680,7 +3687,8 @@ void WebViewImpl::SetVisibilityState( } GetPage()->SetVisibilityState(visibility_state, is_initial_state); GetPage()->GetPageScheduler()->SetPageVisible( diff --git a/patches/chromium/build_add_electron_tracing_category.patch b/patches/chromium/build_add_electron_tracing_category.patch index f096f681035eb..6c074efcaf841 100644 --- a/patches/chromium/build_add_electron_tracing_category.patch +++ b/patches/chromium/build_add_electron_tracing_category.patch @@ -8,7 +8,7 @@ categories in use are known / declared. This patch is required for us to introduce a new Electron category for Electron-specific tracing. diff --git a/base/trace_event/builtin_categories.h b/base/trace_event/builtin_categories.h -index 083a46a96bf969a075ef05cfe4837c4cce784191..22f18293e65035cc3b9af322520b102eb6b24a76 100644 +index 0736e7021761e6019e1b52448d21ffdb73b964fc..571b553e9aaa98739851d0ff312eefe9f6a75596 100644 --- a/base/trace_event/builtin_categories.h +++ b/base/trace_event/builtin_categories.h @@ -80,6 +80,7 @@ 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 6edec0e4d855a..435d66c466712 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 @@ -33,10 +33,10 @@ index 1f86073736f849e797e029678bc212ce96ba0bd9..b8abc10e48bdff0f4e6c3f8e1c4927bc "//base", "//build:branding_buildflags", diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn -index bdb5477f7e69f8530b9f0c5eef0ff1a95123085e..97ac33277c332639300933cb672eeefc8857c636 100644 +index a99ce094addf69f21f3c42690defc445eff8fa05..797c8add1af6df1142179388ef1b7a5bf977d527 100644 --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -4517,7 +4517,7 @@ static_library("browser") { +@@ -4518,7 +4518,7 @@ static_library("browser") { # On Windows, the hashes are embedded in //chrome:chrome_initial rather # than here in :chrome_dll. @@ -46,10 +46,10 @@ index bdb5477f7e69f8530b9f0c5eef0ff1a95123085e..97ac33277c332639300933cb672eeefc sources += [ "certificate_viewer_stub.cc" ] } diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn -index d91d4dd2d27f25d8109b00f4e7c0239e43b2d070..57c7ae8011f99c33ab1b5dd5f1a777738063dcdc 100644 +index 4f088ea7cfbb7aaa3ed15607608dd9cafc6a2981..8df44262c079c96a1a81167a769d426aab23bef0 100644 --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn -@@ -5916,7 +5916,6 @@ test("unit_tests") { +@@ -5943,7 +5943,6 @@ test("unit_tests") { deps += [ "//chrome:other_version", @@ -57,7 +57,7 @@ index d91d4dd2d27f25d8109b00f4e7c0239e43b2d070..57c7ae8011f99c33ab1b5dd5f1a77773 "//chrome//services/util_win:unit_tests", "//chrome/app:chrome_dll_resources", "//chrome/browser:chrome_process_finder", -@@ -5939,6 +5938,10 @@ test("unit_tests") { +@@ -5966,6 +5965,10 @@ test("unit_tests") { "//ui/resources", ] @@ -68,7 +68,7 @@ index d91d4dd2d27f25d8109b00f4e7c0239e43b2d070..57c7ae8011f99c33ab1b5dd5f1a77773 ldflags = [ "/DELAYLOAD:api-ms-win-core-winrt-error-l1-1-0.dll", "/DELAYLOAD:api-ms-win-core-winrt-l1-1-0.dll", -@@ -6629,7 +6632,6 @@ test("unit_tests") { +@@ -6656,7 +6659,6 @@ test("unit_tests") { } deps += [ @@ -76,10 +76,10 @@ index d91d4dd2d27f25d8109b00f4e7c0239e43b2d070..57c7ae8011f99c33ab1b5dd5f1a77773 "//chrome/browser:cart_db_content_proto", "//chrome/browser:coupon_db_content_proto", "//chrome/browser/media/router:test_support", -@@ -6674,6 +6676,11 @@ test("unit_tests") { - "//ui/native_theme:test_support", - "//ui/webui/resources/js/browser_command:mojo_bindings", - ] +@@ -6704,6 +6706,11 @@ test("unit_tests") { + if (is_chromeos) { + deps += [ "//ui/chromeos" ] + } + + if (!is_electron_build) { + deps += [ "//chrome:packed_resources_integrity_hash" ] diff --git a/patches/chromium/can_create_window.patch b/patches/chromium/can_create_window.patch index 4f2e2ea2d71a6..5ccade1f90045 100644 --- a/patches/chromium/can_create_window.patch +++ b/patches/chromium/can_create_window.patch @@ -21,7 +21,7 @@ index be7895586d64b0f8e7f122561d86f49479400a2b..5ad53ce87d8757b18e5ecedbd7ec9aec &no_javascript_access); diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc -index 143dc4bd1561fb3b0423ecb01c09547844bfbf90..42ebfe6570acb972055b3971817ae68fd92e073b 100644 +index 88266830511440e51e47166c66f80e9956bcef5a..3fa51ecee644055db44bd4dd54c27ec224ff46d6 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc @@ -3937,6 +3937,14 @@ FrameTree* WebContentsImpl::CreateNewWindow( @@ -81,7 +81,7 @@ index fbf6817479cace0ca06065eef3aa70aae2a0ebe1..cef6a18df7cfb8528ea07e808c3e5397 bool opener_suppressed, bool* no_javascript_access) { diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h -index f5c434fd7080faf5000c5d260bf66fcb2b7b868b..5b49830578b996fb1b6ed8cbe4d66085220213d0 100644 +index a0f2f002b51c6061fe509d13b2286faaec721936..1b7e71e12d01929b8bfacf8c7c8950922bdd3d59 100644 --- a/content/public/browser/content_browser_client.h +++ b/content/public/browser/content_browser_client.h @@ -170,6 +170,7 @@ class NetworkService; @@ -220,10 +220,10 @@ index 84d32491a56528a84b4395fba1d54cdbb38d522b..09998a83c449ef8cd9f360fbcdcf7edc } // namespace blink diff --git a/third_party/blink/renderer/core/frame/local_dom_window.cc b/third_party/blink/renderer/core/frame/local_dom_window.cc -index b48d3dbf9868d12412a34a6430d4e6bf2d4b27f3..d0d1ada0300163c8be4c9fb7cc7fb2f43efcc355 100644 +index dcacde03e5889d7347aadb2cfde10da767c9f9ca..3ccb2700c97d1297b8482e1b7b324cfa4002e21e 100644 --- a/third_party/blink/renderer/core/frame/local_dom_window.cc +++ b/third_party/blink/renderer/core/frame/local_dom_window.cc -@@ -2069,6 +2069,7 @@ DOMWindow* LocalDOMWindow::open(v8::Isolate* isolate, +@@ -2068,6 +2068,7 @@ DOMWindow* LocalDOMWindow::open(v8::Isolate* isolate, WebWindowFeatures window_features = GetWindowFeaturesFromString(features, incumbent_window); diff --git a/patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch b/patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch index ea4e084796fb2..2b80fd29fa5ac 100644 --- a/patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch +++ b/patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch @@ -246,7 +246,7 @@ index c6bd5c19f8a7ceec17c9e32af5296a9617f3a619..02199b439fba7fdc617b7f7980d958b7 void AddNewContents(content::WebContents* source, std::unique_ptr new_contents, diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc -index cdbdf2b824fb2643f4182c283a01410e682913e9..70831b3506a2b2711e3a465d542eda1bfeb0a287 100644 +index cc6afdef869470136c2cec392911742a289f6339..2033877b86eddbc9baac6a603587e631021f6819 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc @@ -3885,8 +3885,7 @@ FrameTree* WebContentsImpl::CreateNewWindow( diff --git a/patches/chromium/chore_use_electron_resources_not_chrome_for_spellchecker.patch b/patches/chromium/chore_use_electron_resources_not_chrome_for_spellchecker.patch index 668513fd616f2..99d292f285fb0 100644 --- a/patches/chromium/chore_use_electron_resources_not_chrome_for_spellchecker.patch +++ b/patches/chromium/chore_use_electron_resources_not_chrome_for_spellchecker.patch @@ -7,10 +7,10 @@ spellchecker uses a few IDS_ resources. We need to load these from Electrons grit header instead of Chromes diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn -index 30281f61876cf1d9bebb0035d5a20624427380f0..bdb5477f7e69f8530b9f0c5eef0ff1a95123085e 100644 +index 72c3a67361eaecbe7349db00bbd3b7c1deaced69..a99ce094addf69f21f3c42690defc445eff8fa05 100644 --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -7134,6 +7134,7 @@ static_library("browser") { +@@ -7135,6 +7135,7 @@ static_library("browser") { deps += [ "//components/spellcheck/browser", "//components/spellcheck/common", diff --git a/patches/chromium/dcheck.patch b/patches/chromium/dcheck.patch index 0af9aeccfd053..4832704e4e759 100644 --- a/patches/chromium/dcheck.patch +++ b/patches/chromium/dcheck.patch @@ -17,10 +17,10 @@ only one or two specific checks fail. Then it's better to simply comment out the failing checks and allow the rest of the target to have them enabled. diff --git a/third_party/blink/renderer/core/mobile_metrics/mobile_friendliness_checker.cc b/third_party/blink/renderer/core/mobile_metrics/mobile_friendliness_checker.cc -index 7a6503d4a4ad33290d97078336c18d81839a8675..0f162b8e681ebb67c5f3b23a40fe3b6ec97cec49 100644 +index a4d74f8e59673d4734ef338235c027bd1c77e92e..6969d1c69ee215055bd49a2bf830416c9e8b62c8 100644 --- a/third_party/blink/renderer/core/mobile_metrics/mobile_friendliness_checker.cc +++ b/third_party/blink/renderer/core/mobile_metrics/mobile_friendliness_checker.cc -@@ -506,8 +506,7 @@ void MobileFriendlinessChecker::NotifyInvalidatePaint( +@@ -515,8 +515,7 @@ void MobileFriendlinessChecker::NotifyInvalidatePaint( ->GetPageScaleConstraintsSet() .FinalConstraints() .initial_scale; diff --git a/patches/chromium/extend_apply_webpreferences.patch b/patches/chromium/extend_apply_webpreferences.patch index 1a14cd39962aa..854e5de029ce8 100644 --- a/patches/chromium/extend_apply_webpreferences.patch +++ b/patches/chromium/extend_apply_webpreferences.patch @@ -12,7 +12,7 @@ Ideally we could add an embedder observer pattern here but that can be done in future work. diff --git a/third_party/blink/renderer/core/exported/web_view_impl.cc b/third_party/blink/renderer/core/exported/web_view_impl.cc -index 06d8ca44fb1dc3748d81b5c5a407dfdf7183f845..85e1772fbcbb190e32dd30996541cc2e9d19d057 100644 +index 13a16ae577130d7520b47eb046b504ccd6796979..6987c81cd9f6b774ec15605c0ea64ca34ba84d22 100644 --- a/third_party/blink/renderer/core/exported/web_view_impl.cc +++ b/third_party/blink/renderer/core/exported/web_view_impl.cc @@ -159,6 +159,7 @@ diff --git a/patches/chromium/feat_enable_offscreen_rendering_with_viz_compositor.patch b/patches/chromium/feat_enable_offscreen_rendering_with_viz_compositor.patch index f8f64ec23fbe9..4c6b697e3b604 100644 --- a/patches/chromium/feat_enable_offscreen_rendering_with_viz_compositor.patch +++ b/patches/chromium/feat_enable_offscreen_rendering_with_viz_compositor.patch @@ -573,10 +573,10 @@ index 6b7fbb6cf13dc8ee6ade0878a9a2c1efc5d4d3f1..e2af75168cb914a7b3b4a6c9b6a28549 + Draw(gfx.mojom.Rect damage_rect) => (); }; diff --git a/ui/compositor/compositor.h b/ui/compositor/compositor.h -index b30b9460889b9bb3862f4e28b5f1292a118f2a09..d8f1f921d3e6e74c99d6a22c902f81dfc5bb646e 100644 +index 2696c864d5e32e4b87834ced1035a7b1742639b4..ff663b4e75399898daaa3e77339deec03b43a28a 100644 --- a/ui/compositor/compositor.h +++ b/ui/compositor/compositor.h -@@ -81,6 +81,7 @@ class DisplayPrivate; +@@ -82,6 +82,7 @@ class DisplayPrivate; class ExternalBeginFrameController; } // namespace mojom class ContextProvider; @@ -584,7 +584,7 @@ index b30b9460889b9bb3862f4e28b5f1292a118f2a09..d8f1f921d3e6e74c99d6a22c902f81df class HostFrameSinkManager; class LocalSurfaceId; class RasterContextProvider; -@@ -137,6 +138,16 @@ class COMPOSITOR_EXPORT ContextFactory { +@@ -138,6 +139,16 @@ class COMPOSITOR_EXPORT ContextFactory { virtual viz::HostFrameSinkManager* GetHostFrameSinkManager() = 0; }; @@ -601,7 +601,7 @@ index b30b9460889b9bb3862f4e28b5f1292a118f2a09..d8f1f921d3e6e74c99d6a22c902f81df // Compositor object to take care of GPU painting. // A Browser compositor object is responsible for generating the final // displayable form of pixels comprising a single widget's contents. It draws an -@@ -178,6 +189,9 @@ class COMPOSITOR_EXPORT Compositor : public base::PowerSuspendObserver, +@@ -179,6 +190,9 @@ class COMPOSITOR_EXPORT Compositor : public base::PowerSuspendObserver, // Schedules a redraw of the layer tree associated with this compositor. void ScheduleDraw(); @@ -611,7 +611,7 @@ index b30b9460889b9bb3862f4e28b5f1292a118f2a09..d8f1f921d3e6e74c99d6a22c902f81df // Sets the root of the layer tree drawn by this Compositor. The root layer // must have no parent. The compositor's root layer is reset if the root layer // is destroyed. NULL can be passed to reset the root layer, in which case the -@@ -466,6 +480,8 @@ class COMPOSITOR_EXPORT Compositor : public base::PowerSuspendObserver, +@@ -469,6 +483,8 @@ class COMPOSITOR_EXPORT Compositor : public base::PowerSuspendObserver, std::unique_ptr pending_begin_frame_args_; diff --git a/patches/chromium/fix_crash_when_saving_edited_pdf_files.patch b/patches/chromium/fix_crash_when_saving_edited_pdf_files.patch index a17c7119f3e7b..832bba5787c3e 100644 --- a/patches/chromium/fix_crash_when_saving_edited_pdf_files.patch +++ b/patches/chromium/fix_crash_when_saving_edited_pdf_files.patch @@ -13,10 +13,10 @@ This patch can be removed should we choose to support chrome.fileSystem or support it enough to fix the crash. diff --git a/chrome/browser/resources/pdf/pdf_viewer.ts b/chrome/browser/resources/pdf/pdf_viewer.ts -index 2e370bf7fd61d75677cfc84798ba543a48f3bc19..fc8f471745c8daf30679df1ffb994febe62cfbea 100644 +index 22f7a86817fe4a2dc39913db349e81d93eef4874..c9509d84e25fd88d6ef13933099d582561fe5660 100644 --- a/chrome/browser/resources/pdf/pdf_viewer.ts +++ b/chrome/browser/resources/pdf/pdf_viewer.ts -@@ -855,26 +855,12 @@ export class PDFViewerElement extends PDFViewerBaseElement { +@@ -858,26 +858,12 @@ export class PDFViewerElement extends PDFViewerBaseElement { dataArray = [result.dataToSave]; } @@ -48,7 +48,7 @@ index 2e370bf7fd61d75677cfc84798ba543a48f3bc19..fc8f471745c8daf30679df1ffb994feb } /** -@@ -982,30 +968,12 @@ export class PDFViewerElement extends PDFViewerBaseElement { +@@ -985,30 +971,12 @@ export class PDFViewerElement extends PDFViewerBaseElement { fileName = fileName + '.pdf'; } diff --git a/patches/chromium/frame_host_manager.patch b/patches/chromium/frame_host_manager.patch index 4659ba259f98b..9ed4dada269e3 100644 --- a/patches/chromium/frame_host_manager.patch +++ b/patches/chromium/frame_host_manager.patch @@ -6,10 +6,10 @@ Subject: frame_host_manager.patch Allows embedder to intercept site instances created by chromium. diff --git a/content/browser/renderer_host/render_frame_host_manager.cc b/content/browser/renderer_host/render_frame_host_manager.cc -index 6ecce70efe2d63259f8de512de276a49da1ee9c0..3068a27d60c109156d91dee68715d00aaf5f972d 100644 +index 9208dc75b4e3d969fbb0bb13de64d2b129de9509..b5779d43456c5e356497f2cb671fcb9b3492b47f 100644 --- a/content/browser/renderer_host/render_frame_host_manager.cc +++ b/content/browser/renderer_host/render_frame_host_manager.cc -@@ -3167,6 +3167,9 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest( +@@ -3170,6 +3170,9 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest( request->ResetStateForSiteInstanceChange(); } @@ -20,7 +20,7 @@ index 6ecce70efe2d63259f8de512de276a49da1ee9c0..3068a27d60c109156d91dee68715d00a } diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h -index 5b49830578b996fb1b6ed8cbe4d66085220213d0..764e9d279b476b9999857147f954a7a1193e8604 100644 +index 1b7e71e12d01929b8bfacf8c7c8950922bdd3d59..ca5a03653611843a8eac90e1be86ca4aa40ecce2 100644 --- a/content/public/browser/content_browser_client.h +++ b/content/public/browser/content_browser_client.h @@ -277,6 +277,11 @@ class CONTENT_EXPORT ContentBrowserClient { diff --git a/patches/chromium/picture-in-picture.patch b/patches/chromium/picture-in-picture.patch index f0cbb1c9966b8..f5b2e1333c446 100644 --- a/patches/chromium/picture-in-picture.patch +++ b/patches/chromium/picture-in-picture.patch @@ -22,7 +22,7 @@ index 7bc8d118f87b91baf1c3bd1d34374996ab1d3638..2d2c1c86f311b07f0c2b09d5a4c082cc #include "ui/base/metadata/metadata_impl_macros.h" #include "ui/base/models/image_model.h" diff --git a/chrome/browser/ui/views/overlay/back_to_tab_label_button.cc b/chrome/browser/ui/views/overlay/back_to_tab_label_button.cc -index 7d0e39968bf34cdc99549cb48f6bf0a11c182565..f21c1672abf34dc9d19cd39c5d09083a60ef6978 100644 +index d566dbf99ea1164c6a8407026a9839218a6ba1fb..239cd53d70c547c79214988a82efdc8c472d553c 100644 --- a/chrome/browser/ui/views/overlay/back_to_tab_label_button.cc +++ b/chrome/browser/ui/views/overlay/back_to_tab_label_button.cc @@ -5,7 +5,7 @@ @@ -150,10 +150,10 @@ index 3309906bcae27ba89d73ce4fba49843a10cd31f6..9f828f70606238186b35b5e1ca875113 web_view->SetWebContents(pip_contents); diff --git a/chrome/browser/ui/views/overlay/document_overlay_window_views.h b/chrome/browser/ui/views/overlay/document_overlay_window_views.h -index 86d385842501d28b5eb42f841822294eb597e6ed..43c19dfa6ec6b48f8694636cc184dd616e5d6aca 100644 +index b2b178ccadce82f8d4ec8e5a6dafe1c67bcecd74..603d82a461c4c443ac26c85a46fbd866a42237e6 100644 --- a/chrome/browser/ui/views/overlay/document_overlay_window_views.h +++ b/chrome/browser/ui/views/overlay/document_overlay_window_views.h -@@ -55,7 +55,6 @@ class DocumentOverlayWindowViews : public OverlayWindowViews, +@@ -56,7 +56,6 @@ class DocumentOverlayWindowViews : public OverlayWindowViews, bool IsVisible() const override; void OnNativeWidgetMove() override; void OnNativeWidgetDestroyed() override; diff --git a/patches/chromium/printing.patch b/patches/chromium/printing.patch index 860fc3d7f8623..5b18830b6f0ed 100644 --- a/patches/chromium/printing.patch +++ b/patches/chromium/printing.patch @@ -127,7 +127,7 @@ index 56232bf979e90a01bb580c0a1972ae0860d994e9..96e05b5cd4b556a6ddb41664b5ff999b void PrintJobWorkerOop::UnregisterServiceManagerClient() { diff --git a/chrome/browser/printing/print_view_manager_base.cc b/chrome/browser/printing/print_view_manager_base.cc -index 818eee61fd42cdfda868beb974786c3bf4e21961..97d43d0d8a8bd53b66292cc728f271c7e6630064 100644 +index 2eb81c133b94fd237e4eaa60472c08515fd6d01e..abd7e5e5832919cbd06b3b337f54d79d284a4247 100644 --- a/chrome/browser/printing/print_view_manager_base.cc +++ b/chrome/browser/printing/print_view_manager_base.cc @@ -30,10 +30,10 @@ @@ -198,7 +198,7 @@ index 818eee61fd42cdfda868beb974786c3bf4e21961..97d43d0d8a8bd53b66292cc728f271c7 if (has_dpi && has_valid_cookie) { queue->QueuePrinterQuery(std::move(printer_query)); -@@ -294,12 +302,14 @@ PrintViewManagerBase::PrintViewManagerBase(content::WebContents* web_contents) +@@ -295,12 +303,14 @@ PrintViewManagerBase::PrintViewManagerBase(content::WebContents* web_contents) : PrintManager(web_contents), queue_(g_browser_process->print_job_manager()->queue()) { DCHECK(queue_); @@ -213,7 +213,7 @@ index 818eee61fd42cdfda868beb974786c3bf4e21961..97d43d0d8a8bd53b66292cc728f271c7 } PrintViewManagerBase::~PrintViewManagerBase() { -@@ -307,7 +317,10 @@ PrintViewManagerBase::~PrintViewManagerBase() { +@@ -308,7 +318,10 @@ PrintViewManagerBase::~PrintViewManagerBase() { DisconnectFromCurrentPrintJob(); } @@ -225,7 +225,7 @@ index 818eee61fd42cdfda868beb974786c3bf4e21961..97d43d0d8a8bd53b66292cc728f271c7 // Remember the ID for `rfh`, to enable checking that the `RenderFrameHost` // is still valid after a possible inner message loop runs in // `DisconnectFromCurrentPrintJob()`. -@@ -333,7 +346,9 @@ bool PrintViewManagerBase::PrintNow(content::RenderFrameHost* rfh) { +@@ -334,7 +347,9 @@ bool PrintViewManagerBase::PrintNow(content::RenderFrameHost* rfh) { #endif SetPrintingRFH(rfh); @@ -236,7 +236,7 @@ index 818eee61fd42cdfda868beb974786c3bf4e21961..97d43d0d8a8bd53b66292cc728f271c7 for (auto& observer : GetObservers()) observer.OnPrintNow(rfh); -@@ -486,7 +501,8 @@ void PrintViewManagerBase::GetDefaultPrintSettingsReply( +@@ -487,7 +502,8 @@ void PrintViewManagerBase::GetDefaultPrintSettingsReply( void PrintViewManagerBase::ScriptedPrintReply( ScriptedPrintCallback callback, int process_id, @@ -246,7 +246,7 @@ index 818eee61fd42cdfda868beb974786c3bf4e21961..97d43d0d8a8bd53b66292cc728f271c7 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); #if BUILDFLAG(ENABLE_OOP_PRINTING) -@@ -499,16 +515,19 @@ void PrintViewManagerBase::ScriptedPrintReply( +@@ -500,16 +516,19 @@ void PrintViewManagerBase::ScriptedPrintReply( return; } @@ -270,7 +270,7 @@ index 818eee61fd42cdfda868beb974786c3bf4e21961..97d43d0d8a8bd53b66292cc728f271c7 } void PrintViewManagerBase::NavigationStopped() { -@@ -624,11 +643,14 @@ void PrintViewManagerBase::DidPrintDocument( +@@ -625,11 +644,14 @@ void PrintViewManagerBase::DidPrintDocument( void PrintViewManagerBase::GetDefaultPrintSettings( GetDefaultPrintSettingsCallback callback) { DCHECK_CURRENTLY_ON(content::BrowserThread::UI); @@ -285,7 +285,7 @@ index 818eee61fd42cdfda868beb974786c3bf4e21961..97d43d0d8a8bd53b66292cc728f271c7 #if BUILDFLAG(ENABLE_OOP_PRINTING) if (printing::features::kEnableOopPrintDriversJobPrint.Get() && !service_manager_client_id_.has_value()) { -@@ -655,18 +677,20 @@ void PrintViewManagerBase::UpdatePrintSettings( +@@ -656,18 +678,20 @@ void PrintViewManagerBase::UpdatePrintSettings( base::Value job_settings, UpdatePrintSettingsCallback callback) { DCHECK_CURRENTLY_ON(content::BrowserThread::UI); @@ -307,7 +307,7 @@ index 818eee61fd42cdfda868beb974786c3bf4e21961..97d43d0d8a8bd53b66292cc728f271c7 content::BrowserContext* context = web_contents() ? web_contents()->GetBrowserContext() : nullptr; PrefService* prefs = -@@ -676,6 +700,7 @@ void PrintViewManagerBase::UpdatePrintSettings( +@@ -677,6 +701,7 @@ void PrintViewManagerBase::UpdatePrintSettings( if (value > 0) job_settings.SetIntKey(kSettingRasterizePdfDpi, value); } @@ -315,7 +315,7 @@ index 818eee61fd42cdfda868beb974786c3bf4e21961..97d43d0d8a8bd53b66292cc728f271c7 auto callback_wrapper = base::BindOnce(&PrintViewManagerBase::UpdatePrintSettingsReply, -@@ -701,14 +726,14 @@ void PrintViewManagerBase::ScriptedPrint(mojom::ScriptedPrintParamsPtr params, +@@ -702,14 +727,14 @@ void PrintViewManagerBase::ScriptedPrint(mojom::ScriptedPrintParamsPtr params, // didn't happen for some reason. bad_message::ReceivedBadMessage( render_process_host, bad_message::PVMB_SCRIPTED_PRINT_FENCED_FRAME); @@ -332,7 +332,7 @@ index 818eee61fd42cdfda868beb974786c3bf4e21961..97d43d0d8a8bd53b66292cc728f271c7 return; } #endif -@@ -730,7 +755,6 @@ void PrintViewManagerBase::PrintingFailed(int32_t cookie) { +@@ -732,7 +757,6 @@ void PrintViewManagerBase::PrintingFailed(int32_t cookie) { PrintManager::PrintingFailed(cookie); #if !BUILDFLAG(IS_ANDROID) // Android does not implement this function. @@ -340,7 +340,7 @@ index 818eee61fd42cdfda868beb974786c3bf4e21961..97d43d0d8a8bd53b66292cc728f271c7 #endif ReleasePrinterQuery(); -@@ -745,6 +769,11 @@ void PrintViewManagerBase::RemoveObserver(Observer& observer) { +@@ -747,6 +771,11 @@ void PrintViewManagerBase::RemoveObserver(Observer& observer) { } void PrintViewManagerBase::ShowInvalidPrinterSettingsError() { @@ -352,7 +352,7 @@ index 818eee61fd42cdfda868beb974786c3bf4e21961..97d43d0d8a8bd53b66292cc728f271c7 base::ThreadTaskRunnerHandle::Get()->PostTask( FROM_HERE, base::BindOnce(&ShowWarningMessageBox, l10n_util::GetStringUTF16( -@@ -755,10 +784,12 @@ void PrintViewManagerBase::RenderFrameHostStateChanged( +@@ -757,10 +786,12 @@ void PrintViewManagerBase::RenderFrameHostStateChanged( content::RenderFrameHost* render_frame_host, content::RenderFrameHost::LifecycleState /*old_state*/, content::RenderFrameHost::LifecycleState new_state) { @@ -365,7 +365,7 @@ index 818eee61fd42cdfda868beb974786c3bf4e21961..97d43d0d8a8bd53b66292cc728f271c7 } void PrintViewManagerBase::DidStartLoading() { -@@ -818,6 +849,11 @@ void PrintViewManagerBase::OnJobDone() { +@@ -820,6 +851,11 @@ void PrintViewManagerBase::OnJobDone() { ReleasePrintJob(); } @@ -377,7 +377,7 @@ index 818eee61fd42cdfda868beb974786c3bf4e21961..97d43d0d8a8bd53b66292cc728f271c7 void PrintViewManagerBase::OnFailed() { TerminatePrintJob(true); } -@@ -879,7 +915,10 @@ bool PrintViewManagerBase::CreateNewPrintJob( +@@ -881,7 +917,10 @@ bool PrintViewManagerBase::CreateNewPrintJob( // Disconnect the current |print_job_|. auto weak_this = weak_ptr_factory_.GetWeakPtr(); @@ -389,7 +389,7 @@ index 818eee61fd42cdfda868beb974786c3bf4e21961..97d43d0d8a8bd53b66292cc728f271c7 if (!weak_this) return false; -@@ -961,6 +1000,13 @@ void PrintViewManagerBase::ReleasePrintJob() { +@@ -963,6 +1002,13 @@ void PrintViewManagerBase::ReleasePrintJob() { UnregisterSystemPrintClient(); #endif @@ -403,7 +403,7 @@ index 818eee61fd42cdfda868beb974786c3bf4e21961..97d43d0d8a8bd53b66292cc728f271c7 if (!print_job_) return; -@@ -1010,7 +1056,7 @@ bool PrintViewManagerBase::RunInnerMessageLoop() { +@@ -1012,7 +1058,7 @@ bool PrintViewManagerBase::RunInnerMessageLoop() { } bool PrintViewManagerBase::OpportunisticallyCreatePrintJob(int cookie) { @@ -547,10 +547,10 @@ index 66810a2a5f0c77ba107c71d2abaef8692bda0fea..cd6103af4571f82f11652a3c7ecf0e53 void PdfPrintManager::ShowInvalidPrinterSettingsError() { diff --git a/components/printing/common/print.mojom b/components/printing/common/print.mojom -index 7a79f3b0b1b810139503ade9ff83a78f204374a3..c9ca0914d4155842ff568101640e5a9251874a8a 100644 +index 6cd585d597315940be144506b9bb819137a7981e..8ea9c38a46460edd237f003ddd7362240a02887e 100644 --- a/components/printing/common/print.mojom +++ b/components/printing/common/print.mojom -@@ -276,7 +276,7 @@ interface PrintPreviewUI { +@@ -275,7 +275,7 @@ interface PrintPreviewUI { interface PrintRenderFrame { // Tells the RenderFrame to switch the CSS to print media type, render every // requested page, and then switch back the CSS to display media type. @@ -559,7 +559,7 @@ index 7a79f3b0b1b810139503ade9ff83a78f204374a3..c9ca0914d4155842ff568101640e5a92 // Tells the RenderFrame to switch the CSS to print media type, render every // requested page using the print preview document's frame/node, and then -@@ -343,7 +343,7 @@ interface PrintManagerHost { +@@ -342,7 +342,7 @@ interface PrintManagerHost { // Request the print settings from the user. This step is about showing // UI to the user to select the final print settings. [Sync] @@ -569,7 +569,7 @@ index 7a79f3b0b1b810139503ade9ff83a78f204374a3..c9ca0914d4155842ff568101640e5a92 // Tells the browser that there are invalid printer settings. ShowInvalidPrinterSettingsError(); diff --git a/components/printing/renderer/print_render_frame_helper.cc b/components/printing/renderer/print_render_frame_helper.cc -index eb2ccdf293bfb850777216304a3f951680f3875d..0c33c4f04dfbf457c74439e8adf463eb3bc6e4c7 100644 +index 419a2daf45c123df7cd4e38614598278cb775cba..9b3fcc2e7cfbd70587845bbd056957255b74f0a2 100644 --- a/components/printing/renderer/print_render_frame_helper.cc +++ b/components/printing/renderer/print_render_frame_helper.cc @@ -40,6 +40,7 @@ @@ -732,13 +732,13 @@ index eb2ccdf293bfb850777216304a3f951680f3875d..0c33c4f04dfbf457c74439e8adf463eb + uint32_t* number_of_pages, + const base::DictionaryValue& settings) { DCHECK(frame); - bool fit_to_paper_size = !IsPrintingNodeOrPdfFrame(frame, node); + bool fit_to_paper_size = !IsPrintingPdfFrame(frame, node); - if (!InitPrintSettings(fit_to_paper_size)) { + if (!InitPrintSettings(fit_to_paper_size, settings)) { notify_browser_of_print_failure_ = false; GetPrintManagerHost()->ShowInvalidPrinterSettingsError(); return false; -@@ -2406,7 +2436,7 @@ mojom::PrintPagesParamsPtr PrintRenderFrameHelper::GetPrintSettingsFromUser( +@@ -2405,7 +2435,7 @@ mojom::PrintPagesParamsPtr PrintRenderFrameHelper::GetPrintSettingsFromUser( std::move(params), base::BindOnce( [](base::OnceClosure quit_closure, mojom::PrintPagesParamsPtr* output, @@ -747,7 +747,7 @@ index eb2ccdf293bfb850777216304a3f951680f3875d..0c33c4f04dfbf457c74439e8adf463eb *output = std::move(input); std::move(quit_closure).Run(); }, -@@ -2657,18 +2687,7 @@ void PrintRenderFrameHelper::RequestPrintPreview(PrintPreviewRequestType type, +@@ -2656,18 +2686,7 @@ void PrintRenderFrameHelper::RequestPrintPreview(PrintPreviewRequestType type, } bool PrintRenderFrameHelper::CheckForCancel() { diff --git a/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch b/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch index 4448f96777587..e0d3249452e81 100644 --- a/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch +++ b/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch @@ -43,7 +43,7 @@ index ed56e947fa137cbaddaa12503ae983d7acd4463f..e1d77416991bac0178935b1bd255947d void RenderWidgetHostImpl::ShowContextMenuAtPoint( diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc -index 42ebfe6570acb972055b3971817ae68fd92e073b..cdbdf2b824fb2643f4182c283a01410e682913e9 100644 +index 3fa51ecee644055db44bd4dd54c27ec224ff46d6..cc6afdef869470136c2cec392911742a289f6339 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc @@ -4500,6 +4500,11 @@ TextInputManager* WebContentsImpl::GetTextInputManager() { diff --git a/patches/chromium/web_contents.patch b/patches/chromium/web_contents.patch index c78d2515a5904..44905e57c8ee5 100644 --- a/patches/chromium/web_contents.patch +++ b/patches/chromium/web_contents.patch @@ -9,7 +9,7 @@ is needed for OSR. Originally landed in https://github.com/electron/libchromiumcontent/pull/226. diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc -index 70831b3506a2b2711e3a465d542eda1bfeb0a287..5bc2c7e6567d798cf54a2b3497cfc6e7ed2a5ca6 100644 +index 2033877b86eddbc9baac6a603587e631021f6819..7f4679943fa1d7b2585552a811098d97cada3070 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc @@ -3051,6 +3051,13 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params, diff --git a/patches/chromium/worker_context_will_destroy.patch b/patches/chromium/worker_context_will_destroy.patch index 9f544d32fe5d5..420a464c14cc5 100644 --- a/patches/chromium/worker_context_will_destroy.patch +++ b/patches/chromium/worker_context_will_destroy.patch @@ -55,10 +55,10 @@ index 8cbfe0a939e97de8dd8d4b5e4d741fb46e94fd45..2bc2ef61890a4c189613ae8a3f61c746 const blink::WebSecurityOrigin& script_origin) override; blink::ProtocolHandlerSecurityLevel GetProtocolHandlerSecurityLevel() diff --git a/third_party/blink/public/platform/platform.h b/third_party/blink/public/platform/platform.h -index 8cc6400fcaa563e7f4d3f74734724d5aec12fb4d..49ca4f23c84a1d6a8df5b011f9c530053bdd693d 100644 +index b68c90f1f1dd23b8b938936a092b01ffa41f0f28..60aa2e562901d9ff7b915c105acaf49851c959ba 100644 --- a/third_party/blink/public/platform/platform.h +++ b/third_party/blink/public/platform/platform.h -@@ -716,6 +716,7 @@ class BLINK_PLATFORM_EXPORT Platform { +@@ -714,6 +714,7 @@ class BLINK_PLATFORM_EXPORT Platform { virtual void DidStartWorkerThread() {} virtual void WillStopWorkerThread() {} virtual void WorkerContextCreated(const v8::Local& worker) {} diff --git a/patches/chromium/worker_feat_add_hook_to_notify_script_ready.patch b/patches/chromium/worker_feat_add_hook_to_notify_script_ready.patch index dcaebb1c75010..be38035e76cb7 100644 --- a/patches/chromium/worker_feat_add_hook_to_notify_script_ready.patch +++ b/patches/chromium/worker_feat_add_hook_to_notify_script_ready.patch @@ -65,10 +65,10 @@ index 2bc2ef61890a4c189613ae8a3f61c746ffc5d310..36661d62ec1e6f7966b0789326fcbefa bool AllowScriptExtensionForServiceWorker( const blink::WebSecurityOrigin& script_origin) override; diff --git a/third_party/blink/public/platform/platform.h b/third_party/blink/public/platform/platform.h -index 49ca4f23c84a1d6a8df5b011f9c530053bdd693d..770b1295f2fa18a16ee86623206d88ec6a69ae3a 100644 +index 60aa2e562901d9ff7b915c105acaf49851c959ba..bec02889875ef8f6e422d99c8a161898b36610c5 100644 --- a/third_party/blink/public/platform/platform.h +++ b/third_party/blink/public/platform/platform.h -@@ -716,6 +716,8 @@ class BLINK_PLATFORM_EXPORT Platform { +@@ -714,6 +714,8 @@ class BLINK_PLATFORM_EXPORT Platform { virtual void DidStartWorkerThread() {} virtual void WillStopWorkerThread() {} virtual void WorkerContextCreated(const v8::Local& worker) {} diff --git a/patches/v8/build_gn.patch b/patches/v8/build_gn.patch index c2913a2287457..3a023b20e5aff 100644 --- a/patches/v8/build_gn.patch +++ b/patches/v8/build_gn.patch @@ -9,10 +9,10 @@ necessary for native modules to load. Also, some fixes relating to mksnapshot on ARM. diff --git a/BUILD.gn b/BUILD.gn -index 5417fe5ed9a87ebecc0c43ac0355707df96f039a..8227d25aad08b1f9e93980129449414662009bfb 100644 +index e4ea82d914cf99a9368c94da2cc35bd3214d8c23..c4de87b38433bed1a14ce5c3a482023de909ec47 100644 --- a/BUILD.gn +++ b/BUILD.gn -@@ -606,7 +606,7 @@ config("internal_config") { +@@ -605,7 +605,7 @@ config("internal_config") { ":cppgc_header_features", ] @@ -21,7 +21,7 @@ index 5417fe5ed9a87ebecc0c43ac0355707df96f039a..8227d25aad08b1f9e939801294494146 defines += [ "BUILDING_V8_SHARED" ] } -@@ -5823,7 +5823,7 @@ if (current_toolchain == v8_generator_toolchain) { +@@ -5821,7 +5821,7 @@ if (current_toolchain == v8_generator_toolchain) { "src/interpreter/bytecodes.h", ] @@ -30,7 +30,7 @@ index 5417fe5ed9a87ebecc0c43ac0355707df96f039a..8227d25aad08b1f9e939801294494146 deps = [ ":v8_libbase", -@@ -5861,6 +5861,8 @@ if (current_toolchain == v8_snapshot_toolchain) { +@@ -5859,6 +5859,8 @@ if (current_toolchain == v8_snapshot_toolchain) { configs = [ ":internal_config" ] 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 7200648644d4b..e54954fdfc3a9 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,10 +12,10 @@ 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 d1d5eb7bbfc8562628aef5e22307ced78839d9b5..b18a322ac746273ebb8c761ac55b9248f0f360bc 100644 +index d465e67c094b01ee128b9cecfb5ee999f4a1d8d1..f30fec3bc5c1901f96ff168da422aad1fa7ecd08 100644 --- a/BUILD.gn +++ b/BUILD.gn -@@ -606,6 +606,10 @@ config("internal_config") { +@@ -605,6 +605,10 @@ config("internal_config") { ":cppgc_header_features", ] diff --git a/patches/v8/expose_mksnapshot.patch b/patches/v8/expose_mksnapshot.patch index 3e56beab4890f..2a9d03c693efa 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 8227d25aad08b1f9e93980129449414662009bfb..d1d5eb7bbfc8562628aef5e22307ced78839d9b5 100644 +index c4de87b38433bed1a14ce5c3a482023de909ec47..d465e67c094b01ee128b9cecfb5ee999f4a1d8d1 100644 --- a/BUILD.gn +++ b/BUILD.gn -@@ -5835,7 +5835,6 @@ if (current_toolchain == v8_generator_toolchain) { +@@ -5833,7 +5833,6 @@ if (current_toolchain == v8_generator_toolchain) { if (current_toolchain == v8_snapshot_toolchain) { v8_executable("mksnapshot") { From 00465d5d62e06e15f84ec42218dbc2c8cbcca691 Mon Sep 17 00:00:00 2001 From: deepak1556 Date: Wed, 30 Mar 2022 00:13:35 +0900 Subject: [PATCH 15/18] Add FirstPartySetsHandler as a interface class in content API. https://chromium-review.googlesource.com/c/chromium/src/+/3503410 --- shell/browser/net/system_network_context_manager.cc | 4 ---- 1 file changed, 4 deletions(-) diff --git a/shell/browser/net/system_network_context_manager.cc b/shell/browser/net/system_network_context_manager.cc index de3989ad88678..d1f474d59ead7 100644 --- a/shell/browser/net/system_network_context_manager.cc +++ b/shell/browser/net/system_network_context_manager.cc @@ -288,10 +288,6 @@ void SystemNetworkContextManager::OnNetworkServiceCreated( base::FeatureList::IsEnabled(features::kAsyncDns), default_secure_dns_mode, doh_config, additional_dns_query_types_enabled); - // Initializes first party sets component - // CL: https://chromium-review.googlesource.com/c/chromium/src/+/3449280 - content::GetNetworkService()->SetFirstPartySets(base::File()); - std::string app_name = electron::Browser::Get()->GetName(); #if BUILDFLAG(IS_MAC) KeychainPassword::GetServiceName() = app_name + " Safe Storage"; From aed75ed2e99052d6cb85f2255629892e985190f3 Mon Sep 17 00:00:00 2001 From: deepak1556 Date: Wed, 30 Mar 2022 00:13:53 +0900 Subject: [PATCH 16/18] Create a new MediaStreamRequestType for GetOpenDevice https://chromium-review.googlesource.com/c/chromium/src/+/3541939 --- shell/browser/media/media_stream_devices_controller.cc | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/shell/browser/media/media_stream_devices_controller.cc b/shell/browser/media/media_stream_devices_controller.cc index 771e4ba43ee7c..38a4e03153b80 100644 --- a/shell/browser/media/media_stream_devices_controller.cc +++ b/shell/browser/media/media_stream_devices_controller.cc @@ -152,6 +152,13 @@ void MediaStreamDevicesController::Accept() { NOTREACHED(); break; } + case blink::MEDIA_GET_OPEN_DEVICE: { + // Transferred tracks, that use blink::MEDIA_GET_OPEN_DEVICE type, do + // not need to get permissions for MediaStreamDevice as those are + // controlled by the original context. + NOTREACHED(); + break; + } } } From b0f4dafd970f50d2dffccfa2797dfa521e164187 Mon Sep 17 00:00:00 2001 From: deepak1556 Date: Wed, 30 Mar 2022 00:12:29 +0900 Subject: [PATCH 17/18] Support site isolation for tags in WebViewRendererState. https://chromium-review.googlesource.com/c/chromium/src/+/3537735 --- shell/browser/api/electron_api_web_request.cc | 4 ++-- shell/browser/electron_browser_client.cc | 6 ++---- shell/browser/net/proxying_url_loader_factory.cc | 11 +++-------- shell/browser/net/proxying_url_loader_factory.h | 4 ---- shell/browser/net/proxying_websocket.cc | 1 - 5 files changed, 7 insertions(+), 19 deletions(-) diff --git a/shell/browser/api/electron_api_web_request.cc b/shell/browser/api/electron_api_web_request.cc index b8b5e05a96a6c..fb1b8ebcdafa8 100644 --- a/shell/browser/api/electron_api_web_request.cc +++ b/shell/browser/api/electron_api_web_request.cc @@ -164,8 +164,8 @@ void ToDictionary(gin_helper::Dictionary* details, HttpResponseHeadersToV8(info->response_headers.get())); } - auto* render_frame_host = - content::RenderFrameHost::FromID(info->render_process_id, info->frame_id); + auto* render_frame_host = content::RenderFrameHost::FromID( + info->render_process_id, info->frame_routing_id); if (render_frame_host) { details->SetGetter("frame", render_frame_host); auto* web_contents = diff --git a/shell/browser/electron_browser_client.cc b/shell/browser/electron_browser_client.cc index a11af4a0182e3..143b7e5ed0457 100644 --- a/shell/browser/electron_browser_client.cc +++ b/shell/browser/electron_browser_client.cc @@ -1478,10 +1478,8 @@ bool ElectronBrowserClient::WillCreateURLLoaderFactory( new ProxyingURLLoaderFactory( web_request.get(), protocol_registry->intercept_handlers(), render_process_id, - frame_host ? frame_host->GetRoutingID() : MSG_ROUTING_NONE, - frame_host ? frame_host->GetRenderViewHost()->GetRoutingID() - : MSG_ROUTING_NONE, - &next_id_, std::move(navigation_ui_data), std::move(navigation_id), + frame_host ? frame_host->GetRoutingID() : MSG_ROUTING_NONE, &next_id_, + std::move(navigation_ui_data), std::move(navigation_id), std::move(proxied_receiver), std::move(target_factory_remote), std::move(header_client_receiver), type); diff --git a/shell/browser/net/proxying_url_loader_factory.cc b/shell/browser/net/proxying_url_loader_factory.cc index d079c7b286ff9..3cb8a384fdad4 100644 --- a/shell/browser/net/proxying_url_loader_factory.cc +++ b/shell/browser/net/proxying_url_loader_factory.cc @@ -38,7 +38,6 @@ ProxyingURLLoaderFactory::InProgressRequest::FollowRedirectParams:: ProxyingURLLoaderFactory::InProgressRequest::InProgressRequest( ProxyingURLLoaderFactory* factory, uint64_t web_request_id, - int32_t view_routing_id, int32_t frame_routing_id, int32_t network_service_request_id, uint32_t options, @@ -51,7 +50,6 @@ ProxyingURLLoaderFactory::InProgressRequest::InProgressRequest( original_initiator_(request.request_initiator), request_id_(web_request_id), network_service_request_id_(network_service_request_id), - view_routing_id_(view_routing_id), frame_routing_id_(frame_routing_id), options_(options), traffic_annotation_(traffic_annotation), @@ -120,7 +118,7 @@ void ProxyingURLLoaderFactory::InProgressRequest::UpdateRequestInfo() { request_id_, factory_->render_process_id_, frame_routing_id_, factory_->navigation_ui_data_ ? factory_->navigation_ui_data_->DeepCopy() : nullptr, - view_routing_id_, request_for_info, false, + request_for_info, false, !(options_ & network::mojom::kURLLoadOptionSynchronous), factory_->IsForServiceWorkerScript(), factory_->navigation_id_, ukm::kInvalidSourceIdObj)); @@ -757,7 +755,6 @@ ProxyingURLLoaderFactory::ProxyingURLLoaderFactory( const HandlersMap& intercepted_handlers, int render_process_id, int frame_routing_id, - int view_routing_id, uint64_t* request_id_generator, std::unique_ptr navigation_ui_data, absl::optional navigation_id, @@ -770,7 +767,6 @@ ProxyingURLLoaderFactory::ProxyingURLLoaderFactory( intercepted_handlers_(intercepted_handlers), render_process_id_(render_process_id), frame_routing_id_(frame_routing_id), - view_routing_id_(view_routing_id), request_id_generator_(request_id_generator), navigation_ui_data_(std::move(navigation_ui_data)), navigation_id_(std::move(navigation_id)), @@ -866,9 +862,8 @@ void ProxyingURLLoaderFactory::CreateLoaderAndStart( auto result = requests_.emplace( web_request_id, std::make_unique( - this, web_request_id, view_routing_id_, frame_routing_id_, request_id, - options, request, traffic_annotation, std::move(loader), - std::move(client))); + this, web_request_id, frame_routing_id_, request_id, options, request, + traffic_annotation, std::move(loader), std::move(client))); result.first->second->Restart(); } diff --git a/shell/browser/net/proxying_url_loader_factory.h b/shell/browser/net/proxying_url_loader_factory.h index 10b6d561cd695..f4456a0ee0f67 100644 --- a/shell/browser/net/proxying_url_loader_factory.h +++ b/shell/browser/net/proxying_url_loader_factory.h @@ -54,7 +54,6 @@ class ProxyingURLLoaderFactory InProgressRequest( ProxyingURLLoaderFactory* factory, uint64_t web_request_id, - int32_t view_routing_id, int32_t frame_routing_id, int32_t network_service_request_id, uint32_t options, @@ -136,7 +135,6 @@ class ProxyingURLLoaderFactory const absl::optional original_initiator_; const uint64_t request_id_ = 0; const int32_t network_service_request_id_ = 0; - const int32_t view_routing_id_ = MSG_ROUTING_NONE; const int32_t frame_routing_id_ = MSG_ROUTING_NONE; const uint32_t options_ = 0; const net::MutableNetworkTrafficAnnotationTag traffic_annotation_; @@ -195,7 +193,6 @@ class ProxyingURLLoaderFactory const HandlersMap& intercepted_handlers, int render_process_id, int frame_routing_id, - int view_routing_id, uint64_t* request_id_generator, std::unique_ptr navigation_ui_data, absl::optional navigation_id, @@ -260,7 +257,6 @@ class ProxyingURLLoaderFactory const int render_process_id_; const int frame_routing_id_; - const int view_routing_id_; uint64_t* request_id_generator_; // managed by ElectronBrowserClient std::unique_ptr navigation_ui_data_; absl::optional navigation_id_; diff --git a/shell/browser/net/proxying_websocket.cc b/shell/browser/net/proxying_websocket.cc index 3d051e4d9f2da..0ed8edb01aeba 100644 --- a/shell/browser/net/proxying_websocket.cc +++ b/shell/browser/net/proxying_websocket.cc @@ -40,7 +40,6 @@ ProxyingWebSocket::ProxyingWebSocket( process_id, render_frame_id, nullptr, - MSG_ROUTING_NONE, request, /*is_download=*/false, /*is_async=*/true, From 4d433ac087df0e8a75130f68c28aca752d0000a7 Mon Sep 17 00:00:00 2001 From: deepak1556 Date: Wed, 30 Mar 2022 10:18:56 +0900 Subject: [PATCH 18/18] ci: update xcode version Refs https://chromium-review.googlesource.com/c/chromium/src/+/3544199 https://developer.apple.com/documentation/screencapturekit/capturing_screen_content_in_macos --- .circleci/build_config.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.circleci/build_config.yml b/.circleci/build_config.yml index f25a498be8d2c..81ab33d3d6ab0 100644 --- a/.circleci/build_config.yml +++ b/.circleci/build_config.yml @@ -59,7 +59,7 @@ executors: description: "xcode version" default: "12.4.0" type: enum - enum: ["12.4.0", "13.2.1"] + enum: ["12.4.0", "13.3.0"] macos: xcode: << parameters.xcode >> @@ -1912,7 +1912,7 @@ jobs: osx-testing-x64: executor: name: macos - xcode: "13.2.1" + xcode: "13.3.0" environment: <<: *env-mac-large <<: *env-testing-build @@ -1929,7 +1929,7 @@ jobs: osx-testing-x64-gn-check: executor: name: macos - xcode: "13.2.1" + xcode: "13.3.0" environment: <<: *env-machine-mac <<: *env-testing-build @@ -1938,7 +1938,7 @@ jobs: osx-publish-x64-skip-checkout: executor: name: macos - xcode: "13.2.1" + xcode: "13.3.0" environment: <<: *env-mac-large-release <<: *env-release-build @@ -1959,7 +1959,7 @@ jobs: osx-publish-arm64-skip-checkout: executor: name: macos - xcode: "13.2.1" + xcode: "13.3.0" environment: <<: *env-mac-large-release <<: *env-release-build @@ -1981,7 +1981,7 @@ jobs: osx-testing-arm64: executor: name: macos - xcode: "13.2.1" + xcode: "13.3.0" environment: <<: *env-mac-large <<: *env-testing-build @@ -2000,7 +2000,7 @@ jobs: mas-testing-x64: executor: name: macos - xcode: "13.2.1" + xcode: "13.3.0" environment: <<: *env-mac-large <<: *env-mas @@ -2018,7 +2018,7 @@ jobs: mas-testing-x64-gn-check: executor: name: macos - xcode: "13.2.1" + xcode: "13.3.0" environment: <<: *env-machine-mac <<: *env-mas @@ -2028,7 +2028,7 @@ jobs: mas-publish-x64-skip-checkout: executor: name: macos - xcode: "13.2.1" + xcode: "13.3.0" environment: <<: *env-mac-large-release <<: *env-mas @@ -2049,7 +2049,7 @@ jobs: mas-publish-arm64-skip-checkout: executor: name: macos - xcode: "13.2.1" + xcode: "13.3.0" environment: <<: *env-mac-large-release <<: *env-mas-apple-silicon @@ -2071,7 +2071,7 @@ jobs: mas-testing-arm64: executor: name: macos - xcode: "13.2.1" + xcode: "13.3.0" environment: <<: *env-mac-large <<: *env-testing-build