From 19b9d3b580c92f4cf80854227d6d4b366bc34871 Mon Sep 17 00:00:00 2001
From: "vandebo@chromium.org"
<vandebo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Sat, 23 Jul 2011 02:08:57 +0000
Subject: Make Metafile::StartPageForVectorCanvas take the page number as an
argument.
This will let us add pages to a metafile out of order for print preview.
Also, make PdfMetafileSkia::GetMetafileForCurrentPage use draft mode, now that it's available.
BUG=NONE
TEST=NONE
Review URL: http://codereview.chromium.org/7481019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93763 0039d316-1c4b-4281-b951-d872f2087c98
---
chrome/renderer/print_web_view_helper_linux.cc | 2 +-
chrome/renderer/print_web_view_helper_mac.mm | 2 +-
chrome/renderer/print_web_view_helper_win.cc | 3 ++-
3 files changed, 4 insertions(+), 3 deletions(-)
(limited to 'chrome/renderer')
diff --git a/chrome/renderer/print_web_view_helper_linux.cc b/chrome/renderer/print_web_view_helper_linux.cc
index 8c6dad9..f293e21 100644
--- a/chrome/renderer/print_web_view_helper_linux.cc
+++ b/chrome/renderer/print_web_view_helper_linux.cc
@@ -194,7 +194,7 @@ void PrintWebViewHelper::PrintPageInternal(
content_width_in_points, content_height_in_points);
SkDevice* device = metafile->StartPageForVectorCanvas(
- page_size, content_area, 1.0f);
+ params.page_number, page_size, content_area, 1.0f);
if (!device)
return;
diff --git a/chrome/renderer/print_web_view_helper_mac.mm b/chrome/renderer/print_web_view_helper_mac.mm
index 3836161f..f5ded39 100644
--- a/chrome/renderer/print_web_view_helper_mac.mm
+++ b/chrome/renderer/print_web_view_helper_mac.mm
@@ -82,7 +82,7 @@ void PrintWebViewHelper::RenderPage(
{
#if defined(USE_SKIA)
SkDevice* device = metafile->StartPageForVectorCanvas(
- page_size, content_area, scale_factor);
+ page_number, page_size, content_area, scale_factor);
if (!device)
return;
diff --git a/chrome/renderer/print_web_view_helper_win.cc b/chrome/renderer/print_web_view_helper_win.cc
index 4627e0d..b25cafd 100644
--- a/chrome/renderer/print_web_view_helper_win.cc
+++ b/chrome/renderer/print_web_view_helper_win.cc
@@ -176,7 +176,8 @@ void PrintWebViewHelper::RenderPage(
static_cast<int>(content_width_in_points),
static_cast<int>(content_height_in_points));
SkDevice* device = (*metafile)->StartPageForVectorCanvas(
- page_size, content_area, frame->getPrintPageShrink(page_number));
+ 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.
--
cgit v1.1