Source/platform/mac/ScrollAnimatorMac.h - Issue 282743002: Fix page jumping back to initial position after an overflow-bounce scroll.

Side by Side Diff: Source/platform/mac/ScrollAnimatorMac.h

Issue 282743002: Fix page jumping back to initial position after an overflow-bounce scroll. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Remove whitespace from TestExpectations that was causing a rebase failure. Created 6 years, 7 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 | « LayoutTests/rubberbanding/scroll-bounce-fix.html ('k') | Source/platform/mac/ScrollAnimatorMac.mm » ('j') | no next file with comments »

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2010, 2011 Apple Inc. All rights reserved.	2 * Copyright (C) 2010, 2011 Apple Inc. All rights reserved.

3 *	3 *

4 * Redistribution and use in source and binary forms, with or without	4 * Redistribution and use in source and binary forms, with or without

5 * modification, are permitted provided that the following conditions	5 * modification, are permitted provided that the following conditions

6 * are met:	6 * are met:

7 * 1. Redistributions of source code must retain the above copyright	7 * 1. Redistributions of source code must retain the above copyright

8 * notice, this list of conditions and the following disclaimer.	8 * notice, this list of conditions and the following disclaimer.

9 * 2. Redistributions in binary form must reproduce the above copyright	9 * 2. Redistributions in binary form must reproduce the above copyright

10 * notice, this list of conditions and the following disclaimer in the	10 * notice, this list of conditions and the following disclaimer in the

(...skipping 125 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
136 virtual bool allowsVerticalStretching() OVERRIDE;	136 virtual bool allowsVerticalStretching() OVERRIDE;

137 virtual bool pinnedInDirection(const FloatSize&) OVERRIDE;	137 virtual bool pinnedInDirection(const FloatSize&) OVERRIDE;

138 virtual bool canScrollHorizontally() OVERRIDE;	138 virtual bool canScrollHorizontally() OVERRIDE;

139 virtual bool canScrollVertically() OVERRIDE;	139 virtual bool canScrollVertically() OVERRIDE;

140 virtual bool shouldRubberBandInDirection(ScrollDirection) OVERRIDE;	140 virtual bool shouldRubberBandInDirection(ScrollDirection) OVERRIDE;

141 virtual WebCore::IntPoint absoluteScrollPosition() OVERRIDE;	141 virtual WebCore::IntPoint absoluteScrollPosition() OVERRIDE;

142 virtual void immediateScrollByWithoutContentEdgeConstraints(const FloatSize& ) OVERRIDE;	142 virtual void immediateScrollByWithoutContentEdgeConstraints(const FloatSize& ) OVERRIDE;

143 virtual void immediateScrollBy(const FloatSize&) OVERRIDE;	143 virtual void immediateScrollBy(const FloatSize&) OVERRIDE;

144 virtual void startSnapRubberbandTimer() OVERRIDE;	144 virtual void startSnapRubberbandTimer() OVERRIDE;

145 virtual void stopSnapRubberbandTimer() OVERRIDE;	145 virtual void stopSnapRubberbandTimer() OVERRIDE;

	146 virtual void adjustScrollPositionToBoundsIfNecessary() OVERRIDE;

146	147

147 bool pinnedInDirection(float deltaX, float deltaY);	148 bool pinnedInDirection(float deltaX, float deltaY);

148 void snapRubberBandTimerFired(Timer<ScrollAnimatorMac>*);	149 void snapRubberBandTimerFired(Timer<ScrollAnimatorMac>*);

149	150

150 ScrollElasticityController m_scrollElasticityController;	151 ScrollElasticityController m_scrollElasticityController;

151 Timer<ScrollAnimatorMac> m_snapRubberBandTimer;	152 Timer<ScrollAnimatorMac> m_snapRubberBandTimer;

152 #endif	153 #endif

153	154

154 bool m_haveScrolledSincePageLoad;	155 bool m_haveScrolledSincePageLoad;

155 bool m_needsScrollerStyleUpdate;	156 bool m_needsScrollerStyleUpdate;

156 IntRect m_visibleScrollerThumbRect;	157 IntRect m_visibleScrollerThumbRect;

157 };	158 };

158	159

159 } // namespace WebCore	160 } // namespace WebCore

160	161

161 #endif // ScrollAnimatorMac_h	162 #endif // ScrollAnimatorMac_h

OLD	NEW