2008-10-09 Darin Fisher <darin@chromium.org>

        Reviewed by Sam Weinig.

        Make pan scrolling a platform configurable option
        https://bugs.webkit.org/show_bug.cgi?id=21515

        * page/EventHandler.cpp:
        (WebCore::EventHandler::handleAutoscroll):
        (WebCore::EventHandler::autoscrollTimerFired):
        (WebCore::EventHandler::stopAutoscrollTimer):
        (WebCore::EventHandler::handleMousePressEvent):
        (WebCore::EventHandler::keyEvent):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@37601 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index b1f3b3bd2070576eadf18e2e38eb81434c0d9185..c1ec3e5c3193f864b0a57bed3e19ab3ab8095835 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2008-10-09  Darin Fisher  <darin@chromium.org>
+
+        Reviewed by Sam Weinig.
+
+        Make pan scrolling a platform configurable option
+        https://bugs.webkit.org/show_bug.cgi?id=21515
+
+        * page/EventHandler.cpp:
+        (WebCore::EventHandler::handleAutoscroll):
+        (WebCore::EventHandler::autoscrollTimerFired):
+        (WebCore::EventHandler::stopAutoscrollTimer):
+        (WebCore::EventHandler::handleMousePressEvent):
+        (WebCore::EventHandler::keyEvent):
+
 2008-10-10  Darin Fisher  <darin@chromium.org>
 
         Reviewed by Darin Adler.

diff --git a/WebCore/page/EventHandler.cpp b/WebCore/page/EventHandler.cpp
index 52b697056e6f1559986d6e19cf2dfd8938ed44ed..2c3e3427f3b37924b0a74a469fdb55d2c5e9b0bd 100644 (file)
--- a/WebCore/page/EventHandler.cpp
+++ b/WebCore/page/EventHandler.cpp
@@ -576,7 +576,7 @@ void EventHandler::handleAutoscroll(RenderObject* renderer)
 
     setAutoscrollRenderer(renderer);
 
-#if PLATFORM(WIN)
+#if ENABLE(PAN_SCROLLING)
     if (m_panScrollInProgress) {
         m_panScrollStartPos = currentMousePosition();
         m_frame->view()->addPanScrollIcon(m_panScrollStartPos);
@@ -609,7 +609,7 @@ void EventHandler::autoscrollTimerFired(Timer<EventHandler>*)
             stopAutoscrollTimer();
             return;
         }
-#if PLATFORM(WIN)
+#if ENABLE(PAN_SCROLLING)
         setPanScrollCursor();
         r->panScroll(m_panScrollStartPos);
 #endif
@@ -744,7 +744,7 @@ void EventHandler::stopAutoscrollTimer(bool rendererIsBeingDestroyed)
     if (autoscrollRenderer()) {
         if (!rendererIsBeingDestroyed && (m_autoscrollInProgress || m_panScrollInProgress))
             autoscrollRenderer()->stopAutoscroll();
-#if PLATFORM(WIN)
+#if ENABLE(PAN_SCROLLING)
         if (m_panScrollInProgress) {
             m_frame->view()->removePanScrollIcon();
             m_frame->view()->setCursor(pointerCursor());
@@ -1022,7 +1022,7 @@ bool EventHandler::handleMousePressEvent(const PlatformMouseEvent& mouseEvent)
         return true;
     }
 
-#if PLATFORM(WIN)
+#if ENABLE(PAN_SCROLLING)
     if (m_frame->page()->mainFrame()->eventHandler()->panScrollInProgress() || m_autoscrollInProgress) {
         stopAutoscrollTimer();
         invalidateClick();
@@ -1737,7 +1737,7 @@ bool EventHandler::needsKeyboardEventDisambiguationQuirks() const
 
 bool EventHandler::keyEvent(const PlatformKeyboardEvent& initialKeyEvent)
 {
-#if PLATFORM(WIN) || (PLATFORM(WX) && PLATFORM(WIN_OS))
+#if ENABLE(PAN_SCROLLING)
     if (m_frame->page()->mainFrame()->eventHandler()->panScrollInProgress() || m_autoscrollInProgress) {
         String escKeyId = "U+001B";
         // If a key is pressed while the autoscroll/panScroll is in progress then we want to stop