Index: third_party/WebKit/Source/core/loader/FrameLoader.cpp |
diff --git a/third_party/WebKit/Source/core/loader/FrameLoader.cpp b/third_party/WebKit/Source/core/loader/FrameLoader.cpp |
index 748336e8359906c0a7221561e15160e1472385cf..a0e421023bfb543d37c020c656c6faf4d4667de9 100644 |
--- a/third_party/WebKit/Source/core/loader/FrameLoader.cpp |
+++ b/third_party/WebKit/Source/core/loader/FrameLoader.cpp |
@@ -169,7 +169,7 @@ FrameLoader::FrameLoader(LocalFrame* frame) |
, m_progressTracker(ProgressTracker::create(frame)) |
, m_loadType(FrameLoadTypeStandard) |
, m_inStopAllLoaders(false) |
- , m_checkTimer(this, &FrameLoader::checkTimerFired, TaskRunnerHelper::getLoadingTaskRunner(frame)) |
+ , m_checkTimer(TaskRunnerHelper::getLoadingTaskRunner(frame), this, &FrameLoader::checkTimerFired) |
, m_didAccessInitialDocument(false) |
, m_forcedSandboxFlags(SandboxNone) |
, m_dispatchingDidClearWindowObjectInMainWorld(false) |
@@ -666,7 +666,7 @@ void FrameLoader::checkCompleted() |
toLocalFrame(parent)->loader().checkCompleted(); |
} |
-void FrameLoader::checkTimerFired(Timer<FrameLoader>*) |
+void FrameLoader::checkTimerFired(TimerBase*) |
{ |
if (Page* page = m_frame->page()) { |
if (page->defersLoading()) |