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/FrameView.h | |
| 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/FrameView.h')
| -rw-r--r-- | WebCore/page/FrameView.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/WebCore/page/FrameView.h b/WebCore/page/FrameView.h index 718b793..9765c6f 100644 --- a/WebCore/page/FrameView.h +++ b/WebCore/page/FrameView.h @@ -199,7 +199,8 @@ public: void setIsVisuallyNonEmpty() { m_isVisuallyNonEmpty = true; } void forceLayout(bool allowSubtree = false); - void forceLayoutWithPageWidthRange(float minPageWidth, float maxPageWidth, bool adjustViewSize); + void forceLayoutForPagination(const FloatSize& pageSize, float maximumShrinkFactor, Frame::AdjustViewSizeOrNot); + int pageHeight() const { return m_pageHeight; } void adjustPageHeight(float* newBottom, float oldTop, float oldBottom, float bottomLimit); @@ -332,6 +333,8 @@ private: String m_mediaType; String m_mediaTypeWhenNotPrinting; + int m_pageHeight; + unsigned m_enqueueEvents; Vector<ScheduledEvent*> m_scheduledEvents; |