Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(921)

Unified Diff: Source/core/frame/FrameView.h

Issue 157553002: Remove the Pagination struct, clean up viewport scroll policy propagation. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/core/frame/FrameView.h
diff --git a/Source/core/frame/FrameView.h b/Source/core/frame/FrameView.h
index c1dd4aac3a1e441b23c6e669b550031bf798d545..14de6557c822500816bfd2c716de5ae1a327c12a 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 {
@@ -294,8 +291,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; }
@@ -336,9 +331,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();
@@ -464,8 +456,6 @@ private:
bool m_verticalOverflow;
RenderObject* m_viewportRenderer;
- Pagination m_pagination;
-
bool m_wasScrolledByUser;
bool m_inProgrammaticScroll;
bool m_safeToPropagateScrollToParent;

Powered by Google App Engine
This is Rietveld 408576698