Index: third_party/WebKit/Source/core/frame/FrameView.h |
diff --git a/third_party/WebKit/Source/core/frame/FrameView.h b/third_party/WebKit/Source/core/frame/FrameView.h |
index a991ad06ef9798a4636bf9c61c6d3bfe2bbe8508..2087bfe2ebb632c072dd36eb436ea0e5be315592 100644 |
--- a/third_party/WebKit/Source/core/frame/FrameView.h |
+++ b/third_party/WebKit/Source/core/frame/FrameView.h |
@@ -228,7 +228,7 @@ public: |
void restoreScrollbar(); |
- void postLayoutTimerFired(Timer<FrameView>*); |
+ void postLayoutTimerFired(TimerBase*); |
bool safeToPropagateScrollToParent() const { return m_safeToPropagateScrollToParent; } |
void setSafeToPropagateScrollToParent(bool isSafe) { m_safeToPropagateScrollToParent = isSafe; } |
@@ -720,13 +720,13 @@ private: |
void updateScrollableAreaSet(); |
void scheduleUpdateWidgetsIfNecessary(); |
- void updateWidgetsTimerFired(Timer<FrameView>*); |
+ void updateWidgetsTimerFired(TimerBase*); |
bool updateWidgets(); |
bool processUrlFragmentHelper(const String&, UrlFragmentBehavior); |
void setFragmentAnchor(Node*); |
void scrollToFragmentAnchor(); |
- void didScrollTimerFired(Timer<FrameView>*); |
+ void didScrollTimerFired(TimerBase*); |
void updateLayersAndCompositingAfterScrollIfNeeded(const DoubleSize& scrollDelta); |