Merge 140104

Source/WebCore/page/AutoscrollController.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2006 Alexey Proskuryakov (ap@webkit.org)
  * Copyright (C) 2012 Digia Plc. and/or its subsidiary(-ies)
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
@@ skipping 35 matching lines @@
 {
     Page* page = frame->page();
     return page ? page->mainFrame() : 0;
 }
 #endif
 
 AutoscrollController::AutoscrollController()
     : m_autoscrollTimer(this, &AutoscrollController::autoscrollTimerFired)
     , m_autoscrollRenderer(0)
     , m_autoscrollType(NoAutoscroll)
-#if ENABLE(PAN_SCROLLING)
-    , m_panScrollButtonPressed(false)
-    , m_springLoadedPanScrollInProgress(false)
-#endif
 {
 }
 
 RenderBox* AutoscrollController::autoscrollRenderer() const
 {
     return m_autoscrollRenderer;
 }
 
 bool AutoscrollController::autoscrollInProgress() const
 {
@@ skipping 12 matching lines @@
     m_autoscrollRenderer = scrollable;
     startAutoscrollTimer();
 }
 
 void AutoscrollController::stopAutoscrollTimer(bool rendererIsBeingDestroyed)
 {
     RenderBox* scrollable = m_autoscrollRenderer;
     m_autoscrollTimer.stop();
     m_autoscrollType = NoAutoscroll;
     m_autoscrollRenderer = 0;
-#if ENABLE(PAN_SCROLLING)
-    m_panScrollButtonPressed = false;
-    m_springLoadedPanScrollInProgress = false;
-#endif
 
     if (!scrollable)
         return;
 
     Frame* frame = scrollable->frame();
     EventHandler* eventHandler = frame->eventHandler();
     if (autoscrollInProgress() && eventHandler->mouseDownWasInSubframe()) {
         if (Frame* subframe = eventHandler->subframeForTargetNode(eventHandler->mousePressNode()))
             subframe->eventHandler()->stopAutoscrollTimer(rendererIsBeingDestroyed);
         return;
@@ skipping 44 matching lines @@
     m_autoscrollType = AutoscrollForPan;
 }
 
 void AutoscrollController::didPanScrollStop()
 {
     m_autoscrollType = NoAutoscroll;
 }
 
 void AutoscrollController::handleMouseReleaseEvent(const PlatformMouseEvent& mouseEvent)
 {
-    if (mouseEvent.button() == MiddleButton)
-        m_panScrollButtonPressed = false;
-    if (m_springLoadedPanScrollInProgress)
+    switch (m_autoscrollType) {
+    case AutoscrollForPan:
+        if (mouseEvent.button() == MiddleButton)
+            m_autoscrollType = AutoscrollForPanCanStop;
+        break;
+    case AutoscrollForPanCanStop:
         stopAutoscrollTimer();
+        break;
+    }
 }
 
 bool AutoscrollController::panScrollInProgress() const
 {
-    return m_autoscrollType == AutoscrollForPan;
+    return m_autoscrollType == AutoscrollForPan || m_autoscrollType == AutoscrollForPanCanStop;
 }
 
 void AutoscrollController::startPanScrolling(RenderBox* scrollable, const IntPoint& lastKnownMousePosition)
 {
     // We don't want to trigger the autoscroll or the panScroll if it's already active
     if (m_autoscrollTimer.isActive())
         return;
 
     m_autoscrollType = AutoscrollForPan;
     m_autoscrollRenderer = scrollable;
     m_panScrollStartPos = lastKnownMousePosition;
-    m_springLoadedPanScrollInProgress = false;
 
     if (FrameView* view = scrollable->frame()->view())
         view->addPanScrollIcon(lastKnownMousePosition);
     scrollable->frame()->eventHandler()->didPanScrollStart();
     startAutoscrollTimer();
 }
 #else
 bool AutoscrollController::panScrollInProgress() const
 {
     return false;
@@ skipping 12 matching lines @@
     case AutoscrollForSelection:
         if (!frame->eventHandler()->mousePressed()) {
             stopAutoscrollTimer();
             return;
         }
         m_autoscrollRenderer->autoscroll();
         break;
     case NoAutoscroll:
         break;
 #if ENABLE(PAN_SCROLLING)
+    case AutoscrollForPanCanStop:
     case AutoscrollForPan:
         // we verify that the main frame hasn't received the order to stop the panScroll
         if (Frame* mainFrame = getMainFrame(frame)) {
             if (!mainFrame->eventHandler()->panScrollInProgress()) {
                 stopAutoscrollTimer();
                 return;
             }
         }
         if (FrameView* view = frame->view())
             updatePanScrollState(view, frame->eventHandler()->lastKnownMousePosition());
@@ skipping 11 matching lines @@
 #if ENABLE(PAN_SCROLLING)
 void AutoscrollController::updatePanScrollState(FrameView* view, const IntPoint& lastKnownMousePosition)
 {
     // At the original click location we draw a 4 arrowed icon. Over this icon there won't be any scroll
     // So we don't want to change the cursor over this area
     bool east = m_panScrollStartPos.x() < (lastKnownMousePosition.x() - ScrollView::noPanScrollRadius);
     bool west = m_panScrollStartPos.x() > (lastKnownMousePosition.x() + ScrollView::noPanScrollRadius);
     bool north = m_panScrollStartPos.y() > (lastKnownMousePosition.y() + ScrollView::noPanScrollRadius);
     bool south = m_panScrollStartPos.y() < (lastKnownMousePosition.y() - ScrollView::noPanScrollRadius);
 
-    if ((east || west || north || south) && m_panScrollButtonPressed)
-        m_springLoadedPanScrollInProgress = true;
+    if (m_autoscrollType == AutoscrollForPan && (east || west || north || south))
+        m_autoscrollType = AutoscrollForPanCanStop;
 
     if (north) {
         if (east)
             view->setCursor(northEastPanningCursor());
         else if (west)
             view->setCursor(northWestPanningCursor());
         else
             view->setCursor(northPanningCursor());
     } else if (south) {
         if (east)
             view->setCursor(southEastPanningCursor());
         else if (west)
             view->setCursor(southWestPanningCursor());
         else
             view->setCursor(southPanningCursor());
     } else if (east)
         view->setCursor(eastPanningCursor());
     else if (west)
         view->setCursor(westPanningCursor());
     else
         view->setCursor(middlePanningCursor());
 }
 #endif
 
 } // namespace WebCore