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

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

Issue 122093002: Fix page jumping back to initial position after an overflow-bounce scroll. Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: does not fail :-/ Created 6 years, 11 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 | Annotate | Revision Log

« LayoutTests/rubberbanding/scroll-bounce-fix.html ('K') | « LayoutTests/rubberbanding/scroll-bounce-fix.html ('k') | Source/platform/mac/ScrollAnimatorMac.mm » ('j') | Source/platform/mac/ScrollElasticityController.mm » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 126 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
137 virtual bool allowsVerticalStretching() OVERRIDE;	137 virtual bool allowsVerticalStretching() OVERRIDE;

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

139 virtual bool canScrollHorizontally() OVERRIDE;	139 virtual bool canScrollHorizontally() OVERRIDE;

140 virtual bool canScrollVertically() OVERRIDE;	140 virtual bool canScrollVertically() OVERRIDE;

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

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

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

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

145 virtual void startSnapRubberbandTimer() OVERRIDE;	145 virtual void startSnapRubberbandTimer() OVERRIDE;

146 virtual void stopSnapRubberbandTimer() OVERRIDE;	146 virtual void stopSnapRubberbandTimer() OVERRIDE;

	147 virtual void adjustScrollPositionToBoundsIfNecessary() OVERRIDE;

147	148

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

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

150	151

151 ScrollElasticityController m_scrollElasticityController;	152 ScrollElasticityController m_scrollElasticityController;

152 Timer<ScrollAnimatorMac> m_snapRubberBandTimer;	153 Timer<ScrollAnimatorMac> m_snapRubberBandTimer;

153 #endif	154 #endif

154	155

155 bool m_haveScrolledSincePageLoad;	156 bool m_haveScrolledSincePageLoad;

156 bool m_needsScrollerStyleUpdate;	157 bool m_needsScrollerStyleUpdate;

157 IntRect m_visibleScrollerThumbRect;	158 IntRect m_visibleScrollerThumbRect;

158 };	159 };

159	160

160 } // namespace WebCore	161 } // namespace WebCore

161	162

162 #endif // ScrollAnimatorMac_h	163 #endif // ScrollAnimatorMac_h

OLD	NEW