Win: Fix printing selected pages with native dialog.

chrome/browser/printing/print_job.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_PRINTING_PRINT_JOB_H_
 #define CHROME_BROWSER_PRINTING_PRINT_JOB_H_
 
 #include <memory>
+#include <vector>
 
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
-#include "base/message_loop/message_loop.h"
 #include "build/build_config.h"
 #include "chrome/browser/printing/print_job_worker_owner.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 
-class Thread;
-
 namespace base {
 class RefCountedMemory;
 }
 
 namespace printing {
 
 class JobEventDetails;
 class MetafilePlayer;
 class PdfToEmfConverter;
 class PrintJobWorker;
@@ skipping 56 matching lines @@
   void DisconnectSource();
 
   // Returns true if the print job is pending, i.e. between a StartPrinting()
   // and the end of the spooling.
   bool is_job_pending() const;
 
   // Access the current printed document. Warning: may be NULL.
   PrintedDocument* document() const;
 
 #if defined(OS_WIN)
+  // Let the PrintJob know the 0-based |page_number| of a given printed page.
+  void AppendPrintedPage(int page_number);
+
   void StartPdfToEmfConversion(
       const scoped_refptr<base::RefCountedMemory>& bytes,
       const gfx::Size& page_size,
       const gfx::Rect& content_area);
-#endif  // OS_WIN
+#endif  // defined(OS_WIN)
 
  protected:
   ~PrintJob() override;
 
  private:
-  // Updates document_ to a new instance.
+  // Updates |document_| to a new instance.
   void UpdatePrintedDocument(PrintedDocument* new_document);
 
   // Processes a NOTIFY_PRINT_JOB_EVENT notification.
   void OnNotifyPrintJobEvent(const JobEventDetails& event_details);
 
   // Releases the worker thread by calling Stop(), then broadcasts a JOB_DONE
   // notification.
   void OnDocumentDone();
 
   // Terminates the worker thread in a very controlled way, to work around any
   // eventual deadlock.
   void ControlledWorkerShutdown();
 
   // Called at shutdown when running a nested message loop.
   void Quit();
 
   void HoldUntilStopIsCalled();
 
 #if defined(OS_WIN)
   void OnPdfToEmfStarted(int page_count);
   void OnPdfToEmfPageConverted(int page_number,
                                float scale_factor,
                                std::unique_ptr<MetafilePlayer> emf);
-#endif  // OS_WIN
+#endif  // defined(OS_WIN)
 
   content::NotificationRegistrar registrar_;
 
   // Source that generates the PrintedPage's (i.e. a WebContents). It will be
   // set back to NULL if the source is deleted before this object.
   PrintedPagesSource* source_;
 
   // All the UI is done in a worker thread because many Win32 print functions
   // are blocking and enters a message loop without your consent. There is one
   // worker thread per print job.
   std::unique_ptr<PrintJobWorker> worker_;
 
   // Cache of the print context settings for access in the UI thread.
   PrintSettings settings_;
 
   // The printed document.
   scoped_refptr<PrintedDocument> document_;
 
   // Is the worker thread printing.
   bool is_job_pending_;
 
   // Is Canceling? If so, try to not cause recursion if on FAILED notification,
   // the notified calls Cancel() again.
   bool is_canceling_;
 
 #if defined(OS_WIN)
   class PdfToEmfState;
-  std::unique_ptr<PdfToEmfState> ptd_to_emf_state_;
-#endif  // OS_WIN
+  std::unique_ptr<PdfToEmfState> pdf_to_emf_state_;
+  std::vector<int> pdf_page_mapping_;
+#endif  // defined(OS_WIN)
 
   // Used at shutdown so that we can quit a nested message loop.
   base::WeakPtrFactory<PrintJob> quit_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(PrintJob);
 };
 
 // Details for a NOTIFY_PRINT_JOB_EVENT notification. The members may be NULL.
 class JobEventDetails : public base::RefCountedThreadSafe<JobEventDetails> {
  public:
@@ skipping 49 matching lines @@
   scoped_refptr<PrintedDocument> document_;
   scoped_refptr<PrintedPage> page_;
   const Type type_;
 
   DISALLOW_COPY_AND_ASSIGN(JobEventDetails);
 };
 
 }  // namespace printing
 
 #endif  // CHROME_BROWSER_PRINTING_PRINT_JOB_H_