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

Side by Side Diff: Source/core/page/AutoscrollController.h

Issue 46353003: Switch AutoscrollController to use animation system instead of timer (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@gclient
Patch Set: Created 7 years, 1 month 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007, 2009, 2010, 2011 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2009, 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
11 * documentation and/or other materials provided with the distribution. 11 * documentation and/or other materials provided with the distribution.
12 * 12 *
13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY 13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */ 24 */
25 25
26 #ifndef AutoscrollController_h 26 #ifndef AutoscrollController_h
27 #define AutoscrollController_h 27 #define AutoscrollController_h
28 28
29 #include "platform/Timer.h"
30 #include "platform/geometry/IntPoint.h" 29 #include "platform/geometry/IntPoint.h"
31 #include "wtf/PassOwnPtr.h" 30 #include "wtf/PassOwnPtr.h"
32 31
33 namespace WebCore { 32 namespace WebCore {
34 33
35 class EventHandler; 34 class EventHandler;
36 class Frame; 35 class Frame;
37 class FrameView; 36 class FrameView;
38 class Node; 37 class Node;
38 class Page;
39 class PlatformMouseEvent; 39 class PlatformMouseEvent;
40 class RenderBox; 40 class RenderBox;
41 class RenderObject; 41 class RenderObject;
42 42
43 enum AutoscrollType { 43 enum AutoscrollType {
44 NoAutoscroll, 44 NoAutoscroll,
45 AutoscrollForDragAndDrop, 45 AutoscrollForDragAndDrop,
46 AutoscrollForSelection, 46 AutoscrollForSelection,
47 #if OS(WIN) 47 #if OS(WIN)
48 AutoscrollForPanCanStop, 48 AutoscrollForPanCanStop,
49 AutoscrollForPan, 49 AutoscrollForPan,
50 #endif 50 #endif
51 }; 51 };
52 52
53 // AutscrollController handels autoscroll and pan scroll for EventHandler. 53 // AutscrollController handels autoscroll and pan scroll for EventHandler.
54 class AutoscrollController { 54 class AutoscrollController {
55 public: 55 public:
56 static PassOwnPtr<AutoscrollController> create(Page*);
esprehn 2013/11/01 19:37:37 This should probably be a reference.
57
58 void animate(double monotonicFrameBeginTime);
56 bool autoscrollInProgress() const; 59 bool autoscrollInProgress() const;
57 bool autoscrollInProgress(const RenderBox*) const; 60 bool autoscrollInProgress(const RenderBox*) const;
58 static PassOwnPtr<AutoscrollController> create();
59 bool panScrollInProgress() const; 61 bool panScrollInProgress() const;
60 void startAutoscrollForSelection(RenderObject*); 62 void startAutoscrollForSelection(RenderObject*);
61 void stopAutoscrollTimer(); 63 void stopAutoscroll();
62 void stopAutoscrollIfNeeded(RenderObject*); 64 void stopAutoscrollIfNeeded(RenderObject*);
63 void updateAutoscrollRenderer(); 65 void updateAutoscrollRenderer();
64 void updateDragAndDrop(Node* targetNode, const IntPoint& eventPosition, doub le eventTime); 66 void updateDragAndDrop(Node* targetNode, const IntPoint& eventPosition, doub le eventTime);
65 #if OS(WIN) 67 #if OS(WIN)
66 void handleMouseReleaseForPanScrolling(Frame*, const PlatformMouseEvent&); 68 void handleMouseReleaseForPanScrolling(Frame*, const PlatformMouseEvent&);
67 void startPanScrolling(RenderBox*, const IntPoint&); 69 void startPanScrolling(RenderBox*, const IntPoint&);
68 #endif 70 #endif
69 71
70 private: 72 private:
71 AutoscrollController(); 73 explicit AutoscrollController(Page*);
esprehn 2013/11/01 19:37:37 This should probably be a reference.
72 void autoscrollTimerFired(Timer<AutoscrollController>*); 74
73 void startAutoscrollTimer(); 75 void startAutoscroll();
76
74 #if OS(WIN) 77 #if OS(WIN)
75 void updatePanScrollState(FrameView*, const IntPoint&); 78 void updatePanScrollState(FrameView*, const IntPoint& lastKnownMousePosition );
76 #endif 79 #endif
77 80
78 Timer<AutoscrollController> m_autoscrollTimer; 81 Page* m_page;
82 bool m_autoscrollActive;
79 RenderBox* m_autoscrollRenderer; 83 RenderBox* m_autoscrollRenderer;
80 AutoscrollType m_autoscrollType; 84 AutoscrollType m_autoscrollType;
81 IntPoint m_dragAndDropAutoscrollReferencePosition; 85 IntPoint m_dragAndDropAutoscrollReferencePosition;
82 double m_dragAndDropAutoscrollStartTime; 86 double m_dragAndDropAutoscrollStartTime;
83 #if OS(WIN) 87 #if OS(WIN)
84 IntPoint m_panScrollStartPos; 88 IntPoint m_panScrollStartPos;
85 #endif 89 #endif
86 }; 90 };
87 91
88 } // namespace WebCore 92 } // namespace WebCore
89 93
90 #endif // AutoscrollController_h 94 #endif // AutoscrollController_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698