Remove WebScroll*

sky/engine/platform/scroll/ScrollableArea.cpp

 /*
  * Copyright (c) 2010, Google Inc. All rights reserved.
  * Copyright (C) 2008, 2011 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ skipping 18 matching lines @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "platform/scroll/ScrollableArea.h"
 
 #include "platform/HostWindow.h"
 #include "platform/Logging.h"
 #include "platform/graphics/GraphicsLayer.h"
 #include "platform/geometry/FloatPoint.h"
-#include "platform/scroll/ProgrammaticScrollAnimator.h"
 #include "platform/scroll/Scrollbar.h"
 #include "wtf/PassOwnPtr.h"
 
 #include "platform/TraceEvent.h"
 
 static const int kPixelsPerLineStep = 40;
 static const float kMinFractionToStepWhenPaging = 0.875f;
 
 namespace blink {
 
@@ skipping 41 matching lines @@
 {
     if (!m_animators)
         m_animators = adoptPtr(new ScrollableAreaAnimators);
 
     if (!m_animators->scrollAnimator)
         m_animators->scrollAnimator = ScrollAnimator::create(const_cast<ScrollableArea*>(this));
 
     return m_animators->scrollAnimator.get();
 }
 
-ProgrammaticScrollAnimator* ScrollableArea::programmaticScrollAnimator() const
-{
-    if (!m_animators)
-        m_animators = adoptPtr(new ScrollableAreaAnimators);
-
-    if (!m_animators->programmaticScrollAnimator)
-        m_animators->programmaticScrollAnimator = ProgrammaticScrollAnimator::create(const_cast<ScrollableArea*>(this));
-
-    return m_animators->programmaticScrollAnimator.get();
-}
-
 void ScrollableArea::setScrollOrigin(const IntPoint& origin)
 {
     if (m_scrollOrigin != origin) {
         m_scrollOrigin = origin;
         m_scrollOriginChanged = true;
     }
 }
 
 bool ScrollableArea::scroll(ScrollDirection direction, ScrollGranularity granularity, float delta)
 {
     ScrollbarOrientation orientation;
 
     if (direction == ScrollUp || direction == ScrollDown)
         orientation = VerticalScrollbar;
     else
         orientation = HorizontalScrollbar;
 
     if (!userInputScrollable(orientation))
         return false;
 
-    cancelProgrammaticScrollAnimation();
-
     float step = 0;
     switch (granularity) {
     case ScrollByLine:
         step = lineStep(orientation);
         break;
     case ScrollByPage:
         step = pageStep(orientation);
         break;
     case ScrollByDocument:
         step = documentStep(orientation);
         break;
     case ScrollByPixel:
     case ScrollByPrecisePixel:
         step = pixelStep(orientation);
         break;
     }
 
     if (direction == ScrollUp || direction == ScrollLeft)
         delta = -delta;
 
     return scrollAnimator()->scroll(orientation, granularity, step, delta);
 }
 
 void ScrollableArea::scrollToOffsetWithoutAnimation(const FloatPoint& offset)
 {
-    cancelProgrammaticScrollAnimation();
     scrollAnimator()->scrollToOffsetWithoutAnimation(offset);
 }
 
 void ScrollableArea::scrollToOffsetWithoutAnimation(ScrollbarOrientation orientation, float offset)
 {
     if (orientation == HorizontalScrollbar)
         scrollToOffsetWithoutAnimation(FloatPoint(offset, scrollAnimator()->currentPosition().y()));
     else
         scrollToOffsetWithoutAnimation(FloatPoint(scrollAnimator()->currentPosition().x(), offset));
 }
 
-void ScrollableArea::programmaticallyScrollSmoothlyToOffset(const FloatPoint& offset)
-{
-    if (ScrollAnimator* scrollAnimator = existingScrollAnimator())
-        scrollAnimator->cancelAnimations();
-    programmaticScrollAnimator()->animateToOffset(offset);
-}
-
 void ScrollableArea::notifyScrollPositionChanged(const IntPoint& position)
 {
     scrollPositionChanged(position);
     scrollAnimator()->setCurrentPosition(position);
 }
 
 void ScrollableArea::scrollPositionChanged(const IntPoint& position)
 {
     TRACE_EVENT0("blink", "ScrollableArea::scrollPositionChanged");
 
@@ skipping 41 matching lines @@
 
     return true;
 }
 
 bool ScrollableArea::handleWheelEvent(const PlatformWheelEvent& wheelEvent)
 {
     // ctrl+wheel events are used to trigger zooming, not scrolling.
     if (wheelEvent.modifiers() & PlatformEvent::CtrlKey)
         return false;
 
-    cancelProgrammaticScrollAnimation();
     return scrollAnimator()->handleWheelEvent(wheelEvent);
 }
 
 // NOTE: Only called from Internals for testing.
 void ScrollableArea::setScrollOffsetFromInternals(const IntPoint& offset)
 {
     setScrollOffsetFromAnimation(offset);
 }
 
 void ScrollableArea::setScrollOffsetFromAnimation(const IntPoint& offset)
@@ skipping 125 matching lines @@
         window->scheduleAnimation();
         return true;
     }
     return false;
 }
 
 void ScrollableArea::serviceScrollAnimations(double monotonicTime)
 {
     if (ScrollAnimator* scrollAnimator = existingScrollAnimator())
         scrollAnimator->serviceScrollAnimations();
-    if (ProgrammaticScrollAnimator* programmaticScrollAnimator = existingProgrammaticScrollAnimator())
-        programmaticScrollAnimator->tickAnimation(monotonicTime);
-}
-
-void ScrollableArea::cancelProgrammaticScrollAnimation()
-{
-    if (ProgrammaticScrollAnimator* programmaticScrollAnimator = existingProgrammaticScrollAnimator())
-        programmaticScrollAnimator->cancelAnimation();
 }
 
 IntPoint ScrollableArea::clampScrollPosition(const IntPoint& scrollPosition) const
 {
     return scrollPosition.shrunkTo(maximumScrollPosition()).expandedTo(minimumScrollPosition());
 }
 
 int ScrollableArea::lineStep(ScrollbarOrientation) const
 {
     return pixelsPerLineStep();
 }
 
 int ScrollableArea::documentStep(ScrollbarOrientation orientation) const
 {
     return scrollSize(orientation);
 }
 
 float ScrollableArea::pixelStep(ScrollbarOrientation) const
 {
     return 1;
 }
 
 } // namespace blink