Source/core/rendering/RenderLayerScrollableArea.h - Issue 343663003: Revert "Enable Scroll Animation for RenderLayerScrollableArea"

Side by Side Diff: Source/core/rendering/RenderLayerScrollableArea.h

Issue 343663003: Revert "Enable Scroll Animation for RenderLayerScrollableArea" (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: fix compile error in PageAnimator Created 6 years, 6 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 unified diff | Download patch

« no previous file with comments | « Source/core/page/PageAnimator.cpp ('k') | Source/core/rendering/RenderLayerScrollableArea.cpp » ('j') | no next file with comments »

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2003, 2009, 2012 Apple Inc. All rights reserved.	2 * Copyright (C) 2003, 2009, 2012 Apple Inc. All rights reserved.

3 *	3 *

4 * Portions are Copyright (C) 1998 Netscape Communications Corporation.	4 * Portions are Copyright (C) 1998 Netscape Communications Corporation.

5 *	5 *

6 * Other contributors:	6 * Other contributors:

7 * Robert O'Callahan <roc+@cs.cmu.edu>	7 * Robert O'Callahan <roc+@cs.cmu.edu>

8 * David Baron <dbaron@fas.harvard.edu>	8 * David Baron <dbaron@fas.harvard.edu>

9 * Christian Biesinger <cbiesinger@web.de>	9 * Christian Biesinger <cbiesinger@web.de>

10 * Randall Jesup <rjesup@wgate.com>	10 * Randall Jesup <rjesup@wgate.com>

(...skipping 80 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
91 virtual void setScrollOffset(const IntPoint&) OVERRIDE;	91 virtual void setScrollOffset(const IntPoint&) OVERRIDE;

92 virtual IntPoint scrollPosition() const OVERRIDE;	92 virtual IntPoint scrollPosition() const OVERRIDE;

93 virtual IntPoint minimumScrollPosition() const OVERRIDE;	93 virtual IntPoint minimumScrollPosition() const OVERRIDE;

94 virtual IntPoint maximumScrollPosition() const OVERRIDE;	94 virtual IntPoint maximumScrollPosition() const OVERRIDE;

95 virtual IntRect visibleContentRect(IncludeScrollbarsInRect) const OVERRIDE;	95 virtual IntRect visibleContentRect(IncludeScrollbarsInRect) const OVERRIDE;

96 virtual int visibleHeight() const OVERRIDE;	96 virtual int visibleHeight() const OVERRIDE;

97 virtual int visibleWidth() const OVERRIDE;	97 virtual int visibleWidth() const OVERRIDE;

98 virtual IntSize contentsSize() const OVERRIDE;	98 virtual IntSize contentsSize() const OVERRIDE;

99 virtual IntSize overhangAmount() const OVERRIDE;	99 virtual IntSize overhangAmount() const OVERRIDE;

100 virtual IntPoint lastKnownMousePosition() const OVERRIDE;	100 virtual IntPoint lastKnownMousePosition() const OVERRIDE;

101 virtual bool scrollAnimatorEnabled() const OVERRIDE;

102 virtual bool scheduleAnimation() OVERRIDE;

103 virtual bool shouldSuspendScrollAnimations() const OVERRIDE;	101 virtual bool shouldSuspendScrollAnimations() const OVERRIDE;

104 virtual bool scrollbarsCanBeActive() const OVERRIDE;	102 virtual bool scrollbarsCanBeActive() const OVERRIDE;

105 virtual IntRect scrollableAreaBoundingBox() const OVERRIDE;	103 virtual IntRect scrollableAreaBoundingBox() const OVERRIDE;

106 virtual bool userInputScrollable(ScrollbarOrientation) const OVERRIDE;	104 virtual bool userInputScrollable(ScrollbarOrientation) const OVERRIDE;

107 virtual bool shouldPlaceVerticalScrollbarOnLeft() const OVERRIDE;	105 virtual bool shouldPlaceVerticalScrollbarOnLeft() const OVERRIDE;

108 virtual int pageStep(ScrollbarOrientation) const OVERRIDE;	106 virtual int pageStep(ScrollbarOrientation) const OVERRIDE;

109	107

110 int scrollXOffset() const { return m_scrollOffset.width() + scrollOrigin().x (); }	108 int scrollXOffset() const { return m_scrollOffset.width() + scrollOrigin().x (); }

111 int scrollYOffset() const { return m_scrollOffset.height() + scrollOrigin(). y(); }	109 int scrollYOffset() const { return m_scrollOffset.height() + scrollOrigin(). y(); }

112	110

(...skipping 129 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
242 // Renderers to hold our custom scroll corner.	240 // Renderers to hold our custom scroll corner.

243 RenderScrollbarPart* m_scrollCorner;	241 RenderScrollbarPart* m_scrollCorner;

244	242

245 // Renderers to hold our custom resizer.	243 // Renderers to hold our custom resizer.

246 RenderScrollbarPart* m_resizer;	244 RenderScrollbarPart* m_resizer;

247 };	245 };

248	246

249 } // Namespace WebCore	247 } // Namespace WebCore

250	248

251 #endif // RenderLayerScrollableArea_h	249 #endif // RenderLayerScrollableArea_h

OLD	NEW