diff options
| author | kmadhusu@chromium.org <kmadhusu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-02 16:44:20 +0000 |
|---|---|---|
| committer | kmadhusu@chromium.org <kmadhusu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-02 16:44:20 +0000 |
| commit | 534c4fb35c8c195c6d82e7e12ac303397e796825 (patch) | |
| tree | 1bfdb823901de172173b19f58b0aab493e1bb932 /chrome/renderer/print_web_view_helper_win.cc | |
| parent | 1c78d786e3889ca1b783ab31ac3a16449e718f6f (diff) | |
| download | chromium_src-534c4fb35c8c195c6d82e7e12ac303397e796825.zip chromium_src-534c4fb35c8c195c6d82e7e12ac303397e796825.tar.gz chromium_src-534c4fb35c8c195c6d82e7e12ac303397e796825.tar.bz2 | |
PrintPreview: Remove |page_number| from StartPageForVectorCanvas function and |page_slot| from PrintMsg_PrintPage_Params.
We will not add preview pages to the complete metafile in out of order fashion.
BUG=none
TEST=print preview works after code changes.
Review URL: http://codereview.chromium.org/7549001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95092 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/print_web_view_helper_win.cc')
| -rw-r--r-- | chrome/renderer/print_web_view_helper_win.cc | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/chrome/renderer/print_web_view_helper_win.cc b/chrome/renderer/print_web_view_helper_win.cc index 477b378..961a15f 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. |