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

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

Issue 1213003004: Fix virtual/override/final usage in Source/platform/. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 5 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/webp/WEBPImageDecoder.h ('k') | Source/platform/mac/ThemeMac.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 29 matching lines...) Expand all
40 typedef id ScrollbarPainterController; 40 typedef id ScrollbarPainterController;
41 41
42 namespace blink { 42 namespace blink {
43 43
44 class Scrollbar; 44 class Scrollbar;
45 45
46 class PLATFORM_EXPORT ScrollAnimatorMac : public ScrollAnimator { 46 class PLATFORM_EXPORT ScrollAnimatorMac : public ScrollAnimator {
47 47
48 public: 48 public:
49 ScrollAnimatorMac(ScrollableArea*); 49 ScrollAnimatorMac(ScrollableArea*);
50 virtual ~ScrollAnimatorMac(); 50 ~ScrollAnimatorMac() override;
51 51
52 void immediateScrollToPointForScrollAnimation(const FloatPoint& newPosition) ; 52 void immediateScrollToPointForScrollAnimation(const FloatPoint& newPosition) ;
53 bool haveScrolledSincePageLoad() const { return m_haveScrolledSincePageLoad; } 53 bool haveScrolledSincePageLoad() const { return m_haveScrolledSincePageLoad; }
54 54
55 void updateScrollerStyle(); 55 void updateScrollerStyle();
56 56
57 bool scrollbarPaintTimerIsActive() const; 57 bool scrollbarPaintTimerIsActive() const;
58 void startScrollbarPaintTimer(); 58 void startScrollbarPaintTimer();
59 void stopScrollbarPaintTimer(); 59 void stopScrollbarPaintTimer();
60 60
(...skipping 12 matching lines...) Expand all
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 userScroll(ScrollbarOrientation, ScrollGr anularity, float step, float delta) override; 83 ScrollResultOneDimensional userScroll(ScrollbarOrientation, ScrollGranularit y, float step, float delta) override;
84 virtual void scrollToOffsetWithoutAnimation(const FloatPoint&) override; 84 void scrollToOffsetWithoutAnimation(const FloatPoint&) override;
85 85
86 virtual void handleWheelEventPhase(PlatformWheelEventPhase) override; 86 void handleWheelEventPhase(PlatformWheelEventPhase) override;
87 87
88 virtual void cancelAnimations() override; 88 void cancelAnimations() override;
89 virtual void setIsActive() override; 89 void setIsActive() override;
90 90
91 virtual void contentAreaWillPaint() const override; 91 void contentAreaWillPaint() const override;
92 virtual void mouseEnteredContentArea() const override; 92 void mouseEnteredContentArea() const override;
93 virtual void mouseExitedContentArea() const override; 93 void mouseExitedContentArea() const override;
94 virtual void mouseMovedInContentArea() const override; 94 void mouseMovedInContentArea() const override;
95 virtual void mouseEnteredScrollbar(Scrollbar*) const override; 95 void mouseEnteredScrollbar(Scrollbar*) const override;
96 virtual void mouseExitedScrollbar(Scrollbar*) const override; 96 void mouseExitedScrollbar(Scrollbar*) const override;
97 virtual void willStartLiveResize() override; 97 void willStartLiveResize() override;
98 virtual void contentsResized() const override; 98 void contentsResized() const override;
99 virtual void willEndLiveResize() override; 99 void willEndLiveResize() override;
100 virtual void contentAreaDidShow() const override; 100 void contentAreaDidShow() const override;
101 virtual void contentAreaDidHide() const override; 101 void contentAreaDidHide() const override;
102 void didBeginScrollGesture() const; 102 void didBeginScrollGesture() const;
103 void didEndScrollGesture() const; 103 void didEndScrollGesture() const;
104 void mayBeginScrollGesture() const; 104 void mayBeginScrollGesture() const;
105 105
106 virtual void finishCurrentScrollAnimations() override; 106 void finishCurrentScrollAnimations() override;
107 107
108 virtual void didAddVerticalScrollbar(Scrollbar*) override; 108 void didAddVerticalScrollbar(Scrollbar*) override;
109 virtual void willRemoveVerticalScrollbar(Scrollbar*) override; 109 void willRemoveVerticalScrollbar(Scrollbar*) override;
110 virtual void didAddHorizontalScrollbar(Scrollbar*) override; 110 void didAddHorizontalScrollbar(Scrollbar*) override;
111 virtual void willRemoveHorizontalScrollbar(Scrollbar*) override; 111 void willRemoveHorizontalScrollbar(Scrollbar*) override;
112 112
113 virtual bool shouldScrollbarParticipateInHitTesting(Scrollbar*) override; 113 bool shouldScrollbarParticipateInHitTesting(Scrollbar*) override;
114 114
115 virtual void notifyContentAreaScrolled(const FloatSize& delta) override; 115 void notifyContentAreaScrolled(const FloatSize& delta) override;
116 116
117 FloatPoint adjustScrollPositionIfNecessary(const FloatPoint&) const; 117 FloatPoint adjustScrollPositionIfNecessary(const FloatPoint&) const;
118 118
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
OLDNEW
« no previous file with comments | « Source/platform/image-decoders/webp/WEBPImageDecoder.h ('k') | Source/platform/mac/ThemeMac.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698