| Index: third_party/WebKit/Source/core/loader/FrameLoader.h
|
| diff --git a/third_party/WebKit/Source/core/loader/FrameLoader.h b/third_party/WebKit/Source/core/loader/FrameLoader.h
|
| index d137ce523251890025d573303a5b296e99ae9a28..b4e621a2209fa429aff56873fa2220c8f9859b4d 100644
|
| --- a/third_party/WebKit/Source/core/loader/FrameLoader.h
|
| +++ b/third_party/WebKit/Source/core/loader/FrameLoader.h
|
| @@ -192,8 +192,8 @@ public:
|
| static void setReferrerForFrameRequest(FrameLoadRequest&);
|
|
|
| private:
|
| - void checkTimerFired(Timer<FrameLoader>*);
|
| - void didAccessInitialDocumentTimerFired(Timer<FrameLoader>*);
|
| + void checkTimerFired(TimerBase*);
|
| + void didAccessInitialDocumentTimerFired(TimerBase*);
|
|
|
| bool prepareRequestForThisFrame(FrameLoadRequest&);
|
| FrameLoadType determineFrameLoadType(const FrameLoadRequest&);
|
| @@ -274,7 +274,7 @@ private:
|
|
|
| bool m_inStopAllLoaders;
|
|
|
| - Timer<FrameLoader> m_checkTimer;
|
| + TaskRunnerTimer<FrameLoader> m_checkTimer;
|
|
|
| bool m_didAccessInitialDocument;
|
|
|
|
|