PrintPreview: Honor the print media page size and margin values.

printing/pdf_metafile_cg_mac.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 "printing/pdf_metafile_cg_mac.h"
 
 #include "base/file_path.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/mac/mac_util.h"
@@ skipping 184 matching lines @@
   if (scaling_needed) {
     float x_scaling_factor = rect.size.width / source_rect.size.width;
     float y_scaling_factor = rect.size.height / source_rect.size.height;
     if (x_scaling_factor > y_scaling_factor) {
       scaling_factor = y_scaling_factor;
     } else {
       scaling_factor = x_scaling_factor;
     }
   }
   // Some PDFs have a non-zero origin. Need to take that into account.
-  float x_offset = rect.origin.x - (source_rect.origin.x * scaling_factor);
-  float y_offset = rect.origin.y - (source_rect.origin.y * scaling_factor);
+  float x_offset = source_rect.origin.x * scaling_factor;

[vandebo (ex-Chrome), 2012/01/07 00:23:19]

You changed the sign.  These should be negative.

[kmadhusu, 2012/01/09 17:15:55]

Done.

+  float y_offset = source_rect.origin.y * scaling_factor;
 
   if (center_vertically) {
     x_offset += (rect.size.width -
                      (source_rect.size.width * scaling_factor))/2;
   }
   if (center_horizontally) {
     y_offset += (rect.size.height -
                      (source_rect.size.height * scaling_factor))/2;
-  } else {
-    // Since 0 y begins at the bottom, we need to adjust so the output appears
-    // nearer the top if we are not centering horizontally.
-    y_offset += rect.size.height - (source_rect.size.height * scaling_factor);

[vandebo (ex-Chrome), 2012/01/07 00:23:19]

I think you still need this code.

[kmadhusu, 2012/01/09 17:15:55]

This code is not required with the new changes.

   }
   CGContextSaveGState(context);
   CGContextTranslateCTM(context, x_offset, y_offset);
   CGContextScaleCTM(context, scaling_factor, scaling_factor);
   CGContextDrawPDFPage(context, pdf_page);
   CGContextRestoreGState(context);
   return true;
 }
 
 unsigned int PdfMetafileCg::GetPageCount() const {
@@ skipping 66 matching lines @@
 
   if (!pdf_doc_.get()) {
     ScopedCFTypeRef<CGDataProviderRef> pdf_data_provider(
         CGDataProviderCreateWithCFData(pdf_data_));
     pdf_doc_.reset(CGPDFDocumentCreateWithProvider(pdf_data_provider));
   }
   return pdf_doc_.get();
 }
 
 }  // namespace printing