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

Unified Diff: content/common/gpu/stream_texture_android.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 side-by-side diff with in-line comments
Download patch
Index: content/common/gpu/stream_texture_android.cc
diff --git a/content/common/gpu/stream_texture_android.cc b/content/common/gpu/stream_texture_android.cc
index eb7f3bbe32bfb9071cdc5e41e4495271c3c3a885..62ae4612277d318299ff708e76ae354b66ab6721 100644
--- a/content/common/gpu/stream_texture_android.cc
+++ b/content/common/gpu/stream_texture_android.cc
@@ -88,11 +88,11 @@ StreamTexture::~StreamTexture() {
void StreamTexture::OnWillDestroyStub() {
owner_stub_->RemoveDestructionObserver(this);
owner_stub_->channel()->RemoveRoute(route_id_);
- owner_stub_ = NULL;
+ owner_stub_ = nullptr;
// If the owner goes away, there is no need to keep the SurfaceTexture around.
// The GL texture will keep working regardless with the currently bound frame.
- surface_texture_ = NULL;
+ surface_texture_ = nullptr;
}
void StreamTexture::Destroy(bool have_context) {
@@ -106,7 +106,7 @@ void StreamTexture::WillUseTexImage() {
if (has_pending_frame_) {
scoped_ptr<ui::ScopedMakeCurrent> scoped_make_current;
bool needs_make_current =
- !owner_stub_->decoder()->GetGLContext()->IsCurrent(NULL);
+ !owner_stub_->decoder()->GetGLContext()->IsCurrent(nullptr);
// On Android we should not have to perform a real context switch here when
// using virtual contexts.
DCHECK(!needs_make_current || !owner_stub_->decoder()
« no previous file with comments | « content/common/gpu/media/vt_video_decode_accelerator.cc ('k') | content/common/host_shared_bitmap_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698