| Index: third_party/WebKit/Source/core/frame/FrameView.cpp
|
| diff --git a/third_party/WebKit/Source/core/frame/FrameView.cpp b/third_party/WebKit/Source/core/frame/FrameView.cpp
|
| index 5c308d51c0a1411b380ee76631b51c9c74d3781e..290d8cb07093c20500c44eef1abd01b2e37aa3ca 100644
|
| --- a/third_party/WebKit/Source/core/frame/FrameView.cpp
|
| +++ b/third_party/WebKit/Source/core/frame/FrameView.cpp
|
| @@ -1646,7 +1646,7 @@ void FrameView::setLayoutSize(const IntSize& size)
|
| setLayoutSizeInternal(size);
|
| }
|
|
|
| -void FrameView::didScrollTimerFired(Timer<FrameView>*)
|
| +void FrameView::didScrollTimerFired(TimerBase*)
|
| {
|
| if (m_frame->document() && !m_frame->document()->layoutViewItem().isNull())
|
| m_frame->document()->fetcher()->updateAllImageResourcePriorities();
|
| @@ -2069,7 +2069,7 @@ bool FrameView::updateWidgets()
|
| return m_partUpdateSet.isEmpty();
|
| }
|
|
|
| -void FrameView::updateWidgetsTimerFired(Timer<FrameView>*)
|
| +void FrameView::updateWidgetsTimerFired(TimerBase*)
|
| {
|
| ASSERT(!isInPerformLayout());
|
| m_updateWidgetsTimer.stop();
|
| @@ -2168,7 +2168,7 @@ void FrameView::sendResizeEventIfNeeded()
|
| InspectorInstrumentation::didResizeMainFrame(m_frame.get());
|
| }
|
|
|
| -void FrameView::postLayoutTimerFired(Timer<FrameView>*)
|
| +void FrameView::postLayoutTimerFired(TimerBase*)
|
| {
|
| performPostLayoutTasks();
|
| }
|
|
|