| Index: Source/core/frame/FrameView.h
|
| diff --git a/Source/core/frame/FrameView.h b/Source/core/frame/FrameView.h
|
| index 8db5cf6ad089e0a0bef5528a16ad0a19ce294b95..8fd4a168667bd74b2c5068cb5c444c6773b485a3 100644
|
| --- a/Source/core/frame/FrameView.h
|
| +++ b/Source/core/frame/FrameView.h
|
| @@ -26,7 +26,6 @@
|
| #define FrameView_h
|
|
|
| #include "core/frame/AdjustViewSizeOrNot.h"
|
| -#include "core/rendering/Pagination.h"
|
| #include "core/rendering/PaintPhase.h"
|
| #include "core/rendering/PartialLayoutState.h"
|
| #include "platform/geometry/LayoutRect.h"
|
| @@ -52,8 +51,6 @@ class RenderScrollbarPart;
|
| class RenderStyle;
|
| class RenderWidget;
|
|
|
| -Pagination::Mode paginationModeForRenderStyle(RenderStyle*);
|
| -
|
| typedef unsigned long long DOMTimeStamp;
|
|
|
| class FrameView FINAL : public ScrollView {
|
| @@ -296,8 +293,6 @@ public:
|
| // we need this function in order to do the scroll ourselves.
|
| bool wheelEvent(const PlatformWheelEvent&);
|
|
|
| - const Pagination& pagination() const { return m_pagination; }
|
| -
|
| bool inProgrammaticScroll() const { return m_inProgrammaticScroll; }
|
| void setInProgrammaticScroll(bool programmaticScroll) { m_inProgrammaticScroll = programmaticScroll; }
|
|
|
| @@ -338,9 +333,6 @@ private:
|
| bool contentsInCompositedLayer() const;
|
|
|
| void applyOverflowToViewportAndSetRenderer(RenderObject*, ScrollbarMode& hMode, ScrollbarMode& vMode);
|
| - void applyPaginationToViewport();
|
| - void setPagination(const Pagination&);
|
| -
|
| void updateOverflowStatus(bool horizontalOverflow, bool verticalOverflow);
|
|
|
| void paintControlTints();
|
| @@ -468,8 +460,6 @@ private:
|
| bool m_verticalOverflow;
|
| RenderObject* m_viewportRenderer;
|
|
|
| - Pagination m_pagination;
|
| -
|
| bool m_wasScrolledByUser;
|
| bool m_inProgrammaticScroll;
|
| bool m_safeToPropagateScrollToParent;
|
|
|