mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
chore: bump chromium to 118.0.5993.54 (27-x-y) (#40103)
* chore: bump chromium in DEPS to 118.0.5993.54 * chore: update patches --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
This commit is contained in:
committed by
GitHub
parent
bf7474d3f4
commit
4c4a3e7594
2
DEPS
2
DEPS
@@ -2,7 +2,7 @@ gclient_gn_args_from = 'src'
|
||||
|
||||
vars = {
|
||||
'chromium_version':
|
||||
'118.0.5993.32',
|
||||
'118.0.5993.54',
|
||||
'node_version':
|
||||
'v18.17.1',
|
||||
'nan_version':
|
||||
|
||||
@@ -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 30212d0906f3f934a24e9261ef8d3201b6eca541..d592802c1c0d13786e0f185d2a1d5e3a5bcb2285 100644
|
||||
index 5a58210461222ed431624bf161b32770c5ae97e6..aec69c525cefd73e50f50883ac0dc8bee94e78c0 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 30212d0906f3f934a24e9261ef8d3201b6eca541..d592802c1c0d13786e0f185d2a1d5e3a
|
||||
#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"
|
||||
@@ -1232,14 +1233,14 @@ void PrintRenderFrameHelper::ScriptedPrint(bool user_initiated) {
|
||||
@@ -1237,14 +1238,14 @@ void PrintRenderFrameHelper::ScriptedPrint(bool user_initiated) {
|
||||
}
|
||||
|
||||
print_in_progress_ = true;
|
||||
@@ -734,7 +734,7 @@ index 30212d0906f3f934a24e9261ef8d3201b6eca541..d592802c1c0d13786e0f185d2a1d5e3a
|
||||
if (!weak_this) {
|
||||
return;
|
||||
}
|
||||
@@ -1270,7 +1271,7 @@ void PrintRenderFrameHelper::BindPrintRenderFrameReceiver(
|
||||
@@ -1275,7 +1276,7 @@ void PrintRenderFrameHelper::BindPrintRenderFrameReceiver(
|
||||
receivers_.Add(this, std::move(receiver));
|
||||
}
|
||||
|
||||
@@ -743,7 +743,7 @@ index 30212d0906f3f934a24e9261ef8d3201b6eca541..d592802c1c0d13786e0f185d2a1d5e3a
|
||||
ScopedIPC scoped_ipc(weak_ptr_factory_.GetWeakPtr());
|
||||
if (ipc_nesting_level_ > kAllowedIpcDepthForPrint)
|
||||
return;
|
||||
@@ -1285,7 +1286,7 @@ void PrintRenderFrameHelper::PrintRequestedPages() {
|
||||
@@ -1290,7 +1291,7 @@ void PrintRenderFrameHelper::PrintRequestedPages() {
|
||||
// plugin node and print that instead.
|
||||
auto plugin = delegate_->GetPdfElement(frame);
|
||||
|
||||
@@ -752,7 +752,7 @@ index 30212d0906f3f934a24e9261ef8d3201b6eca541..d592802c1c0d13786e0f185d2a1d5e3a
|
||||
|
||||
if (render_frame_gone_) {
|
||||
return;
|
||||
@@ -1372,7 +1373,8 @@ void PrintRenderFrameHelper::PrintForSystemDialog() {
|
||||
@@ -1377,7 +1378,8 @@ void PrintRenderFrameHelper::PrintForSystemDialog() {
|
||||
}
|
||||
|
||||
Print(frame, print_preview_context_.source_node(),
|
||||
@@ -762,7 +762,7 @@ index 30212d0906f3f934a24e9261ef8d3201b6eca541..d592802c1c0d13786e0f185d2a1d5e3a
|
||||
if (render_frame_gone_) {
|
||||
return;
|
||||
}
|
||||
@@ -1435,6 +1437,8 @@ void PrintRenderFrameHelper::PrintPreview(base::Value::Dict settings) {
|
||||
@@ -1440,6 +1442,8 @@ void PrintRenderFrameHelper::PrintPreview(base::Value::Dict settings) {
|
||||
if (ipc_nesting_level_ > kAllowedIpcDepthForPrint)
|
||||
return;
|
||||
|
||||
@@ -771,7 +771,7 @@ index 30212d0906f3f934a24e9261ef8d3201b6eca541..d592802c1c0d13786e0f185d2a1d5e3a
|
||||
print_preview_context_.OnPrintPreview();
|
||||
|
||||
#if BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
@@ -2060,7 +2064,8 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) {
|
||||
@@ -2065,7 +2069,8 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) {
|
||||
}
|
||||
|
||||
Print(duplicate_node.GetDocument().GetFrame(), duplicate_node,
|
||||
@@ -781,7 +781,7 @@ index 30212d0906f3f934a24e9261ef8d3201b6eca541..d592802c1c0d13786e0f185d2a1d5e3a
|
||||
// Check if `this` is still valid.
|
||||
if (!weak_this) {
|
||||
return;
|
||||
@@ -2076,7 +2081,9 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) {
|
||||
@@ -2081,7 +2086,9 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) {
|
||||
|
||||
void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
|
||||
const blink::WebNode& node,
|
||||
@@ -792,7 +792,7 @@ index 30212d0906f3f934a24e9261ef8d3201b6eca541..d592802c1c0d13786e0f185d2a1d5e3a
|
||||
// If still not finished with earlier print request simply ignore.
|
||||
if (prep_frame_view_)
|
||||
return;
|
||||
@@ -2084,7 +2091,7 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
|
||||
@@ -2089,7 +2096,7 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
|
||||
FrameReference frame_ref(frame);
|
||||
|
||||
uint32_t expected_page_count = 0;
|
||||
@@ -801,7 +801,7 @@ index 30212d0906f3f934a24e9261ef8d3201b6eca541..d592802c1c0d13786e0f185d2a1d5e3a
|
||||
DidFinishPrinting(PrintingResult::kFailPrintInit);
|
||||
return; // Failed to init print page settings.
|
||||
}
|
||||
@@ -2103,8 +2110,15 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
|
||||
@@ -2108,8 +2115,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 30212d0906f3f934a24e9261ef8d3201b6eca541..d592802c1c0d13786e0f185d2a1d5e3a
|
||||
// Check if `this` is still valid.
|
||||
if (!self)
|
||||
return;
|
||||
@@ -2344,35 +2358,47 @@ void PrintRenderFrameHelper::IPCProcessed() {
|
||||
@@ -2349,35 +2363,47 @@ void PrintRenderFrameHelper::IPCProcessed() {
|
||||
}
|
||||
}
|
||||
|
||||
@@ -876,7 +876,7 @@ index 30212d0906f3f934a24e9261ef8d3201b6eca541..d592802c1c0d13786e0f185d2a1d5e3a
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -2477,7 +2503,7 @@ mojom::PrintPagesParamsPtr PrintRenderFrameHelper::GetPrintSettingsFromUser(
|
||||
@@ -2482,7 +2508,7 @@ mojom::PrintPagesParamsPtr PrintRenderFrameHelper::GetPrintSettingsFromUser(
|
||||
std::move(params),
|
||||
base::BindOnce(
|
||||
[](base::OnceClosure quit_closure, mojom::PrintPagesParamsPtr* output,
|
||||
|
||||
@@ -185,7 +185,7 @@ index dbe3c5b8a6c83c5e8d26b109f24e77b4ab2e604e..fd51ab0f749b63fda2a7848594bb616f
|
||||
}
|
||||
|
||||
diff --git a/content/browser/devtools/protocol/network_handler.cc b/content/browser/devtools/protocol/network_handler.cc
|
||||
index 39cf06e487c59c3f1b7d65eb2ed7b69646ce96a5..19abfd095dcf617c26878b9e047dbc1f5abbc710 100644
|
||||
index 74737944f75cdc45b07ae110551ec4b2f250abc7..26a051883a10964168122f9b4ce8ac37f4efa006 100644
|
||||
--- a/content/browser/devtools/protocol/network_handler.cc
|
||||
+++ b/content/browser/devtools/protocol/network_handler.cc
|
||||
@@ -783,6 +783,11 @@ GetProtocolBlockedSetCookieReason(net::CookieInclusionStatus status) {
|
||||
@@ -385,7 +385,7 @@ index f0493cfd8456000f88f1536e908fdc8ace227a28..68a30283eda63918f14efcc4cb409711
|
||||
"http/alternative_service.h",
|
||||
"http/bidirectional_stream.cc",
|
||||
diff --git a/net/base/features.cc b/net/base/features.cc
|
||||
index 1b63eb2526cd0fd07bd68c392c93aae59decdbde..0e6d590e78989570f21e9d0c0ed7b76a7cd6aa11 100644
|
||||
index 70f79c1d3a0f1c042229914844ec84c4f994a15b..cae2bce2138fdc3f8ab3b4a9e78e5720641b92df 100644
|
||||
--- a/net/base/features.cc
|
||||
+++ b/net/base/features.cc
|
||||
@@ -247,6 +247,10 @@ BASE_FEATURE(kCookieSameSiteConsidersRedirectChain,
|
||||
@@ -400,7 +400,7 @@ index 1b63eb2526cd0fd07bd68c392c93aae59decdbde..0e6d590e78989570f21e9d0c0ed7b76a
|
||||
"WaitForFirstPartySetsInit",
|
||||
base::FEATURE_ENABLED_BY_DEFAULT);
|
||||
diff --git a/net/base/features.h b/net/base/features.h
|
||||
index 3632bb20d08f19ef16784f5c769e34cf2d1e0883..8247c7dba75f746c325c97c84f829b1b5267b03b 100644
|
||||
index a5fa693d239a542da6431a5eb6023c5804a5e1d7..6dd3ad7782944bd459bb2aecc8677db115e471f2 100644
|
||||
--- a/net/base/features.h
|
||||
+++ b/net/base/features.h
|
||||
@@ -297,6 +297,12 @@ NET_EXPORT BASE_DECLARE_FEATURE(kUdpSocketPosixAlwaysUpdateBytesReceived);
|
||||
|
||||
Reference in New Issue
Block a user