Source/core/rendering/RenderLayerScrollableArea.h - Issue 214953004: Enable Scroll Animation for RenderLayerScrollableArea

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

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

Patch Set: Add test expectation for Mac failure Created 6 years, 8 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 84 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
95 virtual void setScrollOffset(const IntPoint&) OVERRIDE;	95 virtual void setScrollOffset(const IntPoint&) OVERRIDE;

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

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

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

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

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

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

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

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

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

	105 virtual bool scrollAnimatorEnabled() const OVERRIDE;

	106 virtual bool scheduleAnimation() OVERRIDE;

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

106 virtual bool scrollbarsCanBeActive() const OVERRIDE;	108 virtual bool scrollbarsCanBeActive() const OVERRIDE;

107 virtual IntRect scrollableAreaBoundingBox() const OVERRIDE;	109 virtual IntRect scrollableAreaBoundingBox() const OVERRIDE;

108 virtual bool userInputScrollable(ScrollbarOrientation) const OVERRIDE;	110 virtual bool userInputScrollable(ScrollbarOrientation) const OVERRIDE;

109 virtual bool shouldPlaceVerticalScrollbarOnLeft() const OVERRIDE;	111 virtual bool shouldPlaceVerticalScrollbarOnLeft() const OVERRIDE;

110 virtual int pageStep(ScrollbarOrientation) const OVERRIDE;	112 virtual int pageStep(ScrollbarOrientation) const OVERRIDE;

111	113

112 int scrollXOffset() const { return m_scrollOffset.width() + scrollOrigin().x (); }	114 int scrollXOffset() const { return m_scrollOffset.width() + scrollOrigin().x (); }

113 int scrollYOffset() const { return m_scrollOffset.height() + scrollOrigin(). y(); }	115 int scrollYOffset() const { return m_scrollOffset.height() + scrollOrigin(). y(); }

114	116

(...skipping 138 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
253 // Renderers to hold our custom scroll corner.	255 // Renderers to hold our custom scroll corner.

254 RenderScrollbarPart* m_scrollCorner;	256 RenderScrollbarPart* m_scrollCorner;

255	257

256 // Renderers to hold our custom resizer.	258 // Renderers to hold our custom resizer.

257 RenderScrollbarPart* m_resizer;	259 RenderScrollbarPart* m_resizer;

258 };	260 };

259	261

260 } // Namespace WebCore	262 } // Namespace WebCore

261	263

262 #endif // RenderLayerScrollableArea_h	264 #endif // RenderLayerScrollableArea_h

OLD	NEW