Move ScrollableArea timer to TaskRunnerTimer.

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/HostWindow.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 "public/platform/Platform.h"
+#include "public/platform/WebScheduler.h"
+#include "public/platform/WebThread.h"
 
 static const int kPixelsPerLineStep = 40;
 static const float kMinFractionToStepWhenPaging = 0.875f;
 
 namespace blink {
 
 int ScrollableArea::pixelsPerLineStep(HostWindow* host) {
   if (!host)
     return kPixelsPerLineStep;
   return host->windowToViewportScalar(kPixelsPerLineStep);
@@ skipping 520 matching lines @@
       ScrollbarTheme::theme().overlayScrollbarFadeOutDelaySeconds() +
       ScrollbarTheme::theme().overlayScrollbarFadeOutDurationSeconds();
 
   // If the overlay scrollbars don't fade out, don't do anything. This is the
   // case for the mock overlays used in tests and on Mac, where the fade-out is
   // animated in ScrollAnimatorMac.
   if (!timeUntilDisable)
     return;
 
   if (!m_fadeOverlayScrollbarsTimer) {
-    m_fadeOverlayScrollbarsTimer.reset(new Timer<ScrollableArea>(
-        this, &ScrollableArea::fadeOverlayScrollbarsTimerFired));
+    m_fadeOverlayScrollbarsTimer.reset(new TaskRunnerTimer<ScrollableArea>(
+        getTimerTaskRunner(), this,
+        &ScrollableArea::fadeOverlayScrollbarsTimerFired));
   }
 
   if (!m_scrollbarCaptured && !m_mouseOverScrollbar) {
     m_fadeOverlayScrollbarsTimer->startOneShot(timeUntilDisable,
                                                BLINK_FROM_HERE);
   }
 }
 
 IntRect ScrollableArea::visibleContentRect(
     IncludeScrollbarsInRect scrollbarInclusion) const {
@@ skipping 58 matching lines @@
 }
 
 FloatQuad ScrollableArea::localToVisibleContentQuad(const FloatQuad& quad,
                                                     const LayoutObject*,
                                                     unsigned) const {
   FloatQuad result(quad);
   result.move(-getScrollOffset());
   return result;
 }
 
+RefPtr<WebTaskRunner> ScrollableArea::getTimerTaskRunner() const {

[haraken, 2017/01/20 05:45:51]

I'd prefer making this a pure virtual method and override getTimerTaskRunner on
all subclasses.

[jbroman, 2017/01/20 15:55:17]

Done.

+  WebThread* thread = Platform::current()->mainThread();
+  DCHECK(thread->isCurrentThread());
+  return thread->scheduler()->timerTaskRunner();
+}
+
 IntSize ScrollableArea::excludeScrollbars(const IntSize& size) const {
   return IntSize(std::max(0, size.width() - verticalScrollbarWidth()),
                  std::max(0, size.height() - horizontalScrollbarHeight()));
 }
 
 DEFINE_TRACE(ScrollableArea) {
   visitor->trace(m_scrollAnimator);
   visitor->trace(m_programmaticScrollAnimator);
 }
 
 }  // namespace blink