| OLD | NEW |
|---|
| 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 |
| (...skipping 24 matching lines...) Expand all Loading... |
| 35 class Frame; | 35 class Frame; |
| 36 class FrameView; | 36 class FrameView; |
| 37 class PlatformMouseEvent; | 37 class PlatformMouseEvent; |
| 38 class RenderBox; | 38 class RenderBox; |
| 39 class RenderObject; | 39 class RenderObject; |
| 40 | 40 |
| 41 enum AutoscrollType { | 41 enum AutoscrollType { |
| 42 NoAutoscroll, | 42 NoAutoscroll, |
| 43 AutoscrollForSelection, | 43 AutoscrollForSelection, |
| 44 #if ENABLE(PAN_SCROLLING) | 44 #if ENABLE(PAN_SCROLLING) |
| 45 AutoscrollForPanCanStop, |
| 45 AutoscrollForPan, | 46 AutoscrollForPan, |
| 46 #endif | 47 #endif |
| 47 }; | 48 }; |
| 48 | 49 |
| 49 // AutscrollController handels autoscroll and pan scroll for EventHandler. | 50 // AutscrollController handels autoscroll and pan scroll for EventHandler. |
| 50 class AutoscrollController { | 51 class AutoscrollController { |
| 51 public: | 52 public: |
| 52 AutoscrollController(); | 53 AutoscrollController(); |
| 53 RenderBox* autoscrollRenderer() const; | 54 RenderBox* autoscrollRenderer() const; |
| 54 bool autoscrollInProgress() const; | 55 bool autoscrollInProgress() const; |
| (...skipping 14 matching lines...) Expand all Loading... |
| 69 void startAutoscrollTimer(); | 70 void startAutoscrollTimer(); |
| 70 #if ENABLE(PAN_SCROLLING) | 71 #if ENABLE(PAN_SCROLLING) |
| 71 void updatePanScrollState(FrameView*, const IntPoint&); | 72 void updatePanScrollState(FrameView*, const IntPoint&); |
| 72 #endif | 73 #endif |
| 73 | 74 |
| 74 Timer<AutoscrollController> m_autoscrollTimer; | 75 Timer<AutoscrollController> m_autoscrollTimer; |
| 75 RenderBox* m_autoscrollRenderer; | 76 RenderBox* m_autoscrollRenderer; |
| 76 AutoscrollType m_autoscrollType; | 77 AutoscrollType m_autoscrollType; |
| 77 #if ENABLE(PAN_SCROLLING) | 78 #if ENABLE(PAN_SCROLLING) |
| 78 IntPoint m_panScrollStartPos; | 79 IntPoint m_panScrollStartPos; |
| 79 bool m_panScrollButtonPressed; | |
| 80 bool m_springLoadedPanScrollInProgress; | |
| 81 #endif | 80 #endif |
| 82 }; | 81 }; |
| 83 | 82 |
| 84 } // namespace WebCore | 83 } // namespace WebCore |
| 85 | 84 |
| 86 #endif // AutoscrollController_h | 85 #endif // AutoscrollController_h |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 12040032:
Merge 140104 (Closed)
Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1364/