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

printing/pdf_ps_metafile_cairo.h

Index: printing/pdf_ps_metafile_cairo.h
diff --git a/printing/pdf_ps_metafile_cairo.h b/printing/pdf_ps_metafile_cairo.h
index 645a462b4e7fafe96e908699e0b6afccf657e69e..a894e9bc91d098798249fb537234607e6bb1e61c 100644
--- a/printing/pdf_ps_metafile_cairo.h
+++ b/printing/pdf_ps_metafile_cairo.h
@@ -9,73 +9,47 @@
 
 #include "base/basictypes.h"
 #include "base/gtest_prod_util.h"
-#include "printing/native_metafile_linux.h"
+#include "printing/native_metafile.h"
 
 typedef struct _cairo_surface cairo_surface_t;
-typedef struct _cairo cairo_t;
-
-namespace base {
-struct FileDescriptor;
-}
-
-class FilePath;
 
 namespace printing {
 
-// This class uses Cairo graphics library to generate PostScript/PDF stream
-// and stores rendering results in a string buffer.
-class PdfPsMetafile : public NativeMetafile  {
+// This class uses Cairo graphics library to generate PDF stream and stores
+// rendering results in a string buffer.
+class PdfPsMetafile : public NativeMetafile {
  public:
   virtual ~PdfPsMetafile();
 
-  // Initializes to a fresh new metafile. Returns true on success.
-  // Note: Only call in the renderer to allocate rendering resources.
+  //  NativeMetafile methods.
   virtual bool Init();
-
-  // Initializes a copy of metafile from PDF stream data.
-  // Returns true on success.
-  // |src_buffer| should point to the shared memory which stores PDF
-  // contents generated in the renderer.
-  // Note: Only call in the browser to initialize |data_|.
   virtual bool Init(const void* src_buffer, uint32 src_buffer_size);
 
-  // Sets raw PDF data for the document. This is used when a cairo drawing
-  // surface has already been created. This method will cause all subsequent
-  // drawing on the surface to be discarded (in Close()). If Init() has not yet
-  // been called this method simply calls the second version of Init.
-  virtual bool SetRawData(const void* src_buffer, uint32 src_buffer_size);
-
-  // Prepares a new cairo surface/context for rendering a new page.
-  // The unit is in point (=1/72 in).
-  // Returns NULL when failed.
-  virtual cairo_t* StartPage(double width_in_points,
-                             double height_in_points,
+  virtual cairo_t* StartPage(const gfx::Size& page_size,
                              double margin_top_in_points,
                              double margin_right_in_points,
                              double margin_bottom_in_points,
                              double margin_left_in_points);
-
-  // Destroys the surface and the context used in rendering current page.
-  // The results of current page will be appended into buffer |data_|.
-  // Returns true on success.
   virtual bool FinishPage();
+  virtual bool Close();
 
-  // Closes resulting PDF file. No further rendering is allowed.
-  virtual void Close();
-
-  // Returns size of PDF contents stored in buffer |data_|.
-  // This function should ONLY be called after PDF file is closed.
   virtual uint32 GetDataSize() const;
-
-  // Copies PDF contents stored in buffer |data_| into |dst_buffer|.
-  // This function should ONLY be called after PDF file is closed.
-  // Returns true only when success.
   virtual bool GetData(void* dst_buffer, uint32 dst_buffer_size) const;
 
-  // Saves PDF contents stored in buffer |data_| into the file
-  // associated with |fd|.
-  // This function should ONLY be called after PDF file is closed.
-  virtual bool SaveTo(const base::FileDescriptor& fd) const;
+  virtual bool SaveTo(const FilePath& file_path) const;
+
+  virtual gfx::Rect GetPageBounds(unsigned int page_number) const;
+  virtual unsigned int GetPageCount() const { return 1; }

[vandebo (ex-Chrome), 2011/03/14 20:24:25]

Move the body of this method into the .cc file and change it to NOTIMPLEMENTED. 
1 is usually incorrect.

[dpapad, 2011/03/14 22:15:12]

Done.

+
+  virtual gfx::NativeDrawingContext context() const {

[vandebo (ex-Chrome), 2011/03/14 20:24:25]

You can use cairo_t* here.

[dpapad, 2011/03/14 22:15:12]

Done.

+    return context_;
+  }
+
+  virtual bool SetRawData(const void* src_buffer, uint32 src_buffer_size);
+
+#if defined(OS_CHROMEOS)
+  virtual bool SaveToFD(const base::FileDescriptor& fd) const;
+#endif  // if defined(OS_CHROMEOS)
 
   // The hardcoded margins, in points. These values are based on 72 dpi,
   // with 0.25 margins on top, left, and right, and 0.56 on bottom.