third_party/WebKit/Source/core/loader/FrameLoader.cpp - Issue 2191533003: Refactor Timer classes in preparation for landing FrameTimers.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/core/loader/FrameLoader.cpp

Issue 2191533003: Refactor Timer classes in preparation for landing FrameTimers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Android build fix Created 4 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« third_party/WebKit/Source/core/loader/FrameLoader.h ('K') | « third_party/WebKit/Source/core/loader/FrameLoader.h ('k') | third_party/WebKit/Source/core/loader/ImageLoader.h » ('j') | third_party/WebKit/Source/core/svg/graphics/SVGImageChromeClient.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 43367d5e55a90ee8ace9a650edeb1c20f47f9b7d..15e0213f6cf1cdec29f6454347b97d95465e93c6 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)

@@ -661,7 +661,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())