Remove WebScroll*

sky/engine/platform/scroll/Scrollbar.cpp

 /*
  * Copyright (C) 2004, 2006, 2008 Apple Inc. All rights reserved.
  *
  * 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.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 17 matching lines @@
 
 #include "platform/graphics/GraphicsContext.h"
 #include "platform/PlatformGestureEvent.h"
 #include "platform/PlatformMouseEvent.h"
 #include "platform/scroll/ScrollableArea.h"
 #include "platform/scroll/ScrollAnimator.h"
 #include "platform/scroll/Scrollbar.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebPoint.h"
 #include "public/platform/WebRect.h"
-#include "public/platform/WebScrollbarBehavior.h"
 #include "public/platform/WebThemeEngine.h"
 
 // The position of the scrollbar thumb affects the appearance of the steppers, so
 // when the thumb moves, we have to invalidate them for painting.
 #define THUMB_POSITION_AFFECTS_BUTTONS
 
 namespace blink {
 
 static const int kThumbThickness = 3;
 static const int kScrollbarMargin = 3;
@@ skipping 267 matching lines @@
     }
     default:
         // By default, we assume that gestures don't deselect the scrollbar.
         return true;
     }
 }
 
 void Scrollbar::mouseMoved(const PlatformMouseEvent& evt)
 {
     if (m_pressedPart == ThumbPart) {
-        if (shouldSnapBackToDragOrigin(evt)) {
-            if (m_scrollableArea)
-                m_scrollableArea->scrollToOffsetWithoutAnimation(m_orientation, m_dragOrigin + m_scrollableArea->minimumScrollPosition(m_orientation));
-        } else {
-            moveThumb(m_orientation == HorizontalScrollbar ?
-                      convertFromContainingView(evt.position()).x() :
-                      convertFromContainingView(evt.position()).y());
-        }
+        moveThumb(m_orientation == HorizontalScrollbar ?
+                  convertFromContainingView(evt.position()).x() :
+                  convertFromContainingView(evt.position()).y());
         return;
     }
 
     if (m_pressedPart != NoPart)
         m_pressedPos = orientation() == HorizontalScrollbar ? convertFromContainingView(evt.position()).x() : convertFromContainingView(evt.position()).y();
 
     // FIXME(sky): Cleanup this code now that part is always NoPart.
     ScrollbarPart part = NoPart;
     if (part != m_hoveredPart) {
         if (m_pressedPart != NoPart) {
@@ skipping 45 matching lines @@
 void Scrollbar::mouseDown(const PlatformMouseEvent& evt)
 {
     // Early exit for right click
     if (evt.button() == RightButton)
         return;
 
     // FIXME(sky): Do we still need setPressedPart now that we only set it to NoPart?
     setPressedPart(NoPart);
     int pressedPos = orientation() == HorizontalScrollbar ? convertFromContainingView(evt.position()).x() : convertFromContainingView(evt.position()).y();
 
-    if ((m_pressedPart == BackTrackPart || m_pressedPart == ForwardTrackPart) && shouldCenterOnThumb(evt)) {
-        setHoveredPart(ThumbPart);
-        setPressedPart(ThumbPart);
-        m_dragOrigin = m_currentPos;
-        int thumbLen = thumbLength();
-        int desiredPos = pressedPos;
-        // Set the pressed position to the middle of the thumb so that when we do the move, the delta
-        // will be from the current pixel position of the thumb to the new desired position for the thumb.
-        m_pressedPos = trackPosition() + thumbPosition() + thumbLen / 2;
-        moveThumb(desiredPos);
-        return;
-    } else if (m_pressedPart == ThumbPart)
+    if (m_pressedPart == ThumbPart)
         m_dragOrigin = m_currentPos;
 
     m_pressedPos = pressedPos;
 
     autoscrollPressedPart(initialAutoscrollTimerDelay());
 }
 
 void Scrollbar::setEnabled(bool e)
 {
     if (m_enabled == e)
@@ skipping 83 matching lines @@
         result = beforeThumbRect;
     else if (part == ForwardTrackPart)
         result = afterThumbRect;
     else
         result = thumbRect;
 
     result.moveBy(-location());
     invalidateRect(result);
 }
 
-bool Scrollbar::shouldCenterOnThumb(const PlatformMouseEvent& evt)
-{
-    return blink::Platform::current()->scrollbarBehavior()->shouldCenterOnThumb(static_cast<blink::WebScrollbarBehavior::Button>(evt.button()), evt.shiftKey(), evt.altKey());
-}
-
-bool Scrollbar::shouldSnapBackToDragOrigin(const PlatformMouseEvent& evt)
-{
-    IntPoint mousePosition = convertFromContainingView(evt.position());
-    mousePosition.move(x(), y());
-    return blink::Platform::current()->scrollbarBehavior()->shouldSnapBackToDragOrigin(mousePosition, trackRect(), orientation() == HorizontalScrollbar);
-}
-
 int Scrollbar::thumbPosition()
 {
     if (!totalSize())
         return 0;
 
     int trackLen = trackLength();
     float proportion = static_cast<float>(currentPos()) / totalSize();
     return round(proportion * trackLen);
 }
 
@@ skipping 79 matching lines @@
         thumbRect.setWidth(thumbRect.width() - kScrollbarMargin);
         if (isLeftSideVerticalScrollbar())
             thumbRect.setX(thumbRect.x() + kScrollbarMargin);
     }
 
     DEFINE_STATIC_LOCAL(Color, color, (128, 128, 128, 128));
     context->fillRect(thumbRect, color);
 }
 
 } // namespace blink