Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4853)

Unified Diff: chrome/renderer/print_web_view_helper_win.cc

Issue 7549001: PrintPreview: Remove |page_number| from StartPageForVectorCanvas function. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed nit Created 9 years, 5 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
« no previous file with comments | « chrome/renderer/print_web_view_helper_mac.mm ('k') | printing/emf_win.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/print_web_view_helper_win.cc
diff --git a/chrome/renderer/print_web_view_helper_win.cc b/chrome/renderer/print_web_view_helper_win.cc
index 477b37835382f0424e3ee7030ed1a894783f590c..961a15f53e46e47ae72ece66624a9cf3e11fca13 100644
--- a/chrome/renderer/print_web_view_helper_win.cc
+++ b/chrome/renderer/print_web_view_helper_win.cc
@@ -84,14 +84,13 @@ void PrintWebViewHelper::PrintPageInternal(
skia::InitializeDC(metafile->context());
int page_number = params.page_number;
- int page_slot = params.page_slot;
// Calculate the dpi adjustment.
float scale_factor = static_cast<float>(params.params.desired_dpi /
params.params.dpi);
// Render page for printing.
- RenderPage(params.params, &scale_factor, page_number, page_slot, false, frame,
+ RenderPage(params.params, &scale_factor, page_number, false, frame,
&metafile);
// Close the device context to retrieve the compiled metafile.
@@ -133,8 +132,7 @@ void PrintWebViewHelper::RenderPreviewPage(int page_number) {
scoped_ptr<Metafile> metafile(print_preview_context_.metafile());
base::TimeTicks begin_time = base::TimeTicks::Now();
- RenderPage(print_params, &scale_factor, page_number,
- print_preview_context_.GetPageSlotForPage(page_number), true,
+ RenderPage(print_params, &scale_factor, page_number, true,
print_preview_context_.frame(), &metafile);
print_preview_context_.RenderedPreviewPage(
@@ -152,8 +150,7 @@ void PrintWebViewHelper::RenderPreviewPage(int page_number) {
void PrintWebViewHelper::RenderPage(
const PrintMsg_Print_Params& params, float* scale_factor, int page_number,
- int page_slot, bool is_preview, WebFrame* frame,
- scoped_ptr<Metafile>* metafile) {
+ bool is_preview, WebFrame* frame, scoped_ptr<Metafile>* metafile) {
PageSizeMargins page_layout_in_points;
GetPageSizeAndMarginsInPoints(frame, page_number, params,
&page_layout_in_points);
@@ -182,8 +179,7 @@ void PrintWebViewHelper::RenderPage(
static_cast<int>(page_layout_in_points.content_width),
static_cast<int>(page_layout_in_points.content_height));
SkDevice* device = (*metafile)->StartPageForVectorCanvas(
- page_slot, page_size, content_area,
- frame->getPrintPageShrink(page_number));
+ page_size, content_area, frame->getPrintPageShrink(page_number));
DCHECK(device);
// The printPage method may take a reference to the canvas we pass down, so it
// can't be a stack object.
« no previous file with comments | « chrome/renderer/print_web_view_helper_mac.mm ('k') | printing/emf_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698