Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3341)

Unified Diff: cc/blink/web_external_texture_layer_impl.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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | cc/blink/web_layer_impl.cc » ('j') | cc/layers/layer.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/blink/web_external_texture_layer_impl.cc
diff --git a/cc/blink/web_external_texture_layer_impl.cc b/cc/blink/web_external_texture_layer_impl.cc
index e6c8a64607da14d1c846e7ad2cc79efc1899c675..85aac10fe0d079a16c7ac103acfabb8f3a181839 100644
--- a/cc/blink/web_external_texture_layer_impl.cc
+++ b/cc/blink/web_external_texture_layer_impl.cc
@@ -25,7 +25,7 @@ namespace cc_blink {
WebExternalTextureLayerImpl::WebExternalTextureLayerImpl(
blink::WebExternalTextureLayerClient* client)
: client_(client) {
- cc::TextureLayerClient* cc_client = client_ ? this : NULL;
+ cc::TextureLayerClient* cc_client = client_ ? this : nullptr;
scoped_refptr<TextureLayer> layer = TextureLayer::CreateForMailbox(cc_client);
layer->SetIsDrawable(true);
layer_.reset(new WebLayerImpl(layer));
@@ -67,7 +67,7 @@ bool WebExternalTextureLayerImpl::PrepareTextureMailbox(
scoped_ptr<cc::SingleReleaseCallback>* release_callback,
bool use_shared_memory) {
blink::WebExternalTextureMailbox client_mailbox;
- WebExternalBitmapImpl* bitmap = NULL;
+ WebExternalBitmapImpl* bitmap = nullptr;
if (use_shared_memory)
bitmap = AllocateBitmap();
« no previous file with comments | « no previous file | cc/blink/web_layer_impl.cc » ('j') | cc/layers/layer.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698