From 57c49df9c6fcbaaffc66900e191312d4e0a0edfa Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Thu, 3 May 2018 18:46:06 +0200
Subject: Adaptations for Chromium 66

Change-Id: Iee88721a50036d4ef85a23dd1708d4fb84218708
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
---
 src/core/printing/print_view_manager_base_qt.cpp | 11 ++++++-----
 src/core/printing/print_view_manager_qt.cpp      | 16 ++++++++--------
 src/core/printing/printing_message_filter_qt.cpp |  2 +-
 3 files changed, 15 insertions(+), 14 deletions(-)

(limited to 'src/core/printing')

diff --git a/src/core/printing/print_view_manager_base_qt.cpp b/src/core/printing/print_view_manager_base_qt.cpp
index abc1edf74..51aa37f62 100644
--- a/src/core/printing/print_view_manager_base_qt.cpp
+++ b/src/core/printing/print_view_manager_base_qt.cpp
@@ -119,7 +119,7 @@ bool PrintViewManagerBaseQt::PrintDocument(printing::PrintedDocument *document,
                                            const gfx::Point &offsets)
 {
     std::unique_ptr<printing::PdfMetafileSkia> metafile =
-            std::make_unique<printing::PdfMetafileSkia>(printing::SkiaDocumentType::PDF);
+            std::make_unique<printing::PdfMetafileSkia>();
     if (!metafile->InitFromData(print_data->front(), print_data->size())) {
         NOTREACHED() << "Invalid metafile";
         web_contents()->Stop();
@@ -153,22 +153,23 @@ void PrintViewManagerBaseQt::OnDidPrintDocument(const PrintHostMsg_DidPrintDocum
     if (!document)
         return;
 
-    if (!base::SharedMemory::IsHandleValid(params.metafile_data_handle)) {
+    const PrintHostMsg_DidPrintContent_Params &content = params.content;
+    if (!base::SharedMemory::IsHandleValid(content.metafile_data_handle)) {
         NOTREACHED() << "invalid memory handle";
         web_contents()->Stop();
         return;
     }
 
     std::unique_ptr<base::SharedMemory> shared_buf =
-            std::make_unique<base::SharedMemory>(params.metafile_data_handle, true);
-    if (!shared_buf->Map(params.data_size)) {
+            std::make_unique<base::SharedMemory>(content.metafile_data_handle, true);
+    if (!shared_buf->Map(content.data_size)) {
         NOTREACHED() << "couldn't map";
         web_contents()->Stop();
         return;
     }
     scoped_refptr<base::RefCountedBytes> bytes =
             base::MakeRefCounted<base::RefCountedBytes>(
-                    reinterpret_cast<const unsigned char*>(shared_buf->memory()), params.data_size);
+                    reinterpret_cast<const unsigned char*>(shared_buf->memory()), content.data_size);
     PrintDocument(document, bytes, params.page_size, params.content_area, params.physical_offsets);
 }
 
diff --git a/src/core/printing/print_view_manager_qt.cpp b/src/core/printing/print_view_manager_qt.cpp
index 627afb01a..177f4de2f 100644
--- a/src/core/printing/print_view_manager_qt.cpp
+++ b/src/core/printing/print_view_manager_qt.cpp
@@ -51,6 +51,7 @@
 
 #include "base/values.h"
 #include "base/memory/ref_counted_memory.h"
+#include "base/task_scheduler/post_task.h"
 #include "chrome/browser/printing/print_job_manager.h"
 #include "chrome/browser/printing/printer_query.h"
 #include "components/printing/common/print_messages.h"
@@ -102,10 +103,10 @@ static void SavePdfFile(scoped_refptr<base::RefCountedBytes> data,
                         const QtWebEngineCore::PrintViewManagerQt::PrintToPDFFileCallback
                                 &saveCallback)
 {
-    DCHECK_CURRENTLY_ON(content::BrowserThread::FILE);
+    base::AssertBlockingAllowed();
     DCHECK_GT(data->size(), 0U);
 
-    printing::PdfMetafileSkia metafile(printing::SkiaDocumentType::PDF);
+    printing::PdfMetafileSkia metafile;
     metafile.InitFromData(static_cast<const void*>(data->front()), data->size());
 
     base::File file(path,
@@ -326,17 +327,16 @@ void PrintViewManagerQt::OnMetafileReadyForPrinting(
     resetPdfState();
 
     if (!pdf_print_callback.is_null()) {
-        std::vector<char> data_vector = GetStdVectorFromHandle(params.metafile_data_handle,
-                                                               params.data_size);
+        std::vector<char> data_vector = GetStdVectorFromHandle(params.content.metafile_data_handle,
+                                                               params.content.data_size);
         content::BrowserThread::PostTask(content::BrowserThread::UI,
                                          FROM_HERE,
                                          base::Bind(pdf_print_callback, data_vector));
     } else {
         scoped_refptr<base::RefCountedBytes> data_bytes
-                = GetBytesFromHandle(params.metafile_data_handle, params.data_size);
-        content::BrowserThread::PostTask(content::BrowserThread::FILE,
-               FROM_HERE,
-               base::Bind(&SavePdfFile, data_bytes, pdfOutputPath, pdf_save_callback));
+                = GetBytesFromHandle(params.content.metafile_data_handle, params.content.data_size);
+        base::PostTaskWithTraits(FROM_HERE, {base::MayBlock()},
+                                 base::BindOnce(&SavePdfFile, data_bytes, pdfOutputPath, pdf_save_callback));
     }
 }
 
diff --git a/src/core/printing/printing_message_filter_qt.cpp b/src/core/printing/printing_message_filter_qt.cpp
index c0e3498ee..9f37e6b94 100644
--- a/src/core/printing/printing_message_filter_qt.cpp
+++ b/src/core/printing/printing_message_filter_qt.cpp
@@ -176,7 +176,7 @@ void PrintingMessageFilterQt::OnScriptedPrintReply(
   }
   PrintHostMsg_ScriptedPrint::WriteReplyParams(reply_msg, params);
   Send(reply_msg);
-  if (params.params.dpi && params.params.document_cookie) {
+  if (!params.params.dpi.IsEmpty() && params.params.document_cookie) {
     queue_->QueuePrinterQuery(printer_query.get());
   } else {
     printer_query->StopWorker();
-- 
cgit v1.2.3