cc/scheduler/scheduler_unittest.cc - Issue 22926024: cc: Control activation from the Scheduler

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: cc/scheduler/scheduler_unittest.cc

Issue 22926024: cc: Control activation from the Scheduler (Closed) Base URL: http://git.chromium.org/chromium/src.git@schedOutputSurface4

Patch Set: remove hacks, address comments, force activation to prevent deadlock Created 7 years, 4 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:

Index: cc/scheduler/scheduler_unittest.cc

diff --git a/cc/scheduler/scheduler_unittest.cc b/cc/scheduler/scheduler_unittest.cc

index 376a433b4dfede4f44c7f4ed9355bfad65e055c3..f3266145e3fa04179d437df8890e65ae51ed215e 100644

--- a/cc/scheduler/scheduler_unittest.cc

+++ b/cc/scheduler/scheduler_unittest.cc

@@ -114,8 +114,8 @@ class FakeSchedulerClient : public SchedulerClient {

actions_.push_back("ScheduledActionUpdateVisibleTiles");

states_.push_back(scheduler_->StateAsValueForTesting().release());

}

- virtual void ScheduledActionActivatePendingTreeIfNeeded() OVERRIDE {

- actions_.push_back("ScheduledActionActivatePendingTreeIfNeeded");

+ virtual void ScheduledActionActivatePendingTree() OVERRIDE {

+ actions_.push_back("ScheduledActionActivatePendingTree");

states_.push_back(scheduler_->StateAsValueForTesting().release());

}

virtual void ScheduledActionBeginOutputSurfaceCreation() OVERRIDE {