diff options
author | Steve Block <steveblock@google.com> | 2009-10-08 17:19:54 +0100 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2009-10-20 00:41:58 +0100 |
commit | 231d4e3152a9c27a73b6ac7badbe6be673aa3ddf (patch) | |
tree | a6c7e2d6cd7bfa7011cc39abbb436142d7a4a7c8 /WebCore/page/chromium/FrameChromium.cpp | |
parent | e196732677050bd463301566a68a643b6d14b907 (diff) | |
download | external_webkit-231d4e3152a9c27a73b6ac7badbe6be673aa3ddf.zip external_webkit-231d4e3152a9c27a73b6ac7badbe6be673aa3ddf.tar.gz external_webkit-231d4e3152a9c27a73b6ac7badbe6be673aa3ddf.tar.bz2 |
Merge webkit.org at R49305 : Automatic merge by git.
Change-Id: I8968561bc1bfd72b8923b7118d3728579c6dbcc7
Diffstat (limited to 'WebCore/page/chromium/FrameChromium.cpp')
-rw-r--r-- | WebCore/page/chromium/FrameChromium.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/WebCore/page/chromium/FrameChromium.cpp b/WebCore/page/chromium/FrameChromium.cpp index 1372cd9..d79ae68 100644 --- a/WebCore/page/chromium/FrameChromium.cpp +++ b/WebCore/page/chromium/FrameChromium.cpp @@ -60,7 +60,7 @@ void computePageRectsForFrame(Frame* frame, const IntRect& printRect, float head float ratio = static_cast<float>(printRect.height()) / static_cast<float>(printRect.width()); - float pageWidth = static_cast<float>(root->overflowWidth()); + float pageWidth = static_cast<float>(root->rightLayoutOverflow()); float pageHeight = pageWidth * ratio; outPageHeight = static_cast<int>(pageHeight); // this is the height of the page adjusted by margins pageHeight -= (headerHeight + footerHeight); |