diff options
| author | Leon Clarke <leonclarke@google.com> | 2010-06-03 14:33:32 +0100 |
|---|---|---|
| committer | Leon Clarke <leonclarke@google.com> | 2010-06-08 12:24:51 +0100 |
| commit | 5af96e2c7b73ebc627c6894727826a7576d31758 (patch) | |
| tree | f9d5e6f6175ccd7e3d14de9b290f08937a0d17ba /WebCore/page/FrameView.h | |
| parent | 8cc4fcf4f6adcbc0e0aebfc24fbad9a4cddf2cfb (diff) | |
| download | external_webkit-5af96e2c7b73ebc627c6894727826a7576d31758.zip external_webkit-5af96e2c7b73ebc627c6894727826a7576d31758.tar.gz external_webkit-5af96e2c7b73ebc627c6894727826a7576d31758.tar.bz2 | |
Merge webkit.org at r60469 : Initial merge by git.
Change-Id: I66a0047aa2af802f66bb0c7f2a8b02247a596234
Diffstat (limited to 'WebCore/page/FrameView.h')
| -rw-r--r-- | WebCore/page/FrameView.h | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/WebCore/page/FrameView.h b/WebCore/page/FrameView.h index 6bd1c21..203dc86 100644 --- a/WebCore/page/FrameView.h +++ b/WebCore/page/FrameView.h @@ -214,6 +214,13 @@ public: bool isFrameViewScrollCorner(RenderScrollbarPart* scrollCorner) const { return m_scrollCorner == scrollCorner; } void invalidateScrollCorner(); + void setZoomFactor(float scale, ZoomMode); + float zoomFactor() const { return m_zoomFactor; } + bool shouldApplyTextZoom() const; + bool shouldApplyPageZoom() const; + float pageZoomFactor() const { return shouldApplyPageZoom() ? m_zoomFactor : 1.0f; } + float textZoomFactor() const { return shouldApplyTextZoom() ? m_zoomFactor : 1.0f; } + private: FrameView(Frame*); @@ -287,7 +294,8 @@ private: unsigned m_slowRepaintObjectCount; unsigned m_fixedObjectCount; - int m_borderX, m_borderY; + int m_borderX; + int m_borderY; Timer<FrameView> m_layoutTimer; bool m_delayedLayout; @@ -343,6 +351,8 @@ private: // Renderer to hold our custom scroll corner. RenderScrollbarPart* m_scrollCorner; + + float m_zoomFactor; }; #if ENABLE(INSPECTOR) |