Revert of Implement Element.scrollIntoView for scroll-behavior: smooth.

third_party/WebKit/Source/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 19 matching lines @@
  */
 
 #include "platform/scroll/ScrollableArea.h"
 
 #include "platform/PlatformChromeClient.h"
 #include "platform/graphics/GraphicsLayer.h"
 #include "platform/instrumentation/tracing/TraceEvent.h"
 #include "platform/scroll/MainThreadScrollingReason.h"
 #include "platform/scroll/ProgrammaticScrollAnimator.h"
 #include "platform/scroll/ScrollbarTheme.h"
-#include "platform/scroll/SmoothScrollSequencer.h"
 
 static const int kPixelsPerLineStep = 40;
 static const float kMinFractionToStepWhenPaging = 0.875f;
 
 namespace blink {
 
 int ScrollableArea::PixelsPerLineStep(PlatformChromeClient* host) {
   if (!host)
     return kPixelsPerLineStep;
   return host->WindowToViewportScalar(kPixelsPerLineStep);
@@ skipping 170 matching lines @@
   // the scroll origin and the derived class versions differ on whether they
   // take that into account or not.
   ScrollableArea::SetScrollOffset(new_offset, scroll_type, behavior);
 }
 
 void ScrollableArea::ProgrammaticScrollHelper(const ScrollOffset& offset,
                                               ScrollBehavior scroll_behavior) {
   CancelScrollAnimation();
 
   if (scroll_behavior == kScrollBehaviorSmooth)
-    GetProgrammaticScrollAnimator().AnimateToOffset(offset, true);
+    GetProgrammaticScrollAnimator().AnimateToOffset(offset);
   else
     GetProgrammaticScrollAnimator().ScrollToOffsetWithoutAnimation(offset);
 }
 
 void ScrollableArea::UserScrollHelper(const ScrollOffset& offset,
                                       ScrollBehavior scroll_behavior) {
   CancelProgrammaticScrollAnimation();
 
   float x = UserInputScrollable(kHorizontalScrollbar)
                 ? offset.Width()
                 : GetScrollAnimator().CurrentOffset().Width();
   float y = UserInputScrollable(kVerticalScrollbar)
                 ? offset.Height()
                 : GetScrollAnimator().CurrentOffset().Height();
 
   // Smooth user scrolls (keyboard, wheel clicks) are handled via the userScroll
   // method.
   // TODO(bokan): The userScroll method should probably be modified to call this
   //              method and ScrollAnimatorBase to have a simpler
   //              animateToOffset method like the ProgrammaticScrollAnimator.
   DCHECK_EQ(scroll_behavior, kScrollBehaviorInstant);
   GetScrollAnimator().ScrollToOffsetWithoutAnimation(ScrollOffset(x, y));
 }
 
 LayoutRect ScrollableArea::ScrollIntoView(const LayoutRect& rect_in_content,
                                           const ScrollAlignment& align_x,
                                           const ScrollAlignment& align_y,
-                                          bool is_smooth,
                                           ScrollType) {
   // TODO(bokan): This should really be implemented here but ScrollAlignment is
   // in Core which is a dependency violation.
   NOTREACHED();
   return LayoutRect();
 }
 
 void ScrollableArea::ScrollOffsetChanged(const ScrollOffset& offset,
                                          ScrollType scroll_type) {
   TRACE_EVENT0("blink", "ScrollableArea::scrollOffsetChanged");
@@ skipping 403 matching lines @@
                                          offset.y() - ScrollOrigin().Y());
   SetScrollOffset(new_offset, kCompositorScroll);
 }
 
 DEFINE_TRACE(ScrollableArea) {
   visitor->Trace(scroll_animator_);
   visitor->Trace(programmatic_scroll_animator_);
 }
 
 }  // namespace blink