Chromium Code Reviews| Index: Source/core/page/FrameView.h |
| diff --git a/Source/core/page/FrameView.h b/Source/core/page/FrameView.h |
| index 4ba0c386f7e5ed36b9b14e8796fd7c63ea1e0d8a..52ccf39bc63f9847875ed49c72e21d931d09de62 100644 |
| --- a/Source/core/page/FrameView.h |
| +++ b/Source/core/page/FrameView.h |
| @@ -328,16 +328,12 @@ public: |
| // distinguish between the two. |
| const Pagination& pagination() const; |
| void setPagination(const Pagination&); |
| - |
| + |
| bool inProgrammaticScroll() const { return m_inProgrammaticScroll; } |
| void setInProgrammaticScroll(bool programmaticScroll) { m_inProgrammaticScroll = programmaticScroll; } |
| void setHasSoftwareFilters(bool hasSoftwareFilters) { m_hasSoftwareFilters = hasSoftwareFilters; } |
| bool hasSoftwareFilters() const { return m_hasSoftwareFilters; } |
| -#if ENABLE(CSS_DEVICE_ADAPTATION) |
| - IntSize initialViewportSize() const { return m_initialViewportSize; } |
| - void setInitialViewportSize(const IntSize& size) { m_initialViewportSize = size; } |
| -#endif |
| virtual bool isActive() const OVERRIDE; |
| @@ -537,11 +533,9 @@ private: |
| static double s_deferredRepaintDelayIncrementDuringLoading; |
| bool m_hasSoftwareFilters; |
| -#if ENABLE(CSS_DEVICE_ADAPTATION) |
| // Size of viewport before any UA or author styles have overridden |
| // the viewport given by the window or viewing area of the UA. |
| IntSize m_initialViewportSize; |
| -#endif |
|
rune
2013/06/10 07:35:18
Is m_initialViewportSize used anymore?
|
| float m_visibleContentScaleFactor; |
| }; |