From 17f9e58022b181b1a097ec75cf824714778c8946 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Br=C3=BCning?= <michael.bruning@qt.io>
Date: Mon, 9 Jan 2017 16:59:25 +0100
Subject: Emit a new signal when printing to a PDF file finishes

[ChangeLog][Important Changes] Printing to a PDF file will now emit
signal the signal pdfPrintingFinished in both QQuickWebEngineView
and QWebEnginePage.

The boolean passed with the signal to indicate if the printing and
saving of the PDF was successful. The path of the created file is
also passed to enable the user to map the signal to a print request.

Task-number: QTBUG-56677
Change-Id: Ifab5a20b048f33a8cd872165bd4d453b01708037
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
---
 src/core/web_contents_adapter.cpp | 34 ++++++++++++++++++++++++++--------
 1 file changed, 26 insertions(+), 8 deletions(-)

(limited to 'src/core/web_contents_adapter.cpp')

diff --git a/src/core/web_contents_adapter.cpp b/src/core/web_contents_adapter.cpp
index abf9aa3a3..030d3ea89 100644
--- a/src/core/web_contents_adapter.cpp
+++ b/src/core/web_contents_adapter.cpp
@@ -184,11 +184,20 @@ static void callbackOnEvaluateJS(WebContentsAdapterClient *adapterClient, quint6
 }
 
 #if defined(ENABLE_BASIC_PRINTING)
-static void callbackOnPrintingFinished(WebContentsAdapterClient *adapterClient, int requestId, const std::vector<char>& result)
+static void callbackOnPrintingFinished(WebContentsAdapterClient *adapterClient,
+                                       int requestId,
+                                       const std::vector<char>& result)
 {
     if (requestId)
         adapterClient->didPrintPage(requestId, QByteArray(result.data(), result.size()));
 }
+
+static void callbackOnPdfSavingFinished(WebContentsAdapterClient *adapterClient,
+                                        const QString& filePath,
+                                        bool success)
+{
+    adapterClient->didPrintPageToPdf(filePath, success);
+}
 #endif
 
 static content::WebContents *createBlankWebContents(WebContentsAdapterClient *adapterClient, content::BrowserContext *browserContext)
@@ -963,19 +972,28 @@ void WebContentsAdapter::wasHidden()
 void WebContentsAdapter::printToPDF(const QPageLayout &pageLayout, const QString &filePath)
 {
 #if defined(ENABLE_BASIC_PRINTING)
-    PrintViewManagerQt::FromWebContents(webContents())->PrintToPDF(pageLayout, true, filePath);
+    Q_D(WebContentsAdapter);
+    PrintViewManagerQt::PrintToPDFFileCallback callback = base::Bind(&callbackOnPdfSavingFinished,
+                                                                d->adapterClient,
+                                                                filePath);
+    PrintViewManagerQt::FromWebContents(webContents())->PrintToPDFFileWithCallback(pageLayout,
+                                                                                   true,
+                                                                                   filePath,
+                                                                                   callback);
 #endif // if defined(ENABLE_BASIC_PRINTING)
 }
 
-quint64 WebContentsAdapter::printToPDFCallbackResult(const QPageLayout &pageLayout, const bool colorMode)
+quint64 WebContentsAdapter::printToPDFCallbackResult(const QPageLayout &pageLayout,
+                                                     const bool colorMode)
 {
 #if defined(ENABLE_BASIC_PRINTING)
     Q_D(WebContentsAdapter);
-    PrintViewManagerQt::PrintToPDFCallback callback = base::Bind(&callbackOnPrintingFinished
-                                                                 , d->adapterClient
-                                                                 , d->nextRequestId);
-    PrintViewManagerQt::FromWebContents(webContents())->PrintToPDFWithCallback(pageLayout, colorMode
-                                                                               , callback);
+    PrintViewManagerQt::PrintToPDFCallback callback = base::Bind(&callbackOnPrintingFinished,
+                                                                 d->adapterClient,
+                                                                 d->nextRequestId);
+    PrintViewManagerQt::FromWebContents(webContents())->PrintToPDFWithCallback(pageLayout,
+                                                                               colorMode,
+                                                                               callback);
     return d->nextRequestId++;
 #else
     return 0;
-- 
cgit v1.2.3