cc/resources/picture.h - Issue 638353002: [C++11 Allowed Features] Declares a type-safe null pointer converting from NULL to nullptr in src/…

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/resources/picture.h

Issue 638353002: [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: Formating. 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

Index: cc/resources/picture.h

diff --git a/cc/resources/picture.h b/cc/resources/picture.h

index 69e32939bcaca0ae9c2838b9b84573d5c1c6dc93..153f1e719dd8f271a9e535bc13c0bd80e5df616f 100644

--- a/cc/resources/picture.h

+++ b/cc/resources/picture.h

@@ -47,7 +47,7 @@ class CC_EXPORT Picture

enum RecordingMode {

RECORD_NORMALLY,

- RECORD_WITH_SK_NULL_CANVAS,

+ RECORD_WITH_SK_nullptr_CANVAS,

danakj 2014/10/10 17:03:22 undo this

RECORD_WITH_PAINTING_DISABLED,

RECORD_WITH_SKRECORD,

RECORDING_MODE_COUNT, // Must be the last entry.

@@ -65,7 +65,7 @@ class CC_EXPORT Picture

gfx::Rect LayerRect() const { return layer_rect_; }

// Has Record() been called yet?

- bool HasRecording() const { return picture_.get() != NULL; }

+ bool HasRecording() const { return picture_.get() != nullptr; }

bool IsSuitableForGpuRasterization() const;

int ApproximateOpCount() const;

« cc/output/software_renderer.cc ('K') | « cc/resources/one_copy_raster_worker_pool.cc ('k') | cc/resources/picture.cc » ('j') | cc/resources/picture_layer_tiling.h » ('J')