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

chrome/renderer/print_web_view_helper_linux.cc

 // Copyright (c) 2011 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.
 
 #include "chrome/renderer/print_web_view_helper.h"
 
 #include "base/file_descriptor_posix.h"
 #include "base/logging.h"
 #include "base/scoped_ptr.h"
 #include "chrome/common/render_messages.h"
@@ skipping 64 matching lines @@
 
 #if defined(OS_CHROMEOS)
   int sequence_number = -1;
   base::FileDescriptor fd;
 
   // Ask the browser to open a file for us.
   if (!Send(new ViewHostMsg_AllocateTempFileForPrinting(&fd,
                                                         &sequence_number))) {
     return;
   }
-  if (!metafile->SaveTo(fd))
+  if (!metafile->SaveToFD(fd))
     return;
 
   // Tell the browser we've finished writing the file.
   Send(new ViewHostMsg_TempFileForPrintingWritten(sequence_number));
 #else
   ViewHostMsg_DidPrintPage_Params printed_page_params;
   printed_page_params.data_size = 0;
   printed_page_params.document_cookie = params.params.document_cookie;
 
   base::SharedMemoryHandle shared_mem_handle;
@@ skipping 109 matching lines @@
   GetPageSizeAndMarginsInPoints(frame,
                                 params.page_number,
                                 params.params,
                                 &content_width_in_points,
                                 &content_height_in_points,
                                 &margin_top_in_points,
                                 &margin_right_in_points,
                                 &margin_bottom_in_points,
                                 &margin_left_in_points);
 
+  gfx::Size page_size(
+      static_cast<int>(content_width_in_points + margin_right_in_points +

[vandebo (ex-Chrome), 2011/03/14 22:55:05]

A cast shouldn't be needed for double -> int conversion.  Did the compiler
complain?

[dpapad, 2011/03/15 16:11:06]

Done. No it didn't complain, I just thought it is better practice to avoid
implicit conversions in general.

+          margin_left_in_points),
+      static_cast<int>(content_height_in_points + margin_top_in_points +
+          margin_bottom_in_points));
+
   cairo_t* cairo_context =
-      metafile->StartPage(content_width_in_points,
-                          content_height_in_points,
+      metafile->StartPage(page_size,
                           margin_top_in_points,
-                          margin_right_in_points,
-                          margin_bottom_in_points,
                           margin_left_in_points);
   if (!cairo_context)
     return;
 
   canvas->reset(new skia::VectorCanvas(cairo_context,
                                        canvas_size.width(),
                                        canvas_size.height()));
   frame->printPage(params.page_number, canvas->get());
 
   // TODO(myhuang): We should handle transformation for paper margins.
   // TODO(myhuang): We should render the header and the footer.
 
   // Done printing. Close the device context to retrieve the compiled metafile.
   if (!metafile->FinishPage())
     NOTREACHED() << "metafile failed";
 }