github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-01-09 15:38:08 -05:00
Code Issues Packages Projects Releases Wiki Activity

chore: bump chromium to 118.0.5991.0 (main) (#39714)

Browse Source 
* chore: bump chromium in DEPS to 118.0.5982.0

* chore: bump chromium in DEPS to 118.0.5983.0

* chore: bump chromium in DEPS to 118.0.5985.0

* chore: bump chromium in DEPS to 118.0.5987.0

* chore: update v8 patches

* chore: update chromium patches

* chore: update patches

* [PEPC] Add new structs to contain permission request data

Refs https://chromium-review.googlesource.com/c/chromium/src/+/4756727

* Add ThumbnailCapturer interface

Refs https://chromium-review.googlesource.com/c/chromium/src/+/4812256

* Reland "[ChromeRefresh2023] Update document pip windows for Chrome Refresh"

Refs https://chromium-review.googlesource.com/c/chromium/src/+/4814275

* chore: bump chromium in DEPS to 118.0.5989.0

* chore: bump chromium in DEPS to 118.0.5991.0

* chore: update patches

---------

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: deepak1556 <hop2deep@gmail.com>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
This commit is contained in:
electron-roller[bot]
2023-09-05 21:17:56 -04:00
committed by GitHub
parent c96bb9958f
commit d9ba26273a
61 changed files with 367 additions and 315 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
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 99a80c73248bf54e7478d6038601442645f01158..beb628520129d48019c12a8383c5ab5d7a22e22d 100644
index ce097109b6a199de57693481310bbf5fdd948c35..11e5c96c3379375bd320320fc684881013ef0e8f 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -969,7 +969,6 @@ if (is_win) {
@@ -706,7 +706,7 @@ index 3f9a514fb41d72c5d06de6ac989f9d7c0513a4e7..0e7ada9df962808dad7caf074a08ebde
// Tells the browser printing failed.
PrintingFailed(int32 cookie, PrintFailureReason reason);
diff --git a/components/printing/renderer/print_render_frame_helper.cc b/components/printing/renderer/print_render_frame_helper.cc
index cf97fc794294cbd5c2bcfd8a358c7b2291723e74..f55a1a6fd0eaeb9f1b2487dfcb272c301c9f9b1c 100644
index 658a3c59993ac30feaea4d86148ed5adc9dcbdb1..afa788bbefc8f814af9b70ff5b5ebbc86a1777cd 100644
--- a/components/printing/renderer/print_render_frame_helper.cc
+++ b/components/printing/renderer/print_render_frame_helper.cc
@@ -45,6 +45,7 @@
@@ -717,7 +717,7 @@ index cf97fc794294cbd5c2bcfd8a358c7b2291723e74..f55a1a6fd0eaeb9f1b2487dfcb272c30
#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"
@@ -1318,14 +1319,14 @@ void PrintRenderFrameHelper::ScriptedPrint(bool user_initiated) {
@@ -1322,14 +1323,14 @@ void PrintRenderFrameHelper::ScriptedPrint(bool user_initiated) {
}
print_in_progress_ = true;
@@ -734,7 +734,7 @@ index cf97fc794294cbd5c2bcfd8a358c7b2291723e74..f55a1a6fd0eaeb9f1b2487dfcb272c30
if (!weak_this) {
return;
}
@@ -1356,7 +1357,7 @@ void PrintRenderFrameHelper::BindPrintRenderFrameReceiver(
@@ -1360,7 +1361,7 @@ void PrintRenderFrameHelper::BindPrintRenderFrameReceiver(
receivers_.Add(this, std::move(receiver));
}
@@ -743,7 +743,7 @@ index cf97fc794294cbd5c2bcfd8a358c7b2291723e74..f55a1a6fd0eaeb9f1b2487dfcb272c30
ScopedIPC scoped_ipc(weak_ptr_factory_.GetWeakPtr());
if (ipc_nesting_level_ > kAllowedIpcDepthForPrint)
return;
@@ -1371,7 +1372,7 @@ void PrintRenderFrameHelper::PrintRequestedPages() {
@@ -1375,7 +1376,7 @@ void PrintRenderFrameHelper::PrintRequestedPages() {
// plugin node and print that instead.
auto plugin = delegate_->GetPdfElement(frame);
@@ -752,7 +752,7 @@ index cf97fc794294cbd5c2bcfd8a358c7b2291723e74..f55a1a6fd0eaeb9f1b2487dfcb272c30
if (render_frame_gone_) {
return;
@@ -1458,7 +1459,8 @@ void PrintRenderFrameHelper::PrintForSystemDialog() {
@@ -1462,7 +1463,8 @@ void PrintRenderFrameHelper::PrintForSystemDialog() {
}
Print(frame, print_preview_context_.source_node(),
@@ -762,7 +762,7 @@ index cf97fc794294cbd5c2bcfd8a358c7b2291723e74..f55a1a6fd0eaeb9f1b2487dfcb272c30
if (render_frame_gone_) {
return;
}
@@ -1521,6 +1523,8 @@ void PrintRenderFrameHelper::PrintPreview(base::Value::Dict settings) {
@@ -1525,6 +1527,8 @@ void PrintRenderFrameHelper::PrintPreview(base::Value::Dict settings) {
if (ipc_nesting_level_ > kAllowedIpcDepthForPrint)
return;
@@ -771,7 +771,7 @@ index cf97fc794294cbd5c2bcfd8a358c7b2291723e74..f55a1a6fd0eaeb9f1b2487dfcb272c30
print_preview_context_.OnPrintPreview();
#if BUILDFLAG(IS_CHROMEOS_ASH)
@@ -2153,7 +2157,8 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) {
@@ -2158,7 +2162,8 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) {
}
Print(duplicate_node.GetDocument().GetFrame(), duplicate_node,
@@ -781,7 +781,7 @@ index cf97fc794294cbd5c2bcfd8a358c7b2291723e74..f55a1a6fd0eaeb9f1b2487dfcb272c30
// Check if `this` is still valid.
if (!weak_this) {
return;
@@ -2169,7 +2174,9 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) {
@@ -2174,7 +2179,9 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) {
void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
const blink::WebNode& node,
@@ -792,7 +792,7 @@ index cf97fc794294cbd5c2bcfd8a358c7b2291723e74..f55a1a6fd0eaeb9f1b2487dfcb272c30
// If still not finished with earlier print request simply ignore.
if (prep_frame_view_)
return;
@@ -2177,7 +2184,7 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
@@ -2182,7 +2189,7 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
FrameReference frame_ref(frame);
uint32_t expected_page_count = 0;
@@ -801,7 +801,7 @@ index cf97fc794294cbd5c2bcfd8a358c7b2291723e74..f55a1a6fd0eaeb9f1b2487dfcb272c30
DidFinishPrinting(PrintingResult::kFailPrintInit);
return; // Failed to init print page settings.
}
@@ -2196,8 +2203,15 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
@@ -2201,8 +2208,15 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
print_pages_params_->params->print_scaling_option;
auto self = weak_ptr_factory_.GetWeakPtr();
@@ -818,7 +818,7 @@ index cf97fc794294cbd5c2bcfd8a358c7b2291723e74..f55a1a6fd0eaeb9f1b2487dfcb272c30
// Check if `this` is still valid.
if (!self)
return;
@@ -2441,35 +2455,47 @@ void PrintRenderFrameHelper::IPCProcessed() {
@@ -2446,35 +2460,47 @@ void PrintRenderFrameHelper::IPCProcessed() {
}
}
@@ -876,7 +876,7 @@ index cf97fc794294cbd5c2bcfd8a358c7b2291723e74..f55a1a6fd0eaeb9f1b2487dfcb272c30
return false;
}
@@ -2574,7 +2600,7 @@ mojom::PrintPagesParamsPtr PrintRenderFrameHelper::GetPrintSettingsFromUser(
@@ -2579,7 +2605,7 @@ mojom::PrintPagesParamsPtr PrintRenderFrameHelper::GetPrintSettingsFromUser(
std::move(params),
base::BindOnce(
[](base::OnceClosure quit_closure, mojom::PrintPagesParamsPtr* output,
@@ -927,10 +927,10 @@ index 8d65b7b6440c8e653eb1b3f9c50b40944b7ae61b..eb6b4a42d507ff216fc07328c1907815
#if BUILDFLAG(ENABLE_PRINT_PREVIEW)
// Set options for print preset from source PDF document.
diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
index 7dcbbbba95fbc85c574f02dcd8b64a461d0652ec..180a4bbe8f0b39858f154d41aca8ffbb483c7cab 100644
index e861d5b7562cda69a7e113882d22087a2f6cdda9..e0d55a859061f029e5298599bf2d9345674ecb34 100644
--- a/content/browser/BUILD.gn
+++ b/content/browser/BUILD.gn
@@ -2946,8 +2946,9 @@ source_set("browser") {
@@ -2951,8 +2951,9 @@ source_set("browser") {
"//ppapi/shared_impl",
]
@@ -943,7 +943,7 @@ index 7dcbbbba95fbc85c574f02dcd8b64a461d0652ec..180a4bbe8f0b39858f154d41aca8ffbb
if (is_chromeos) {
sources += [
diff --git a/printing/printing_context.cc b/printing/printing_context.cc
index 370dedfb4b4649f85a02b3a50ee16f525f57f44a..256666b64d8ffb5b50c9424c40ae1bb4050da6fb 100644
index 6aae8700c36346edfb44db0cec569efb3702cafe..75a5c89b8e0c916239b5f4fc1f062df4cd22733b 100644
--- a/printing/printing_context.cc
+++ b/printing/printing_context.cc
@@ -143,7 +143,6 @@ void PrintingContext::UsePdfSettings() {
@@ -955,10 +955,10 @@ index 370dedfb4b4649f85a02b3a50ee16f525f57f44a..256666b64d8ffb5b50c9424c40ae1bb4
std::unique_ptr<PrintSettings> settings =
PrintSettingsFromJobSettings(job_settings);
diff --git a/printing/printing_context.h b/printing/printing_context.h
index 2fb3aef0797f204f08c20e48987cd8c2703185de..75a70e331f8b539027748dad3252912cb85e8797 100644
index c753f04d8b73a51cb7e05dcdb86afc0e981e7a71..7ec1729e08bf42a51f80885b3838eee95c8bc953 100644
--- a/printing/printing_context.h
+++ b/printing/printing_context.h
@@ -178,6 +178,9 @@ class COMPONENT_EXPORT(PRINTING) PrintingContext {
@@ -174,6 +174,9 @@ class COMPONENT_EXPORT(PRINTING) PrintingContext {
bool PrintingAborted() const { return abort_printing_; }
@@ -968,7 +968,7 @@ index 2fb3aef0797f204f08c20e48987cd8c2703185de..75a70e331f8b539027748dad3252912c
int job_id() const { return job_id_; }
protected:
@@ -188,9 +191,6 @@ class COMPONENT_EXPORT(PRINTING) PrintingContext {
@@ -184,9 +187,6 @@ class COMPONENT_EXPORT(PRINTING) PrintingContext {
static std::unique_ptr<PrintingContext> CreateImpl(Delegate* delegate,
bool skip_system_calls);