Rename kAnimatingScrollOnMainThread to kHandlingScrollFromMainThread

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 517 matching lines @@
 bool ScrollableArea::shouldScrollOnMainThread() const
 {
     if (GraphicsLayer* layer = layerForScrolling()) {
         uint32_t reasons = layer->platformLayer()->mainThreadScrollingReasons();
         // Should scroll on main thread unless the reason is the one that is set
         // by the ScrollAnimator, in which case, the animation can still be
         // scheduled on the compositor.
         // TODO(ymalik): We have a non-transient "main thread scrolling reason"
         // that doesn't actually cause shouldScrollOnMainThread() to be true.
         // This is confusing and should be cleaned up.
-        return !!(reasons & ~MainThreadScrollingReason::kAnimatingScrollOnMainThread);
+        return !!(reasons & ~MainThreadScrollingReason::kHandlingScrollFromMainThread);
     }
     return true;
 }
 
 DoubleRect ScrollableArea::visibleContentRectDouble(IncludeScrollbarsInRect scrollbarInclusion) const
 {
     return visibleContentRect(scrollbarInclusion);
 }
 
 IntRect ScrollableArea::visibleContentRect(IncludeScrollbarsInRect scrollbarInclusion) const
@@ skipping 63 matching lines @@
         std::max(0, size.height() - horizontalScrollbarHeight()));
 }
 
 DEFINE_TRACE(ScrollableArea)
 {
     visitor->trace(m_scrollAnimator);
     visitor->trace(m_programmaticScrollAnimator);
 }
 
 } // namespace blink