Unifying NativeMetafile class interface (as much as possible) for Linux, Mac, Win

printing/pdf_metafile_mac.h

Index: printing/pdf_metafile_mac.h
diff --git a/printing/pdf_metafile_mac.h b/printing/pdf_metafile_mac.h
index c5669a833479602c64563fe3cc4c80a2588a813a..64117ff1e4a9215830d1d2ed8d8accf9a6f384e1 100644
--- a/printing/pdf_metafile_mac.h
+++ b/printing/pdf_metafile_mac.h
@@ -11,13 +11,14 @@
 #include "base/basictypes.h"
 #include "base/gtest_prod_util.h"
 #include "base/mac/scoped_cftyperef.h"
-#include "printing/native_metafile_mac.h"
+#include "printing/native_metafile.h"
 
 namespace gfx {
 class Rect;
 class Size;
 class Point;
 }
+
 class FilePath;

[vandebo (ex-Chrome), 2011/03/15 20:33:01]

FilePath before gfx

[dpapad, 2011/03/15 21:41:07]

Done.

 
 namespace printing {
@@ -28,65 +29,40 @@ class PdfMetafile : public NativeMetafile {
 
   virtual ~PdfMetafile();
 
-  // Initializes a new metafile, and returns a drawing context for rendering
-  // into the PDF. Returns NULL on failure.
-  // Note: The returned context *must not be retained* past Close(). If it is,
-  // the data returned from GetData will not be valid PDF data.
-  virtual CGContextRef Init();
-
-  // Initializes a copy of metafile from PDF data. Returns true on success.
+  //NativeMetafile methods.
+  virtual bool Init();
   virtual bool Init(const void* src_buffer, uint32 src_buffer_size);
 
-  // Prepares a new pdf page at specified |content_origin| with the given
-  // |page_size| and a |scale_factor| to use for the drawing.
   virtual CGContextRef StartPage(const gfx::Size& page_size,
-                         const gfx::Point& content_origin,
-                         const float& scale_factor);
-
-  // Closes the current page.
-  virtual void FinishPage();
-
-  // Closes the PDF file; no further rendering is allowed.
-  virtual void Close();
-
-  // Renders the given page into |rect| in the given context.
-  // Pages use a 1-based index. The rendering uses the following arguments
-  // to determine scaling and translation factors.
-  // |shrink_to_fit| specifies whether the output should be shrunk to fit the
-  // supplied |rect| if the page size is larger than |rect| in any dimension.
-  // If this is false, parts of the PDF page that lie outside the bounds will be
-  // clipped.
-  // |stretch_to_fit| specifies whether the output should be stretched to fit
-  // the supplied bounds if the page size is smaller than |rect| in all
-  // dimensions.
-  // |center_horizontally| specifies whether the final image (after any scaling
-  // is done) should be centered horizontally within the given |rect|.
-  // |center_vertically| specifies whether the final image (after any scaling
-  // is done) should be centered vertically within the given |rect|.
-  // Note that all scaling preserves the original aspect ratio of the page.
-  virtual bool RenderPage(unsigned int page_number, CGContextRef context,
-                  const CGRect rect, bool shrink_to_fit, bool stretch_to_fit,
-                  bool center_horizontally, bool center_vertically) const;
-  virtual unsigned int GetPageCount() const;
-
-  // Returns the bounds of the given page.
-  // Pages use a 1-based index.
-  virtual  gfx::Rect GetPageBounds(unsigned int page_number) const;
+                                 const gfx::Point& content_origin,
+                                 const float& scale_factor);
+  virtual bool FinishPage();
+  virtual bool Close();
 
-  // Returns the size of the underlying PDF data. Only valid after Close() has
-  // been called.
   virtual uint32 GetDataSize() const;
-
-  // Copies the first |dst_buffer_size| bytes of the PDF data into |dst_buffer|.
-  // Only valid after Close() has been called.
-  // Returns true if the copy succeeds.
   virtual bool GetData(void* dst_buffer, uint32 dst_buffer_size) const;
 
-  // Saves the raw PDF data to the given file. For testing only.
-  // Returns true if writing succeeded.
+  // For testing purposes only.
   virtual bool SaveTo(const FilePath& file_path) const;
 
- protected:
+  virtual gfx::Rect GetPageBounds(unsigned int page_number) const;
+  virtual unsigned int GetPageCount() const;
+
+  virtual CGContextRef context() const {
+    return context_.get();
+  }
+
+  virtual bool RenderPage(unsigned int page_number,
+                          CGContextRef context,
+                          const CGRect rect,
+                          bool shrink_to_fit,
+                          bool stretch_to_fit,
+                          bool center_horizontally,
+                          bool center_vertically) const;
+
+  // Note: The returned context *must not be retained* past Close(). If it is,
+  // the data returned from GetData will not be valid PDF data.
+   protected:
   // To create PDF data, callers should call Init() to set up the rendering

[vandebo (ex-Chrome), 2011/03/15 20:33:01]

This comment doesn't seem to go with the constructor anymore.  Delete?

[dpapad, 2011/03/15 21:41:07]

Done.

   // context.
   // To create a metafile from existing data, callers should call