| 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();
|
|
|