cc/layers/delegated_renderer_layer.cc - Issue 643583003: [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/layers/delegated_renderer_layer.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: Presubmit 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

« no previous file with comments | « cc/layers/delegated_frame_resource_collection_unittest.cc ('k') | cc/layers/delegated_renderer_layer_impl.cc » ('j') | cc/layers/texture_layer_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: cc/layers/delegated_renderer_layer.cc

diff --git a/cc/layers/delegated_renderer_layer.cc b/cc/layers/delegated_renderer_layer.cc

index bf903052a573aa1e9668cd68d51adc91a0a8f873..f95c9bd205b1bd9077dfcb7bf4d834ffb8e032f1 100644

--- a/cc/layers/delegated_renderer_layer.cc

+++ b/cc/layers/delegated_renderer_layer.cc

@@ -22,7 +22,7 @@ DelegatedRendererLayer::DelegatedRendererLayer(

: Layer(),

frame_provider_(frame_provider),

should_collect_new_frame_(true),

- frame_data_(NULL),

+ frame_data_(nullptr),

weak_ptrs_(this) {

frame_provider_->AddObserver(this);

}

@@ -69,7 +69,7 @@ void DelegatedRendererLayer::PushPropertiesTo(LayerImpl* impl) {

if (frame_data_)

delegated_impl->SetFrameData(frame_data_, frame_damage_);

- frame_data_ = NULL;

+ frame_data_ = nullptr;

frame_damage_ = gfx::RectF();

}