webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 7 insertions, 9 deletions

diff --git a/Source/WebCore/page/AutoscrollController.h b/Source/WebCore/page/AutoscrollController.h
index 2c34cb62a..3cd9dbf33 100644
--- a/Source/WebCore/page/AutoscrollController.h
+++ b/Source/WebCore/page/AutoscrollController.h
@@ -10,10 +10,10 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
  * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
@@ -23,8 +23,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#ifndef AutoscrollController_h
-#define AutoscrollController_h
+#pragma once
 
 #include "IntPoint.h"
 #include "Timer.h"
@@ -49,8 +48,9 @@ enum AutoscrollType {
 #endif
 };
 
-// AutscrollController handels autoscroll and pan scroll for EventHandler.
+// AutscrollController handles autoscroll and pan scroll for EventHandler.
 class AutoscrollController {
+    WTF_MAKE_FAST_ALLOCATED;
 public:
     AutoscrollController();
     RenderBox* autoscrollRenderer() const;
@@ -69,13 +69,13 @@ public:
 #endif
 
 private:
-    void autoscrollTimerFired(Timer<AutoscrollController>&);
+    void autoscrollTimerFired();
     void startAutoscrollTimer();
 #if ENABLE(PAN_SCROLLING)
     void updatePanScrollState(FrameView*, const IntPoint&);
 #endif
 
-    Timer<AutoscrollController> m_autoscrollTimer;
+    Timer m_autoscrollTimer;
     RenderBox* m_autoscrollRenderer;
     AutoscrollType m_autoscrollType;
     IntPoint m_dragAndDropAutoscrollReferencePosition;
@@ -86,5 +86,3 @@ private:
 };
 
 } // namespace WebCore
-
-#endif // AutoscrollController_h