Fix print preview clipping issues due to scaling.

chrome/renderer/print_web_view_helper_mac.mm

 // 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"
 
 #import <AppKit/AppKit.h>
 
 #include "base/logging.h"
 #include "base/mac/scoped_nsautorelease_pool.h"
 #include "chrome/common/print_messages.h"
 #include "printing/metafile.h"
 #include "printing/metafile_impl.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 
 using WebKit::WebFrame;
 
 void PrintWebViewHelper::PrintPageInternal(
     const PrintMsg_PrintPage_Params& params,
     const gfx::Size& canvas_size,
     WebFrame* frame) {
   printing::NativeMetafile metafile;
   if (!metafile.Init())
     return;
 
   float scale_factor = frame->getPrintPageShrink(params.page_number);
   int page_number = params.page_number;
 
   // Render page for printing.
-  gfx::Point origin(0.0f, 0.0f);
-  RenderPage(params.params.printable_size, origin, scale_factor, page_number,
-      frame, &metafile);
+  gfx::Rect content_size(params.params.printable_size);
+  RenderPage(params.params.printable_size, content_size, scale_factor,
+      page_number, frame, &metafile);
   metafile.FinishDocument();
 
   PrintHostMsg_DidPrintPage_Params page_params;
   page_params.data_size = metafile.GetDataSize();
   page_params.page_number = page_number;
   page_params.document_cookie = params.params.document_cookie;
   page_params.actual_shrink = scale_factor;
   page_params.page_size = params.params.page_size;
   page_params.content_area = gfx::Rect(params.params.margin_left,
                                        params.params.margin_top,
@@ skipping 20 matching lines @@
   int page_count = prep_frame_view.GetExpectedPageCount();
 
   if (!page_count)
     return false;
 
   printing::PreviewMetafile metafile;
   if (!metafile.Init())
     return false;
 
   float scale_factor = frame->getPrintPageShrink(0);
-  gfx::Point origin(printParams.margin_left, printParams.margin_top);
+  gfx::Rect content_size(printParams.margin_left, printParams.margin_top,
+                          printParams.printable_size.width(),
+                          printParams.printable_size.height());
   if (params.pages.empty()) {
     for (int i = 0; i < page_count; ++i) {
-      RenderPage(printParams.page_size, origin, scale_factor, i, frame,
+      RenderPage(printParams.page_size, content_size, scale_factor, i, frame,
                  &metafile);
     }
   } else {
     for (size_t i = 0; i < params.pages.size(); ++i) {
       if (params.pages[i] >= page_count)
         break;
-      RenderPage(printParams.page_size, origin, scale_factor,
+      RenderPage(printParams.page_size, content_size, scale_factor,
                  static_cast<int>(params.pages[i]), frame, &metafile);
     }
   }
   metafile.FinishDocument();
 
   PrintHostMsg_DidPreviewDocument_Params preview_params;
   preview_params.data_size = metafile.GetDataSize();
   preview_params.document_cookie = params.params.document_cookie;
   preview_params.expected_pages_count = page_count;
 
   // Ask the browser to create the shared memory for us.
   if (!CopyMetafileDataToSharedMem(&metafile,
                                    &(preview_params.metafile_data_handle))) {
     return false;
   }
   Send(new PrintHostMsg_PagesReadyForPreview(routing_id(), preview_params));
   return true;
 }
 
 void PrintWebViewHelper::RenderPage(
-    const gfx::Size& page_size, const gfx::Point& content_origin,
+    const gfx::Size& page_size, const gfx::Rect& content_size,
     const float& scale_factor, int page_number, WebFrame* frame,
     printing::Metafile* metafile) {
-  bool success = metafile->StartPage(page_size, content_origin, scale_factor);
+  bool success = metafile->StartPage(page_size, content_size, scale_factor);
   DCHECK(success);
 
   // printPage can create autoreleased references to |context|. PDF contexts
   // don't write all their data until they are destroyed, so we need to make
   // certain that there are no lingering references.
   {
     base::mac::ScopedNSAutoreleasePool pool;
     frame->printPage(page_number, metafile->context());
   }
 
   // Done printing. Close the device context to retrieve the compiled metafile.
   metafile->FinishPage();
 }