Clean up viewport scrolling methods in CC

ui/events/blink/input_handler_proxy.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/events/blink/input_handler_proxy.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 
@@ skipping 1022 matching lines @@
                        "InputHandlerProxy::ExtendBoostedFlingTimeout",
                        TRACE_EVENT_SCOPE_THREAD);
   deferred_fling_cancel_time_seconds_ =
       event.timeStampSeconds + kFlingBoostTimeoutDelaySeconds;
   last_fling_boost_event_ = event;
 }
 
 void InputHandlerProxy::Animate(base::TimeTicks time) {
   // If using synchronous animate, then only expect Animate attempts started by
   // the synchronous system. Don't let the InputHandler try to Animate also.
-  DCHECK(!input_handler_->IsCurrentlyScrollingInnerViewport() ||
+  DCHECK(!input_handler_->IsCurrentlyScrollingViewport() ||
          allow_root_animate_);
 
   if (scroll_elasticity_controller_)
     scroll_elasticity_controller_->Animate(time);
 
   if (!fling_curve_)
     return;
 
   last_fling_animate_time_ = time;
   double monotonic_time_sec = InSecondsF(time);
@@ skipping 184 matching lines @@
   }
 
   return had_fling_animation;
 }
 
 void InputHandlerProxy::RequestAnimation() {
   // When a SynchronousInputHandler is present, root flings should go through
   // it to allow it to control when or if the root fling is animated. Non-root
   // flings always go through the normal InputHandler.
   if (synchronous_input_handler_ &&
-      input_handler_->IsCurrentlyScrollingInnerViewport())
+      input_handler_->IsCurrentlyScrollingViewport())
     synchronous_input_handler_->SetNeedsSynchronousAnimateInput();
   else
     input_handler_->SetNeedsAnimateInput();
 }
 
 bool InputHandlerProxy::TouchpadFlingScroll(
     const WebFloatSize& increment) {
   InputHandlerProxy::EventDisposition disposition;
   cc::EventListenerProperties properties =
       input_handler_->GetEventListenerProperties(
@@ skipping 132 matching lines @@
   // is made asynchronously, to minimize divergence between main thread and
   // impl thread event handling paths.
   base::ThreadTaskRunnerHandle::Get()->PostTask(
       FROM_HERE,
       base::Bind(&InputScrollElasticityController::ObserveGestureEventAndResult,
                  scroll_elasticity_controller_->GetWeakPtr(), gesture_event,
                  scroll_result));
 }
 
 }  // namespace ui