Improvements in --debug-print switch implementation.

printing/printed_document.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 PRINTING_PRINTED_DOCUMENT_H_
 #define PRINTING_PRINTED_DOCUMENT_H_
 
 #include <map>
 
 #include "base/memory/ref_counted.h"
@@ skipping 28 matching lines @@
   PrintedDocument(const PrintSettings& settings,
                   PrintedPagesSource* source,
                   int cookie);
 
   // Sets a page's data. 0-based. Takes metafile ownership.
   // Note: locks for a short amount of time.
   void SetPage(int page_number, Metafile* metafile, double shrink,
                const gfx::Size& paper_size, const gfx::Rect& page_rect);
 
   // Retrieves a page. If the page is not available right now, it
   // requests to have this page be rendered and returns false.

[Lei Zhang, 2014/06/11 20:03:06]

update comment

[Vitaly Buka (NO REVIEWS), 2014/06/11 21:32:58]

Done.

   // Note: locks for a short amount of time.
-  bool GetPage(int page_number, scoped_refptr<PrintedPage>* page);
+  scoped_refptr<PrintedPage> GetPage(int page_number);
 
   // Draws the page in the context.
   // Note: locks for a short amount of time in debug only.
 #if defined(OS_WIN) || defined(OS_MACOSX) && !defined(USE_AURA)
   void RenderPrintedPage(const PrintedPage& page,
                          gfx::NativeDrawingContext context) const;
 #elif defined(OS_POSIX)
   void RenderPrintedPage(const PrintedPage& page,
                          PrintingContext* context) const;
 #endif
@@ skipping 28 matching lines @@
 
   // Getters. All these items are immutable hence thread-safe.
   const PrintSettings& settings() const { return immutable_.settings_; }
   const base::string16& name() const { return immutable_.name_; }
   int cookie() const { return immutable_.cookie_; }
 
   // Sets a path where to dump printing output files for debugging. If never set
   // no files are generated.
   static void set_debug_dump_path(const base::FilePath& debug_dump_path);
 
-  static const base::FilePath& debug_dump_path();
+  // Creates debug file name from given |document_name| and |extension|.
+  // Returns empty |base::FilePath| if |set_debug_dump_path| was not yet called
+  // or called with empty value.
+  static base::FilePath CreateDebugDumpPath(const base::string16& document_name,
+                                            const std::string& extension);
 
  private:
   friend class base::RefCountedThreadSafe<PrintedDocument>;
 
   virtual ~PrintedDocument();
 
   // Array of data for each print previewed page.
   typedef std::map<int, scoped_refptr<PrintedPage> > PrintedPages;
 
   // Contains all the mutable stuff. All this stuff MUST be accessed with the
@@ skipping 42 matching lines @@
 
     // Cookie to uniquely identify this document. It is used to make sure that a
     // PrintedPage is correctly belonging to the PrintedDocument. Since
     // PrintedPage generation is completely asynchronous, it could be easy to
     // mess up and send the page to the wrong document. It can be viewed as a
     // simpler hash of PrintSettings since a new document is made each time the
     // print settings change.
     int cookie_;
   };
 
+  void DebugDumpSettings();
   void DebugDump(const PrintedPage& page);
 
   // All writable data member access must be guarded by this lock. Needs to be
   // mutable since it can be acquired from const member functions.
   mutable base::Lock lock_;
 
   // All the mutable members.
   Mutable mutable_;
 
   // All the immutable members.
   const Immutable immutable_;
 
   DISALLOW_COPY_AND_ASSIGN(PrintedDocument);
 };
 
 }  // namespace printing
 
 #endif  // PRINTING_PRINTED_DOCUMENT_H_