mirror of
https://github.com/electron/electron.git
synced 2026-01-08 23:18:06 -05:00
chore: bump chromium to 144.0.7506.0 (main) (#48744)
* chore: bump chromium in DEPS to 144.0.7504.0
* chore: bump chromium in DEPS to 144.0.7506.0
* chore: update patches
* Revert "build: explicitly disable reclient"
This reverts commit e08c6adb08.
No longer needed after https://crrev.com/c/7099239
* 7097498: Remove MSG_ROUTING_* constants from ipc_message.h
https://chromium-review.googlesource.com/c/chromium/src/+/7097498
* 7090671: [//gpu] Remove unneeded GpuInfo methods
https://chromium-review.googlesource.com/c/chromium/src/+/7090671
* 7103701: Remove IPC::PlatformFileForTransit.
https://chromium-review.googlesource.com/c/chromium/src/+/7103701
(This should have been removed with https://github.com/electron/electron/pull/17406).
* chore: update filenames.libcxx.gni
---------
Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
This commit is contained in:
committed by
GitHub
parent
a88de8bf1c
commit
ba135e2f7f
@@ -666,7 +666,7 @@ index ac2f719be566020d9f41364560c12e6d6d0fe3d8..16d758a6936f66148a196761cfb875f6
|
||||
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 5fc3803e0cc9e41d508c5752a5a9b5bee4eee0d9..810847718a808418e171939e9b8203098ddf19cd 100644
|
||||
index 2e151997ca968271449a3a3b4144c1b50f86c24f..71bcd655c36b322451261daffd09d99d1f7d929f 100644
|
||||
--- a/components/printing/renderer/print_render_frame_helper.cc
|
||||
+++ b/components/printing/renderer/print_render_frame_helper.cc
|
||||
@@ -53,6 +53,7 @@
|
||||
@@ -677,7 +677,7 @@ index 5fc3803e0cc9e41d508c5752a5a9b5bee4eee0d9..810847718a808418e171939e9b820309
|
||||
#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"
|
||||
@@ -1245,14 +1246,14 @@ void PrintRenderFrameHelper::ScriptedPrint(bool user_initiated) {
|
||||
@@ -1243,14 +1244,14 @@ void PrintRenderFrameHelper::ScriptedPrint(bool user_initiated) {
|
||||
}
|
||||
|
||||
print_in_progress_ = true;
|
||||
@@ -694,7 +694,7 @@ index 5fc3803e0cc9e41d508c5752a5a9b5bee4eee0d9..810847718a808418e171939e9b820309
|
||||
if (!weak_this) {
|
||||
return;
|
||||
}
|
||||
@@ -1283,12 +1284,14 @@ void PrintRenderFrameHelper::BindPrintRenderFrameReceiver(
|
||||
@@ -1281,12 +1282,14 @@ void PrintRenderFrameHelper::BindPrintRenderFrameReceiver(
|
||||
receivers_.Add(this, std::move(receiver));
|
||||
}
|
||||
|
||||
@@ -712,7 +712,7 @@ index 5fc3803e0cc9e41d508c5752a5a9b5bee4eee0d9..810847718a808418e171939e9b820309
|
||||
ScopedIPC scoped_ipc(weak_ptr_factory_.GetWeakPtr());
|
||||
if (ipc_nesting_level_ > kAllowedIpcDepthForPrint) {
|
||||
return;
|
||||
@@ -1305,9 +1308,10 @@ void PrintRenderFrameHelper::PrintRequestedPagesInternal(
|
||||
@@ -1303,9 +1306,10 @@ void PrintRenderFrameHelper::PrintRequestedPagesInternal(
|
||||
|
||||
is_loading_ = frame->WillPrintSoon();
|
||||
if (is_loading_) {
|
||||
@@ -726,7 +726,7 @@ index 5fc3803e0cc9e41d508c5752a5a9b5bee4eee0d9..810847718a808418e171939e9b820309
|
||||
SetupOnStopLoadingTimeout();
|
||||
return;
|
||||
}
|
||||
@@ -1317,7 +1321,7 @@ void PrintRenderFrameHelper::PrintRequestedPagesInternal(
|
||||
@@ -1315,7 +1319,7 @@ void PrintRenderFrameHelper::PrintRequestedPagesInternal(
|
||||
// plugin node and print that instead.
|
||||
auto plugin = delegate_->GetPdfElement(frame);
|
||||
|
||||
@@ -735,7 +735,7 @@ index 5fc3803e0cc9e41d508c5752a5a9b5bee4eee0d9..810847718a808418e171939e9b820309
|
||||
|
||||
if (render_frame_gone_) {
|
||||
return;
|
||||
@@ -1473,6 +1477,8 @@ void PrintRenderFrameHelper::PrintPreview(base::Value::Dict settings) {
|
||||
@@ -1471,6 +1475,8 @@ void PrintRenderFrameHelper::PrintPreview(base::Value::Dict settings) {
|
||||
if (ipc_nesting_level_ > kAllowedIpcDepthForPrint)
|
||||
return;
|
||||
|
||||
@@ -744,7 +744,7 @@ index 5fc3803e0cc9e41d508c5752a5a9b5bee4eee0d9..810847718a808418e171939e9b820309
|
||||
print_preview_context_.OnPrintPreview();
|
||||
|
||||
#if BUILDFLAG(IS_CHROMEOS)
|
||||
@@ -2085,17 +2091,25 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) {
|
||||
@@ -2083,17 +2089,25 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) {
|
||||
|
||||
void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
|
||||
const blink::WebNode& node,
|
||||
@@ -773,7 +773,7 @@ index 5fc3803e0cc9e41d508c5752a5a9b5bee4eee0d9..810847718a808418e171939e9b820309
|
||||
DidFinishPrinting(PrintingResult::kFailPrintInit);
|
||||
return;
|
||||
}
|
||||
@@ -2116,8 +2130,15 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
|
||||
@@ -2114,8 +2128,15 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
|
||||
print_pages_params_->params->print_scaling_option;
|
||||
|
||||
auto self = weak_ptr_factory_.GetWeakPtr();
|
||||
@@ -790,7 +790,7 @@ index 5fc3803e0cc9e41d508c5752a5a9b5bee4eee0d9..810847718a808418e171939e9b820309
|
||||
// Check if `this` is still valid.
|
||||
if (!self)
|
||||
return;
|
||||
@@ -2384,29 +2405,43 @@ void PrintRenderFrameHelper::IPCProcessed() {
|
||||
@@ -2382,29 +2403,43 @@ void PrintRenderFrameHelper::IPCProcessed() {
|
||||
}
|
||||
|
||||
bool PrintRenderFrameHelper::InitPrintSettings(blink::WebLocalFrame* frame,
|
||||
|
||||
Reference in New Issue
Block a user