mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

chore: bump chromium to 124.0.6323.0 (main) (#41412)

Browse source 
* chore: bump chromium in DEPS to 124.0.6315.0

* chore: update patches

* 5279678: Stream AIDA responses

5279678

* 5276439: Remove non_network_url_loader_factory_remotes_

5276439

* 5310165: Add DevTools API to show search results

5310165

* chore: bump chromium in DEPS to 124.0.6317.0

* chore: update patches

* Remove Setup.Install.CumulativeDiskUsage2 and supporting code

5314269

* browser: Make cmd line non-const in process singleton callback

5311256

* chore: bump chromium in DEPS to 124.0.6319.0

* chore: bump chromium in DEPS to 124.0.6321.0

* chore: bump chromium in DEPS to 124.0.6323.0

* 5318335: Roll src/third_party/boringssl/src 23824fa0f..4fe29ebc7

5318335

* 5318051: [CBE Watermarking] Hoist `watermark_view` to a member variable.

5318051

* chore: fixup patch indices

* 4946553: Delegate HID permission to Chrome App in webview

4946553

* 5310001: DevTools UI binding for reporting client events to AIDA

5310001

* [libc++] Refactor the predicate taking variant of `__cxx_atomic_wait`

* chore: fix browser_view patch harder

* 5293937: Reland "[gUM] Use preferred device if more than one is eligible"

5293937

* fix: filter {video|audio} devices by eligible device id

* 5267921: enable speak content under the pointer on PWA and WV2

5267921

* 5310195: heap: Remove Blink's GCTaskRunner

5310195

---------

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
This commit is contained in:
electron-roller[bot] 2024-02-29 10:31:13 +01:00 • committed by GitHub
parent 13e601e35c
commit 04df5ce492
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
85 changed files with 419 additions and 319 deletions
Download patch file Download diff file Expand all files Collapse all files

28
patches/chromium/printing.patch
View file

@ -11,7 +11,7 @@ majority of changes originally come from these PRs:
This patch also fixes callback for manual user cancellation and success.
diff --git a/BUILD.gn b/BUILD.gn
index 20ee94216cab0c7e2f93f965ee6e78371c3cf5f6..c032d3d16387f69b85d3bbfea2ccc2340c1c7efe 100644
index 8f37cd237422b15b32a7f509fadb44e78bbe588c..e8479dacd6b732d3e21539184d5f96e5b94c10fc 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -974,7 +974,6 @@ if (is_win) {
@ -640,7 +640,7 @@ index 4ecdb28904fac480cf102fffdff24ae008ac88cf..e8150c95fafd83d7e2fe1f472a35acec
PrintingFailed(int32 cookie, PrintFailureReason reason);
diff --git a/components/printing/renderer/print_render_frame_helper.cc b/components/printing/renderer/print_render_frame_helper.cc
index 691993a94da64983abcc403785e03ccb753b0d7e..38f7f92bafb2baf59465dfde9ceb5e610843eeee 100644
index 6c0ad9f1a4fcb17ebb1604ce862b791ec8633484..345e7c15e241a4e4239e7b46b4e9922a8e51536c 100644
--- a/components/printing/renderer/print_render_frame_helper.cc
+++ b/components/printing/renderer/print_render_frame_helper.cc
@@ -47,6 +47,7 @@
@ -651,7 +651,7 @@ index 691993a94da64983abcc403785e03ccb753b0d7e..38f7f92bafb2baf59465dfde9ceb5e61
#include "printing/units.h"
#include "services/metrics/public/cpp/ukm_source_id.h"
#include "third_party/blink/public/common/associated_interfaces/associated_interface_provider.h"
@@ -1230,14 +1231,14 @@ void PrintRenderFrameHelper::ScriptedPrint(bool user_initiated) {
@@ -1229,14 +1230,14 @@ void PrintRenderFrameHelper::ScriptedPrint(bool user_initiated) {
}
print_in_progress_ = true;
@ -668,7 +668,7 @@ index 691993a94da64983abcc403785e03ccb753b0d7e..38f7f92bafb2baf59465dfde9ceb5e61
if (!weak_this) {
return;
}
@@ -1268,7 +1269,7 @@ void PrintRenderFrameHelper::BindPrintRenderFrameReceiver(
@@ -1267,7 +1268,7 @@ void PrintRenderFrameHelper::BindPrintRenderFrameReceiver(
receivers_.Add(this, std::move(receiver));
}
@ -677,7 +677,7 @@ index 691993a94da64983abcc403785e03ccb753b0d7e..38f7f92bafb2baf59465dfde9ceb5e61
ScopedIPC scoped_ipc(weak_ptr_factory_.GetWeakPtr());
if (ipc_nesting_level_ > kAllowedIpcDepthForPrint)
return;
@@ -1283,7 +1284,7 @@ void PrintRenderFrameHelper::PrintRequestedPages() {
@@ -1282,7 +1283,7 @@ void PrintRenderFrameHelper::PrintRequestedPages() {
// plugin node and print that instead.
auto plugin = delegate_->GetPdfElement(frame);
@ -686,7 +686,7 @@ index 691993a94da64983abcc403785e03ccb753b0d7e..38f7f92bafb2baf59465dfde9ceb5e61
if (render_frame_gone_) {
return;
@@ -1372,7 +1373,8 @@ void PrintRenderFrameHelper::PrintForSystemDialog() {
@@ -1371,7 +1372,8 @@ void PrintRenderFrameHelper::PrintForSystemDialog() {
}
Print(frame, print_preview_context_.source_node(),
@ -696,7 +696,7 @@ index 691993a94da64983abcc403785e03ccb753b0d7e..38f7f92bafb2baf59465dfde9ceb5e61
if (render_frame_gone_) {
return;
}
@@ -1435,6 +1437,8 @@ void PrintRenderFrameHelper::PrintPreview(base::Value::Dict settings) {
@@ -1434,6 +1436,8 @@ void PrintRenderFrameHelper::PrintPreview(base::Value::Dict settings) {
if (ipc_nesting_level_ > kAllowedIpcDepthForPrint)
return;
@ -705,7 +705,7 @@ index 691993a94da64983abcc403785e03ccb753b0d7e..38f7f92bafb2baf59465dfde9ceb5e61
print_preview_context_.OnPrintPreview();
#if BUILDFLAG(IS_CHROMEOS_ASH)
@@ -2012,7 +2016,8 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) {
@@ -2011,7 +2015,8 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) {
}
Print(duplicate_node.GetDocument().GetFrame(), duplicate_node,
@ -715,7 +715,7 @@ index 691993a94da64983abcc403785e03ccb753b0d7e..38f7f92bafb2baf59465dfde9ceb5e61
// Check if `this` is still valid.
if (!weak_this) {
return;
@@ -2028,17 +2033,19 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) {
@@ -2027,17 +2032,19 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) {
void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
const blink::WebNode& node,
@ -738,7 +738,7 @@ index 691993a94da64983abcc403785e03ccb753b0d7e..38f7f92bafb2baf59465dfde9ceb5e61
DidFinishPrinting(PrintingResult::kFailPrintInit);
return;
}
@@ -2059,8 +2066,15 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
@@ -2058,8 +2065,15 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
print_pages_params_->params->print_scaling_option;
auto self = weak_ptr_factory_.GetWeakPtr();
@ -755,7 +755,7 @@ index 691993a94da64983abcc403785e03ccb753b0d7e..38f7f92bafb2baf59465dfde9ceb5e61
// Check if `this` is still valid.
if (!self)
return;
@@ -2318,25 +2332,33 @@ void PrintRenderFrameHelper::IPCProcessed() {
@@ -2317,25 +2331,33 @@ void PrintRenderFrameHelper::IPCProcessed() {
}
bool PrintRenderFrameHelper::InitPrintSettings(blink::WebLocalFrame* frame,
@ -796,7 +796,7 @@ index 691993a94da64983abcc403785e03ccb753b0d7e..38f7f92bafb2baf59465dfde9ceb5e61
}
diff --git a/components/printing/renderer/print_render_frame_helper.h b/components/printing/renderer/print_render_frame_helper.h
index 50c05b02ebe6245cee5dbfd529d4eebbc4f57dde..1326edfcbe4c5eb0a8427071d1ed35c8a895486a 100644
index b0ac94751454bd16b4e9bfdc071e2623813133ec..271bd9949a802a370b3619340f3364df14c7fe4a 100644
--- a/components/printing/renderer/print_render_frame_helper.h
+++ b/components/printing/renderer/print_render_frame_helper.h
@@ -245,7 +245,7 @@ class PrintRenderFrameHelper
@ -830,10 +830,10 @@ index 50c05b02ebe6245cee5dbfd529d4eebbc4f57dde..1326edfcbe4c5eb0a8427071d1ed35c8
// Calculate number of pages in source document.
uint32_t CalculateNumberOfPages(blink::WebLocalFrame* frame,
diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
index 6f885f7ea451310cca7c7686548cd3467984874f..b2f9c3316262c15c2740266db6da8133ad2ac012 100644
index ac9c91c5b9048db4c33d8584dee96596e4aff68c..9ea6edb54fbb48d51572c6ca512a059ad677991a 100644
--- a/content/browser/BUILD.gn
+++ b/content/browser/BUILD.gn
@@ -2995,8 +2995,9 @@ source_set("browser") {
@@ -2924,8 +2924,9 @@ source_set("browser") {
"//ppapi/shared_impl",
]