| Index: chrome/renderer/print_web_view_helper_mac.mm
|
| diff --git a/chrome/renderer/print_web_view_helper_mac.mm b/chrome/renderer/print_web_view_helper_mac.mm
|
| index 1700f669af18fc4a068f1e166c7aececcd6b1ffb..7ee385e879be2891ceab87c1aa1c6936cd6d5bfa 100644
|
| --- a/chrome/renderer/print_web_view_helper_mac.mm
|
| +++ b/chrome/renderer/print_web_view_helper_mac.mm
|
| @@ -32,7 +32,7 @@ void PrintWebViewHelper::PrintPageInternal(
|
| if (!metafile.Init())
|
| return;
|
|
|
| - float scale_factor = frame->getPrintPageShrink(params.page_number);
|
| + double scale_factor = frame->getPrintPageShrink(params.page_number);
|
| int page_number = params.page_number;
|
|
|
| // Render page for printing.
|
| @@ -62,7 +62,7 @@ void PrintWebViewHelper::PrintPageInternal(
|
| }
|
|
|
| bool PrintWebViewHelper::RenderPreviewPage(int page_number) {
|
| - float scale_factor = print_preview_context_.frame()->getPrintPageShrink(0);
|
| + double scale_factor = print_preview_context_.frame()->getPrintPageShrink(0);
|
| PrintMsg_Print_Params printParams = print_preview_context_.print_params();
|
| gfx::Rect content_area(printParams.margin_left, printParams.margin_top,
|
| printParams.printable_size.width(),
|
| @@ -144,7 +144,7 @@ bool PrintWebViewHelper::RenderPreviewPage(int page_number) {
|
|
|
| void PrintWebViewHelper::RenderPage(
|
| const gfx::Size& page_size, const gfx::Rect& content_area,
|
| - const float& scale_factor, int page_number, WebFrame* frame,
|
| + const double& scale_factor, int page_number, WebFrame* frame,
|
| bool is_preview, printing::Metafile* metafile) {
|
|
|
| {
|
| @@ -172,9 +172,10 @@ void PrintWebViewHelper::RenderPage(
|
| #endif
|
|
|
| printing::PageSizeMargins page_layout_in_points;
|
| - GetPageSizeAndMarginsInPoints(frame, page_number,
|
| - print_pages_params_->params,
|
| - &page_layout_in_points);
|
| + GetPageSizeAndMarginsInPoints(
|
| + frame, page_number, print_pages_params_->params,
|
| + ignore_frame_margins_css_, fit_to_page_, NULL,
|
| + &page_layout_in_points);
|
|
|
| #if !defined(USE_SKIA)
|
| // For CoreGraphics, print in the margins before printing in the content
|
|
|