third_party/WebKit/Source/platform/TimerTest.cpp - Issue 1402933002: Revert "Post loading tasks on the appropriate WebFrameScheduler's queue."

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/platform/TimerTest.cpp

Issue 1402933002: Revert "Post loading tasks on the appropriate WebFrameScheduler's queue." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix bad merge Created 5 years, 2 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/FrameLoader.cpp ('k') | third_party/WebKit/Source/platform/graphics/RecordingImageBufferSurfaceTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/platform/TimerTest.cpp

diff --git a/third_party/WebKit/Source/platform/TimerTest.cpp b/third_party/WebKit/Source/platform/TimerTest.cpp

index a75a16ac143064d2072a94504b2fafdf8245a838..91b62dc0532fbe3bc2e12e02736b04d25862f5a3 100644

--- a/third_party/WebKit/Source/platform/TimerTest.cpp

+++ b/third_party/WebKit/Source/platform/TimerTest.cpp

@@ -77,7 +77,7 @@ public:

explicit MockWebTaskRunner(std::priority_queue<DelayedTask>* timerTasks) : m_timerTasks(timerTasks) { }

~MockWebTaskRunner() override { }

- void postTask(const WebTraceLocation&, Task* task) override

+ virtual void postTask(const WebTraceLocation&, Task* task)

{

m_timerTasks->push(DelayedTask(task, 0));

}

@@ -87,12 +87,6 @@ public:

m_timerTasks->push(DelayedTask(task, delayMs * 0.001));

}

- WebTaskRunner* clone() override

- {

- ASSERT_NOT_REACHED();

- return nullptr;

- }

std::priority_queue<DelayedTask>* m_timerTasks; // NOT OWNED

};