Merge pull request #23489 from brave/missing-print-preview-pages

Make sure PrintPreviewExtraction emit beforeprint and afterprint correctly
brave · May 9, 2024 · bf88d6a · bf88d6a
2 parents 13a5af7 + 56eb3d0
commit bf88d6a
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 21 deletions.
diff --git a/browser/ui/webui/ai_chat/print_preview_extractor.cc b/browser/ui/webui/ai_chat/print_preview_extractor.cc
@@ -352,7 +352,8 @@ void PrintPreviewExtractor::DidGetDefaultPageLayout(
 void PrintPreviewExtractor::DidStartPreview(
     printing::mojom::DidStartPreviewParamsPtr params,
     int32_t request_id) {
-  DVLOG(3) << __func__ << ": id=" << request_id;
+  DVLOG(3) << __func__ << ": id=" << request_id
+           << " , page count: " << params->page_count;
 }
 
 void PrintPreviewExtractor::OnPrepareForDocumentToPdfDone(
@@ -395,6 +396,9 @@ void PrintPreviewExtractor::PreviewCleanup() {
     return;
   }
   PrintPreviewDataService::GetInstance()->RemoveEntry(*print_preview_ui_id_);
+  if (!is_pdf_) {
+    print_render_frame_->OnPrintPreviewDialogClosed();
+  }
   DisconnectPrintPrieviewUI();
 }
 

diff --git a/chromium_src/components/printing/renderer/print_render_frame_helper.cc b/chromium_src/components/printing/renderer/print_render_frame_helper.cc
@@ -57,8 +57,10 @@ void PrintRenderFrameHelper::InitiatePrintPreview(
     print_preview_context_.InitWithNode(plugin);
   } else {
     print_preview_context_.InitWithFrame(frame);
+    print_preview_context_.DispatchBeforePrintEvent(
+        weak_ptr_factory_.GetWeakPtr());
   }
-  print_in_progress_ = false;
+  // Print Preview resets `print_in_progress_` when the dialog closes.
 }
 
 void PrintRenderFrameHelper::SetIsPrintPreviewExtraction(bool value) {

diff --git a/test/data/leo/extra_long_canvas.html b/test/data/leo/extra_long_canvas.html
@@ -6,27 +6,30 @@
 <body>
     <script>
       // Here we create 21 pages to test kMaxPreviewPages which is 20.
-      for (let i = 0; i < 21; i++) {
-        const div = document.createElement('div');
-        div.style.width = '559px';
-        div.style.height = '794px';
+      // These pages will be created only after receiving the beforeprint event.
+      window.addEventListener('beforeprint', () => {
+        for (let i = 0; i < 21; i++) {
+          const div = document.createElement('div');
+          div.style.width = '559px';
+          div.style.height = '794px';
 
-        const canvas = document.createElement('canvas');
-        const context = canvas.getContext('2d');
-        canvas.width = 559
-        canvas.height = 794
-        context.font = '30px Arial';
-        if (i == 19) {
-          // This should be the last page because of the truncation.
-          context.fillText('This is the way.', 50, 100);
-        } else if (i == 20) {
-          // This will be truncated.
-          context.fillText('There is no way.', 50, 100);
-        }
+          const canvas = document.createElement('canvas');
+          const context = canvas.getContext('2d');
+          canvas.width = 559
+          canvas.height = 794
+          context.font = '30px Arial';
+          if (i == 19) {
+            // This should be the last page because of the truncation.
+            context.fillText('This is the way.', 50, 100);
+          } else if (i == 20) {
+            // This will be truncated.
+            context.fillText('There is no way.', 50, 100);
+          }
 
-        div.appendChild(canvas);
-        document.body.appendChild(div);
-      }
+          div.appendChild(canvas);
+          document.body.appendChild(div);
+        }
+      });
     </script>
 </body>
 </html>