From d6682232b6b3ef3d6e3186bf742eec5bda54a4b9 Mon Sep 17 00:00:00 2001
From: lingfeng <15996208704@163.com>
Date: Fri, 19 Jan 2024 09:51:19 +0800
Subject: [PATCH] lingfeng

Change-Id: I4251faa5cce8318e7dc519e9f3175c5f384e21fb
---
 libcef/browser/printing/ohos_print_manager.cc | 12 ++++++------
 libcef/browser/printing/ohos_print_manager.h  |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/libcef/browser/printing/ohos_print_manager.cc b/libcef/browser/printing/ohos_print_manager.cc
index c5b1e358a..b1d867754 100755
--- a/libcef/browser/printing/ohos_print_manager.cc
+++ b/libcef/browser/printing/ohos_print_manager.cc
@@ -80,13 +80,13 @@ class PrintDocumentAdapterImpl
       const OHOS::NWeb::PrintAttributesAdapter& oldAttrs,
       const OHOS::NWeb::PrintAttributesAdapter& newAttrs,
       uint32_t fd,
-      std::function<void(std::string, uint32_t)> writeResultCallback) override {
+      std::shared_ptr<OHOS::NWeb::PrintWriteResultCallbackAdapter> callback) override {
     LOG(INFO) << "OhosPrintManager onStartLayoutWrite.";
     PrintAttrs printAttrs;
     printAttrs.jobId = jobId;
     printAttrs.attrs = newAttrs;
     printAttrs.fd = fd;
-    printAttrs.writeResultCallback = writeResultCallback;
+    printAttrs.callback = callback;
     if (ohosPrintManager_) {
       ohosPrintManager_->SetPrintAttrs(printAttrs);
       ohosPrintManager_->PrintPage(false);
@@ -120,13 +120,13 @@ class ApplicationPrintDocumentAdapterImpl
       const OHOS::NWeb::PrintAttributesAdapter& oldAttrs,
       const OHOS::NWeb::PrintAttributesAdapter& newAttrs,
       uint32_t fd,
-      std::function<void(std::string, uint32_t)> writeResultCallback) override {
+      std::shared_ptr<OHOS::NWeb::PrintWriteResultCallbackAdapter> callback) override {
     LOG(INFO) << "Application OhosPrintManager onStartLayoutWrite.";
     PrintAttrs printAttrs;
     printAttrs.jobId = jobId;
     printAttrs.attrs = newAttrs;
     printAttrs.fd = fd;
-    printAttrs.writeResultCallback = writeResultCallback;
+    printAttrs.callback = callback;
     if (ohosPrintManager_) {
       if (!isCalledBeforeEvent) {
         isCalledBeforeEvent = true;
@@ -256,7 +256,7 @@ void OhosPrintManager::PrintPageImpl(bool isApplication) {
     LOG(ERROR) << "rfh is nullptr.";
     if (printAttrsMap_.find(print_job_id_) != printAttrsMap_.end()) {
       LOG(INFO) << "writeResultCallback PRINT_JOB_CREATE_FILE_COMPLETED_FAILED";
-      printAttrsMap_[print_job_id_].writeResultCallback(
+      printAttrsMap_[print_job_id_].callback->WriteResultCallback(
           print_job_id_, PRINT_JOB_CREATE_FILE_COMPLETED_FAILED);
     }
     return;
@@ -384,7 +384,7 @@ void OhosPrintManager::OnDidPrintDocumentWritingDone(
   std::move(did_print_document_cb).Run(true);
   if (printAttrsMap_.find(print_job_id_) != printAttrsMap_.end()) {
     LOG(INFO) << "writeResultCallback PRINT_JOB_CREATE_FILE_COMPLETED_SUCCESS";
-    printAttrsMap_[print_job_id_].writeResultCallback(
+    printAttrsMap_[print_job_id_].callback->WriteResultCallback(
         print_job_id_, PRINT_JOB_CREATE_FILE_COMPLETED_SUCCESS);
   }
 }
diff --git a/libcef/browser/printing/ohos_print_manager.h b/libcef/browser/printing/ohos_print_manager.h
index 58d69c688..d8050b76d 100755
--- a/libcef/browser/printing/ohos_print_manager.h
+++ b/libcef/browser/printing/ohos_print_manager.h
@@ -36,7 +36,7 @@ struct PrintAttrs {
   std::string jobId;
   OHOS::NWeb::PrintAttributesAdapter attrs;
   uint32_t fd;
-  std::function<void(std::string, uint32_t)> writeResultCallback;
+  std::shared_ptr<OHOS::NWeb::PrintWriteResultCallbackAdapter> callback;
 };
 
 class OhosPrintManager : public printing::PrintManager,
-- 
Gitee