chrome/renderer/print_web_view_helper_mac.mm - Issue 8585017: PrintPreview: Honor the print media page size and margin values.

Unified Diff: chrome/renderer/print_web_view_helper_mac.mm

Issue 8585017: PrintPreview: Honor the print media page size and margin values. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix win and mac issues Created 8 years, 12 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« chrome/renderer/print_web_view_helper.cc ('K') | « chrome/renderer/print_web_view_helper_linux.cc ('k') | chrome/renderer/print_web_view_helper_win.cc » ('j') | chrome/renderer/print_web_view_helper_win.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 5962a1a9dfe3d6ddbbc1d9f6354d7147f25dcb41..6e6a6b58a10b4c0172e053a58a4ce034f3641043 100644

--- a/chrome/renderer/print_web_view_helper_mac.mm

+++ b/chrome/renderer/print_web_view_helper_mac.mm

@@ -32,13 +32,12 @@ void PrintWebViewHelper::PrintPageInternal(

if (!metafile.Init())

return;

- float scale_factor = frame->getPrintPageShrink(params.page_number);

+ double scale_factor = 1.0f;

int page_number = params.page_number;

- // Render page for printing.

- gfx::Rect content_area(params.params.content_size);

- RenderPage(params.params.content_size, content_area, scale_factor,

- page_number, frame, false, &metafile);

+ gfx::Size page_size_in_dpi;

+ gfx::Rect content_area_in_dpi;

+ RenderPage(print_pages_params_->params, page_number, frame, false, &metafile,

+ &scale_factor, &page_size_in_dpi, &content_area_in_dpi);

metafile.FinishDocument();

PrintHostMsg_DidPrintPage_Params page_params;

@@ -46,11 +45,8 @@ void PrintWebViewHelper::PrintPageInternal(

page_params.page_number = page_number;

page_params.document_cookie = params.params.document_cookie;

page_params.actual_shrink = scale_factor;

vandebo (ex-Chrome) 2012/01/07 00:23:19 Since this isn't used, can we clean up the RenderP

kmadhusu 2012/01/09 17:15:55 Removed scale_factor in RenderPage params list.

- page_params.page_size = params.params.page_size;

- page_params.content_area = gfx::Rect(params.params.margin_left,

- params.params.margin_top,

- params.params.content_size.width(),

- params.params.content_size.height());

+ page_params.page_size = page_size_in_dpi;

+ page_params.content_area = content_area_in_dpi;

// Ask the browser to create the shared memory for us.

if (!CopyMetafileDataToSharedMem(&metafile,

@@ -62,12 +58,8 @@ void PrintWebViewHelper::PrintPageInternal(

}

bool PrintWebViewHelper::RenderPreviewPage(int page_number) {

- float scale_factor = print_preview_context_.frame()->getPrintPageShrink(0);

+ double scale_factor = 1.0f;

PrintMsg_Print_Params printParams = print_preview_context_.print_params();

- gfx::Rect content_area(printParams.margin_left, printParams.margin_top,

- printParams.content_size.width(),

- printParams.content_size.height());

scoped_ptr<printing::Metafile> draft_metafile;

printing::Metafile* initial_render_metafile =

print_preview_context_.metafile();

@@ -96,8 +88,9 @@ bool PrintWebViewHelper::RenderPreviewPage(int page_number) {

}

base::TimeTicks begin_time = base::TimeTicks::Now();

- RenderPage(printParams.page_size, content_area, scale_factor, page_number,

- print_preview_context_.frame(), true, initial_render_metafile);

+ gfx::Size page_size;

+ RenderPage(printParams, page_number, print_preview_context_.frame(), true,

+ initial_render_metafile, &scale_factor, &page_size, NULL);

print_preview_context_.RenderedPreviewPage(

base::TimeTicks::Now() - begin_time);

@@ -111,13 +104,13 @@ bool PrintWebViewHelper::RenderPreviewPage(int page_number) {

// drawing.

printing::Metafile* print_ready_metafile =

print_preview_context_.metafile();

- bool success = print_ready_metafile->StartPage(

- printParams.page_size, gfx::Rect(printParams.page_size), 1.0);

+ bool success = print_ready_metafile->StartPage(page_size,

+ gfx::Rect(page_size), 1.0);

DCHECK(success);

// StartPage unconditionally flips the content over, flip it back since it

// was already flipped in |draft_metafile|.

CGContextTranslateCTM(print_ready_metafile->context(), 0,

- printParams.page_size.height());

+ page_size.height());

CGContextScaleCTM(print_ready_metafile->context(), 1.0, -1.0);

draft_metafile->RenderPage(1,

print_ready_metafile->context(),

@@ -143,14 +136,26 @@ 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,

- bool is_preview, printing::Metafile* metafile) {

+ const PrintMsg_Print_Params& params, int page_number, WebFrame* frame,

+ bool is_preview, printing::Metafile* metafile, double* scale_factor,

+ gfx::Size* page_size, gfx::Rect* content_rect) {

+ double webkit_shrink_factor = frame->getPrintPageShrink(page_number);

+ float webkit_scale_factor = 1.0;

+ printing::PageSizeMargins page_layout_in_points;

+ gfx::Rect content_area;

+ ComputePageLayoutInPoints(frame, page_number, params, ignore_css_margins_,

+ fit_to_page_, scale_factor, &page_layout_in_points);

+ GetPageSizeAndContentAreaFromPageLayout(page_layout_in_points, page_size,

+ &content_area);

+ if (content_rect)

+ *content_rect = content_area;

+ *scale_factor *= webkit_shrink_factor;

{

#if defined(USE_SKIA)

SkDevice* device = metafile->StartPageForVectorCanvas(

- page_size, content_area, scale_factor);

+ *page_size, content_area, *scale_factor);

if (!device)

return;

@@ -161,7 +166,7 @@ void PrintWebViewHelper::RenderPage(

skia::SetIsDraftMode(*canvas, is_print_ready_metafile_sent_);

skia::SetIsPreviewMetafile(*canvas, is_preview);

#else

- bool success = metafile->StartPage(page_size, content_area, scale_factor);

+ bool success = metafile->StartPage(*page_size, content_area, *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

@@ -169,14 +174,7 @@ void PrintWebViewHelper::RenderPage(

base::mac::ScopedNSAutoreleasePool pool;

CGContextRef cgContext = metafile->context();

CGContextRef canvas_ptr = cgContext;

-#endif

- printing::PageSizeMargins page_layout_in_points;

- GetPageSizeAndMarginsInPoints(frame, page_number,

- print_pages_params_->params,

- &page_layout_in_points);

-#if !defined(USE_SKIA)

// For CoreGraphics, print in the margins before printing in the content

// area so that we don't spill over. Webkit draws a white background in the

// content area and this acts as a clip.

@@ -185,23 +183,24 @@ void PrintWebViewHelper::RenderPage(

if (print_pages_params_->params.display_header_footer) {

PrintHeaderAndFooter(canvas_ptr, page_number + 1,

print_preview_context_.total_page_count(),

- scale_factor, page_layout_in_points,

+ *scale_factor, page_layout_in_points,

*header_footer_info_);

}

#endif // !USE_SKIA

- frame->printPage(page_number, canvas_ptr);

+ webkit_scale_factor = frame->printPage(page_number, canvas_ptr);

vandebo (ex-Chrome) 2012/01/07 00:23:19 We don't need the return value...

kmadhusu 2012/01/09 17:15:55 Fixed.

#if defined(USE_SKIA)

if (print_pages_params_->params.display_header_footer) {

// |page_number| is 0-based, so 1 is added.

PrintHeaderAndFooter(canvas_ptr, page_number + 1,

print_preview_context_.total_page_count(),

- scale_factor, page_layout_in_points,

+ *scale_factor, page_layout_in_points,

*header_footer_info_);

}

#endif // defined(USE_SKIA)

}

+ *scale_factor /= webkit_scale_factor;

// Done printing. Close the device context to retrieve the compiled metafile.

metafile->FinishPage();