diff options
| author | Steve Block <steveblock@google.com> | 2010-08-04 11:41:34 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-08-09 12:04:44 +0100 |
| commit | db14019a23d96bc8a444b6576a5da8bd1cfbc8b0 (patch) | |
| tree | 9f793c5b0f5e1f2aca8247158920e2c4bf962bbf /WebCore/page/Frame.cpp | |
| parent | bf916837aa84f1e4b00e6ed6268516c2acd27545 (diff) | |
| download | external_webkit-db14019a23d96bc8a444b6576a5da8bd1cfbc8b0.zip external_webkit-db14019a23d96bc8a444b6576a5da8bd1cfbc8b0.tar.gz external_webkit-db14019a23d96bc8a444b6576a5da8bd1cfbc8b0.tar.bz2 | |
Merge WebKit at r64523 : Initial merge by git.
Change-Id: Ibb796c6802e757b1d9b40f58205cfbe4da95fcd4
Diffstat (limited to 'WebCore/page/Frame.cpp')
| -rw-r--r-- | WebCore/page/Frame.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/WebCore/page/Frame.cpp b/WebCore/page/Frame.cpp index 77bf071..c0b11d3 100644 --- a/WebCore/page/Frame.cpp +++ b/WebCore/page/Frame.cpp @@ -621,16 +621,16 @@ void Frame::paintDragCaret(GraphicsContext* p, int tx, int ty, const IntRect& cl #endif } -void Frame::setPrinting(bool printing, float minPageWidth, float maxPageWidth, bool adjustViewSize) +void Frame::setPrinting(bool printing, const FloatSize& pageSize, float maximumShrinkRatio, AdjustViewSizeOrNot shouldAdjustViewSize) { m_doc->setPrinting(printing); view()->adjustMediaTypeForPrinting(printing); m_doc->updateStyleSelector(); - view()->forceLayoutWithPageWidthRange(minPageWidth, maxPageWidth, adjustViewSize); + view()->forceLayoutForPagination(pageSize, maximumShrinkRatio, shouldAdjustViewSize); for (Frame* child = tree()->firstChild(); child; child = child->tree()->nextSibling()) - child->setPrinting(printing, minPageWidth, maxPageWidth, adjustViewSize); + child->setPrinting(printing, pageSize, maximumShrinkRatio, shouldAdjustViewSize); } void Frame::setNeedsReapplyStyles() |