summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormaruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-01 13:29:22 +0000
committermaruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-01 13:29:22 +0000
commit9171e6fc93203f70449cd43021b5638e30891352 (patch)
treecef84a3ce200902278a8c4823e50a8aecc5a716d
parent51780eba10f8100475f0983e7b465b6b0211b1d9 (diff)
downloadchromium_src-9171e6fc93203f70449cd43021b5638e30891352.zip
chromium_src-9171e6fc93203f70449cd43021b5638e30891352.tar.gz
chromium_src-9171e6fc93203f70449cd43021b5638e30891352.tar.bz2
Fix printing. With a webkit merge, the paint() command started to be delegated to ScrollView instead of FrameView, printing scrollbars on the paper.
TEST=print a long page, no scrollbar should appear and it should print on multiple pages correctly. BUG=3670 Review URL: http://codereview.chromium.org/13012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6139 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--webkit/glue/webframe_impl.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/webkit/glue/webframe_impl.cc b/webkit/glue/webframe_impl.cc
index 58b9e48..70cbc61 100644
--- a/webkit/glue/webframe_impl.cc
+++ b/webkit/glue/webframe_impl.cc
@@ -1788,7 +1788,8 @@ bool WebFrameImpl::SpoolPage(int page, gfx::PlatformCanvas* canvas) {
DCHECK(pages_[page].x() == 0);
// Offset to get the right square.
spool.translate(0, -static_cast<float>(pages_[page].y()));
- frame()->view()->paint(&spool, pages_[page]);
+ // Make sure we're not printing the ScrollView (with scrollbars!)
+ frame()->view()->paintContents(&spool, pages_[page]);
return true;
}