Source/platform/mac/ScrollAnimatorMac.h - Issue 1158673006: Replace various ScrollableArea scroll methods with setScrollPosition

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

Issue 1158673006: Replace various ScrollableArea scroll methods with setScrollPosition (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Rebase 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

« Source/modules/accessibility/AXObject.cpp ('K') | « Source/platform/graphics/GraphicsLayerTest.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_verticalScrollbarPainterDelegate;	73 RetainPtr<WebScrollbarPainterDelegate> m_verticalScrollbarPainterDelegate;

74	74

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

76 Timer<ScrollAnimatorMac> m_initialScrollbarPaintTimer;	76 Timer<ScrollAnimatorMac> m_initialScrollbarPaintTimer;

77	77

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

79 Timer<ScrollAnimatorMac> m_sendContentAreaScrolledTimer;	79 Timer<ScrollAnimatorMac> m_sendContentAreaScrolledTimer;

80 FloatSize m_contentAreaScrolledTimerScrollDelta;	80 FloatSize m_contentAreaScrolledTimerScrollDelta;

81	81

82 virtual ScrollResultOneDimensional userScroll(ScrollbarOrientation, ScrollGr anularity, float step, float delta) override;	82 virtual ScrollResultOneDimensional userScroll(ScrollbarOrientation, ScrollGr anularity, float step, float delta) override;

83 virtual void scrollToOffsetWithoutAnimation(const FloatPoint&) override;	83 virtual void scrollToOffsetWithoutAnimation(const FloatPoint&, ScrollType) o verride;

84	84

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

86	86

87 virtual void cancelAnimations() override;	87 virtual void cancelAnimations() override;

88 virtual void setIsActive() override;	88 virtual void setIsActive() override;

89	89

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

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

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

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

(...skipping 14 matching lines...) Expand all Loading...
108 virtual void willRemoveVerticalScrollbar(Scrollbar*) override;	108 virtual void willRemoveVerticalScrollbar(Scrollbar*) override;

109 virtual void didAddHorizontalScrollbar(Scrollbar*) override;	109 virtual void didAddHorizontalScrollbar(Scrollbar*) override;

110 virtual void willRemoveHorizontalScrollbar(Scrollbar*) override;	110 virtual void willRemoveHorizontalScrollbar(Scrollbar*) override;

111	111

112 virtual bool shouldScrollbarParticipateInHitTesting(Scrollbar*) override;	112 virtual bool shouldScrollbarParticipateInHitTesting(Scrollbar*) override;

113	113

114 virtual void notifyContentAreaScrolled(const FloatSize& delta) override;	114 virtual void notifyContentAreaScrolled(const FloatSize& delta) override;

115	115

116 FloatPoint adjustScrollPositionIfNecessary(const FloatPoint&) const;	116 FloatPoint adjustScrollPositionIfNecessary(const FloatPoint&) const;

117	117

118 void immediateScrollTo(const FloatPoint&);	118 void immediateScrollTo(const FloatPoint&, ScrollType);

119	119

120 bool m_haveScrolledSincePageLoad;	120 bool m_haveScrolledSincePageLoad;

121 bool m_needsScrollerStyleUpdate;	121 bool m_needsScrollerStyleUpdate;

122 IntRect m_visibleScrollerThumbRect;	122 IntRect m_visibleScrollerThumbRect;

123 };	123 };

124	124

125 } // namespace blink	125 } // namespace blink

126	126

127 #endif // ScrollAnimatorMac_h	127 #endif // ScrollAnimatorMac_h

OLD	NEW