Source/platform/mac/ScrollAnimatorMac.h - Issue 1161713004: Rename ScrollableArea::scroll to userScroll

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

Issue 1161713004: Rename ScrollableArea::scroll to userScroll (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Fixed comment Created 5 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/EventHandler.cpp ('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 62 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
73 RetainPtr<WebScrollbarPainterDelegate> m_horizontalScrollbarPainterDelegate;	73 RetainPtr<WebScrollbarPainterDelegate> m_horizontalScrollbarPainterDelegate;

74 RetainPtr<WebScrollbarPainterDelegate> m_verticalScrollbarPainterDelegate;	74 RetainPtr<WebScrollbarPainterDelegate> m_verticalScrollbarPainterDelegate;

75	75

76 void initialScrollbarPaintTimerFired(Timer<ScrollAnimatorMac>*);	76 void initialScrollbarPaintTimerFired(Timer<ScrollAnimatorMac>*);

77 Timer<ScrollAnimatorMac> m_initialScrollbarPaintTimer;	77 Timer<ScrollAnimatorMac> m_initialScrollbarPaintTimer;

78	78

79 void sendContentAreaScrolledTimerFired(Timer<ScrollAnimatorMac>*);	79 void sendContentAreaScrolledTimerFired(Timer<ScrollAnimatorMac>*);

80 Timer<ScrollAnimatorMac> m_sendContentAreaScrolledTimer;	80 Timer<ScrollAnimatorMac> m_sendContentAreaScrolledTimer;

81 FloatSize m_contentAreaScrolledTimerScrollDelta;	81 FloatSize m_contentAreaScrolledTimerScrollDelta;

82	82

83 virtual ScrollResultOneDimensional scroll(ScrollbarOrientation, ScrollGranul arity, float step, float delta) override;	83 virtual ScrollResultOneDimensional userScroll(ScrollbarOrientation, ScrollGr anularity, float step, float delta) override;

84 virtual void scrollToOffsetWithoutAnimation(const FloatPoint&) override;	84 virtual void scrollToOffsetWithoutAnimation(const FloatPoint&) override;

85	85

86 virtual void handleWheelEventPhase(PlatformWheelEventPhase) override;	86 virtual void handleWheelEventPhase(PlatformWheelEventPhase) override;

87	87

88 virtual void cancelAnimations() override;	88 virtual void cancelAnimations() override;

89 virtual void setIsActive() override;	89 virtual void setIsActive() override;

90	90

91 virtual void contentAreaWillPaint() const override;	91 virtual void contentAreaWillPaint() const override;

92 virtual void mouseEnteredContentArea() const override;	92 virtual void mouseEnteredContentArea() const override;

93 virtual void mouseExitedContentArea() const override;	93 virtual void mouseExitedContentArea() const override;

(...skipping 25 matching lines...) Expand all Loading...
119 void immediateScrollTo(const FloatPoint&);	119 void immediateScrollTo(const FloatPoint&);

120	120

121 bool m_haveScrolledSincePageLoad;	121 bool m_haveScrolledSincePageLoad;

122 bool m_needsScrollerStyleUpdate;	122 bool m_needsScrollerStyleUpdate;

123 IntRect m_visibleScrollerThumbRect;	123 IntRect m_visibleScrollerThumbRect;

124 };	124 };

125	125

126 } // namespace blink	126 } // namespace blink

127	127

128 #endif // ScrollAnimatorMac_h	128 #endif // ScrollAnimatorMac_h

OLD	NEW