cc/debug/micro_benchmark.cc - Issue 643583003: [C++11 Allowed Features] Declares a type-safe null pointer converting from NULL to nullptr in src/…

Side by Side Diff

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

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

Side by Side Diff: cc/debug/micro_benchmark.cc

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

Patch Set: foramted. 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 unified diff | Download patch

« no previous file with comments | « cc/debug/invalidation_benchmark.cc ('k') | cc/debug/picture_record_benchmark.cc » ('j') | cc/layers/layer.h » ('J')

OLD	NEW
1 // Copyright 2013 The Chromium Authors. All rights reserved.	1 // Copyright 2013 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "cc/debug/micro_benchmark.h"	5 #include "cc/debug/micro_benchmark.h"

6	6

7 #include "base/callback.h"	7 #include "base/callback.h"

8 #include "base/logging.h"	8 #include "base/logging.h"

9 #include "base/memory/scoped_ptr.h"	9 #include "base/memory/scoped_ptr.h"

10 #include "base/message_loop/message_loop_proxy.h"	10 #include "base/message_loop/message_loop_proxy.h"

(...skipping 36 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
47	47

48 scoped_ptr<MicroBenchmarkImpl> MicroBenchmark::GetBenchmarkImpl(	48 scoped_ptr<MicroBenchmarkImpl> MicroBenchmark::GetBenchmarkImpl(

49 scoped_refptr<base::MessageLoopProxy> origin_loop) {	49 scoped_refptr<base::MessageLoopProxy> origin_loop) {

50 DCHECK(!processed_for_benchmark_impl_);	50 DCHECK(!processed_for_benchmark_impl_);

51 processed_for_benchmark_impl_ = true;	51 processed_for_benchmark_impl_ = true;

52 return CreateBenchmarkImpl(origin_loop);	52 return CreateBenchmarkImpl(origin_loop);

53 }	53 }

54	54

55 scoped_ptr<MicroBenchmarkImpl> MicroBenchmark::CreateBenchmarkImpl(	55 scoped_ptr<MicroBenchmarkImpl> MicroBenchmark::CreateBenchmarkImpl(

56 scoped_refptr<base::MessageLoopProxy> origin_loop) {	56 scoped_refptr<base::MessageLoopProxy> origin_loop) {

57 return make_scoped_ptr<MicroBenchmarkImpl>(NULL);	57 return make_scoped_ptr<MicroBenchmarkImpl>(nullptr);

58 }	58 }

59	59

60 } // namespace cc	60 } // namespace cc

OLD	NEW