Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(151)

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 131003004: Update platform classes to use OVERRIDE / FINAL when needed (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: 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
« no previous file with comments | « Source/platform/image-decoders/png/PNGImageDecoder.h ('k') | Source/platform/mediastream/MediaStreamComponent.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 RetainPtr<WebScrollbarPainterDelegate> m_horizontalScrollbarPainterDelegate; 78 RetainPtr<WebScrollbarPainterDelegate> m_horizontalScrollbarPainterDelegate;
79 RetainPtr<WebScrollbarPainterDelegate> m_verticalScrollbarPainterDelegate; 79 RetainPtr<WebScrollbarPainterDelegate> m_verticalScrollbarPainterDelegate;
80 80
81 void initialScrollbarPaintTimerFired(Timer<ScrollAnimatorMac>*); 81 void initialScrollbarPaintTimerFired(Timer<ScrollAnimatorMac>*);
82 Timer<ScrollAnimatorMac> m_initialScrollbarPaintTimer; 82 Timer<ScrollAnimatorMac> m_initialScrollbarPaintTimer;
83 83
84 void sendContentAreaScrolledTimerFired(Timer<ScrollAnimatorMac>*); 84 void sendContentAreaScrolledTimerFired(Timer<ScrollAnimatorMac>*);
85 Timer<ScrollAnimatorMac> m_sendContentAreaScrolledTimer; 85 Timer<ScrollAnimatorMac> m_sendContentAreaScrolledTimer;
86 FloatSize m_contentAreaScrolledTimerScrollDelta; 86 FloatSize m_contentAreaScrolledTimerScrollDelta;
87 87
88 virtual bool scroll(ScrollbarOrientation, ScrollGranularity, float step, flo at delta); 88 virtual bool scroll(ScrollbarOrientation, ScrollGranularity, float step, flo at delta) OVERRIDE;
89 virtual void scrollToOffsetWithoutAnimation(const FloatPoint&); 89 virtual void scrollToOffsetWithoutAnimation(const FloatPoint&) OVERRIDE;
90 90
91 #if USE(RUBBER_BANDING) 91 #if USE(RUBBER_BANDING)
92 virtual bool handleWheelEvent(const PlatformWheelEvent&) OVERRIDE; 92 virtual bool handleWheelEvent(const PlatformWheelEvent&) OVERRIDE;
93 #endif 93 #endif
94 94
95 virtual void handleWheelEventPhase(PlatformWheelEventPhase) OVERRIDE; 95 virtual void handleWheelEventPhase(PlatformWheelEventPhase) OVERRIDE;
96 96
97 virtual void cancelAnimations(); 97 virtual void cancelAnimations() OVERRIDE;
98 virtual void setIsActive(); 98 virtual void setIsActive() OVERRIDE;
99 99
100 virtual void notifyPositionChanged(const FloatSize& delta); 100 virtual void notifyPositionChanged(const FloatSize& delta) OVERRIDE;
101 virtual void contentAreaWillPaint() const; 101 virtual void contentAreaWillPaint() const OVERRIDE;
102 virtual void mouseEnteredContentArea() const; 102 virtual void mouseEnteredContentArea() const OVERRIDE;
103 virtual void mouseExitedContentArea() const; 103 virtual void mouseExitedContentArea() const OVERRIDE;
104 virtual void mouseMovedInContentArea() const; 104 virtual void mouseMovedInContentArea() const OVERRIDE;
105 virtual void mouseEnteredScrollbar(Scrollbar*) const; 105 virtual void mouseEnteredScrollbar(Scrollbar*) const OVERRIDE;
106 virtual void mouseExitedScrollbar(Scrollbar*) const; 106 virtual void mouseExitedScrollbar(Scrollbar*) const OVERRIDE;
107 virtual void willStartLiveResize(); 107 virtual void willStartLiveResize() OVERRIDE;
108 virtual void contentsResized() const; 108 virtual void contentsResized() const OVERRIDE;
109 virtual void willEndLiveResize(); 109 virtual void willEndLiveResize() OVERRIDE;
110 virtual void contentAreaDidShow() const; 110 virtual void contentAreaDidShow() const OVERRIDE;
111 virtual void contentAreaDidHide() const; 111 virtual void contentAreaDidHide() const OVERRIDE;
112 void didBeginScrollGesture() const; 112 void didBeginScrollGesture() const;
113 void didEndScrollGesture() const; 113 void didEndScrollGesture() const;
114 void mayBeginScrollGesture() const; 114 void mayBeginScrollGesture() const;
115 115
116 virtual void finishCurrentScrollAnimations(); 116 virtual void finishCurrentScrollAnimations() OVERRIDE;
117 117
118 virtual void didAddVerticalScrollbar(Scrollbar*); 118 virtual void didAddVerticalScrollbar(Scrollbar*) OVERRIDE;
119 virtual void willRemoveVerticalScrollbar(Scrollbar*); 119 virtual void willRemoveVerticalScrollbar(Scrollbar*) OVERRIDE;
120 virtual void didAddHorizontalScrollbar(Scrollbar*); 120 virtual void didAddHorizontalScrollbar(Scrollbar*) OVERRIDE;
121 virtual void willRemoveHorizontalScrollbar(Scrollbar*); 121 virtual void willRemoveHorizontalScrollbar(Scrollbar*) OVERRIDE;
122 122
123 virtual bool shouldScrollbarParticipateInHitTesting(Scrollbar*); 123 virtual bool shouldScrollbarParticipateInHitTesting(Scrollbar*) OVERRIDE;
124 124
125 virtual void notifyContentAreaScrolled(const FloatSize& delta) OVERRIDE; 125 virtual void notifyContentAreaScrolled(const FloatSize& delta) OVERRIDE;
126 126
127 FloatPoint adjustScrollPositionIfNecessary(const FloatPoint&) const; 127 FloatPoint adjustScrollPositionIfNecessary(const FloatPoint&) const;
128 128
129 void immediateScrollTo(const FloatPoint&); 129 void immediateScrollTo(const FloatPoint&);
130 130
131 virtual bool isRubberBandInProgress() const OVERRIDE; 131 virtual bool isRubberBandInProgress() const OVERRIDE;
132 132
133 #if USE(RUBBER_BANDING) 133 #if USE(RUBBER_BANDING)
(...skipping 19 matching lines...) Expand all
153 #endif 153 #endif
154 154
155 bool m_haveScrolledSincePageLoad; 155 bool m_haveScrolledSincePageLoad;
156 bool m_needsScrollerStyleUpdate; 156 bool m_needsScrollerStyleUpdate;
157 IntRect m_visibleScrollerThumbRect; 157 IntRect m_visibleScrollerThumbRect;
158 }; 158 };
159 159
160 } // namespace WebCore 160 } // namespace WebCore
161 161
162 #endif // ScrollAnimatorMac_h 162 #endif // ScrollAnimatorMac_h
OLDNEW
« no previous file with comments | « Source/platform/image-decoders/png/PNGImageDecoder.h ('k') | Source/platform/mediastream/MediaStreamComponent.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698