Source/platform/scroll/ScrollAnimator.h - Issue 1298973004: Remove special wheel handling path from ScrollableArea

Side by Side Diff: Source/platform/scroll/ScrollAnimator.h

Issue 1298973004: Remove special wheel handling path from ScrollableArea (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Created 5 years, 4 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/core/input/EventHandler.cpp ('K') | « Source/core/input/EventHandler.cpp ('k') | Source/platform/scroll/ScrollAnimator.cpp » ('j') | Source/platform/scroll/ScrollAnimatorNone.cpp » ('J')

OLD	NEW
1 /*	1 /*

2 * Copyright (c) 2010, Google Inc. All rights reserved.	2 * Copyright (c) 2010, Google 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 are	5 * modification, are permitted provided that the following conditions are

6 * met:	6 * met:

7 *	7 *

8 * * Redistributions of source code must retain the above copyright	8 * * Redistributions of source code must retain the above copyright

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

10 * * Redistributions in binary form must reproduce the above	10 * * Redistributions in binary form must reproduce the above

(...skipping 44 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
55 // didScroll is true. Scrolling may be immediate or animated. The base	55 // didScroll is true. Scrolling may be immediate or animated. The base

56 // class implementation always scrolls immediately, never animates.	56 // class implementation always scrolls immediately, never animates.

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

58	58

59 virtual void scrollToOffsetWithoutAnimation(const FloatPoint&);	59 virtual void scrollToOffsetWithoutAnimation(const FloatPoint&);

60	60

61 ScrollableArea* scrollableArea() const { return m_scrollableArea; }	61 ScrollableArea* scrollableArea() const { return m_scrollableArea; }

62	62

63 virtual void setIsActive() { }	63 virtual void setIsActive() { }

64	64

65 virtual ScrollResult handleWheelEvent(const PlatformWheelEvent&);

66

67 #if OS(MACOSX)	65 #if OS(MACOSX)

68 virtual void handleWheelEventPhase(PlatformWheelEventPhase) { }	66 virtual void handleWheelEventPhase(PlatformWheelEventPhase) { }

69 #endif	67 #endif

70	68

71 void setCurrentPosition(const FloatPoint&);	69 void setCurrentPosition(const FloatPoint&);

72 FloatPoint currentPosition() const;	70 FloatPoint currentPosition() const;

73	71

74 virtual void cancelAnimations() { }	72 virtual void cancelAnimations() { }

75 virtual void serviceScrollAnimations() { }	73 virtual void serviceScrollAnimations() { }

76 virtual bool hasRunningAnimation() const { return false; }	74 virtual bool hasRunningAnimation() const { return false; }

(...skipping 32 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
109 float m_currentPosX; // We avoid using a FloatPoint in order to reduce	107 float m_currentPosX; // We avoid using a FloatPoint in order to reduce

110 float m_currentPosY; // subclass code complexity.	108 float m_currentPosY; // subclass code complexity.

111	109

112 private:	110 private:

113 float clampScrollPosition(ScrollbarOrientation, float);	111 float clampScrollPosition(ScrollbarOrientation, float);

114 };	112 };

115	113

116 } // namespace blink	114 } // namespace blink

117	115

118 #endif // ScrollAnimator_h	116 #endif // ScrollAnimator_h

OLD	NEW