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

Side by Side Diff: content/common/android/surface_texture_peer.cc

Issue 649533003: C++11 declares a type safe null pointer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed Presubmit errors 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 | « content/common/android/surface_texture_manager.cc ('k') | content/common/cc_messages.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "content/common/android/surface_texture_peer.h" 5 #include "content/common/android/surface_texture_peer.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 8
9 namespace content { 9 namespace content {
10 10
11 namespace { 11 namespace {
12 SurfaceTexturePeer* g_instance_ = NULL; 12 SurfaceTexturePeer* g_instance_ = nullptr;
13 } // namespace 13 } // namespace
14 14
15 SurfaceTexturePeer::SurfaceTexturePeer() { 15 SurfaceTexturePeer::SurfaceTexturePeer() {
16 } 16 }
17 17
18 SurfaceTexturePeer::~SurfaceTexturePeer() { 18 SurfaceTexturePeer::~SurfaceTexturePeer() {
19 } 19 }
20 20
21 // static 21 // static
22 SurfaceTexturePeer* SurfaceTexturePeer::GetInstance() { 22 SurfaceTexturePeer* SurfaceTexturePeer::GetInstance() {
23 DCHECK(g_instance_); 23 DCHECK(g_instance_);
24 return g_instance_; 24 return g_instance_;
25 } 25 }
26 26
27 // static 27 // static
28 void SurfaceTexturePeer::InitInstance(SurfaceTexturePeer* instance) { 28 void SurfaceTexturePeer::InitInstance(SurfaceTexturePeer* instance) {
29 DCHECK(!g_instance_); 29 DCHECK(!g_instance_);
30 g_instance_ = instance; 30 g_instance_ = instance;
31 } 31 }
32 32
33 } // namespace content 33 } // namespace content
OLDNEW
« no previous file with comments | « content/common/android/surface_texture_manager.cc ('k') | content/common/cc_messages.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698