|
@@ -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,
|