| Index: third_party/WebKit/Source/platform/mac/ScrollAnimatorMac.mm
|
| diff --git a/third_party/WebKit/Source/platform/mac/ScrollAnimatorMac.mm b/third_party/WebKit/Source/platform/mac/ScrollAnimatorMac.mm
|
| index 584746deedc4d45474a21e929ccd72372c101456..287279d20b3d247e40df7756ec4a365a6f8e37cf 100644
|
| --- a/third_party/WebKit/Source/platform/mac/ScrollAnimatorMac.mm
|
| +++ b/third_party/WebKit/Source/platform/mac/ScrollAnimatorMac.mm
|
| @@ -320,7 +320,7 @@ public:
|
| m_startTime = WTF::currentTime();
|
| // Set the framerate of the animation. NSAnimation uses a default
|
| // framerate of 60 Hz, so use that here.
|
| - m_timer.startRepeating(1.0 / 60.0, FROM_HERE);
|
| + m_timer.startRepeating(1.0 / 60.0, BLINK_FROM_HERE);
|
| }
|
|
|
| void stop()
|
| @@ -1122,7 +1122,7 @@ void ScrollAnimatorMac::updateScrollerStyle()
|
|
|
| void ScrollAnimatorMac::startScrollbarPaintTimer()
|
| {
|
| - m_initialScrollbarPaintTimer.startOneShot(0.1, FROM_HERE);
|
| + m_initialScrollbarPaintTimer.startOneShot(0.1, BLINK_FROM_HERE);
|
| }
|
|
|
| bool ScrollAnimatorMac::scrollbarPaintTimerIsActive() const
|
| @@ -1150,7 +1150,7 @@ void ScrollAnimatorMac::sendContentAreaScrolledSoon(const FloatSize& delta)
|
| m_contentAreaScrolledTimerScrollDelta = delta;
|
|
|
| if (!m_sendContentAreaScrolledTimer.isActive())
|
| - m_sendContentAreaScrolledTimer.startOneShot(0, FROM_HERE);
|
| + m_sendContentAreaScrolledTimer.startOneShot(0, BLINK_FROM_HERE);
|
| }
|
|
|
| void ScrollAnimatorMac::sendContentAreaScrolledTimerFired(Timer<ScrollAnimatorMac>*)
|
|
|