third_party/WebKit/Source/core/loader/FrameLoader.h - 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.h

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

« no previous file with comments | « third_party/WebKit/Source/core/loader/DocumentThreadableLoader.cpp ('k') | third_party/WebKit/Source/core/loader/FrameLoader.cpp » ('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.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;

haraken 2016/07/28 14:44:46 Is this change needed?

dcheng 2016/07/29 02:23:18 Yes: in this CL, Timer no longer takes a TaskRunne

bool m_didAccessInitialDocument;