| 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 bca05f80462497b0b65e9db18734b68eed96ec62..54b21eeeaedcb09c7e2522580cdd134daecdb937 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);
|
|
|
|
|