cc/scheduler/scheduler.cc - Issue 634243003: [C++11 Allowed Features] Declares a type-safe null pointer converting from NULL to nullptr [part-4]

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.cc

Issue 634243003: [C++11 Allowed Features] Declares a type-safe null pointer converting from NULL to nullptr [part-4] (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Formating fix. Created 6 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

« cc/scheduler/begin_frame_source.cc ('K') | « cc/scheduler/delay_based_time_source_unittest.cc ('k') | cc/test/fake_content_layer_client.cc » ('j') | cc/test/test_web_graphics_context_3d.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: cc/scheduler/scheduler.cc

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

index 5b15a5a60f990de3f088e76bf89f5d903f41cd6b..c0f10f9039eb3612d5fbf881ee7d2a6ce3b11e8c 100644

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

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

@@ -75,11 +75,11 @@ Scheduler::Scheduler(

const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,

SchedulerFrameSourcesConstructor* frame_sources_constructor)

: frame_source_(),

- primary_frame_source_(NULL),

- background_frame_source_(NULL),

+ primary_frame_source_(nullptr),

+ background_frame_source_(nullptr),

primary_frame_source_internal_(),

background_frame_source_internal_(),

- vsync_observer_(NULL),

+ vsync_observer_(nullptr),

settings_(scheduler_settings),

client_(client),

layer_tree_host_id_(layer_tree_host_id),