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

Unified Diff: content/common/gpu/media/vaapi_h264_decoder_unittest.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/media/vaapi_h264_decoder_unittest.cc
diff --git a/content/common/gpu/media/vaapi_h264_decoder_unittest.cc b/content/common/gpu/media/vaapi_h264_decoder_unittest.cc
index 70d8220ddbe2c494788a52294a830680c1494cfd..3147658311a771c7e30a89795666610812c64ce5 100644
--- a/content/common/gpu/media/vaapi_h264_decoder_unittest.cc
+++ b/content/common/gpu/media/vaapi_h264_decoder_unittest.cc
@@ -96,7 +96,7 @@ class VaapiH264DecoderLoop {
};
VaapiH264DecoderLoop::VaapiH264DecoderLoop()
- : x_display_(NULL), num_outputted_pictures_(0), num_surfaces_(0) {
+ : x_display_(nullptr), num_outputted_pictures_(0), num_surfaces_(0) {
base::MD5Init(&md5_context_);
}
@@ -118,7 +118,7 @@ void LogOnError(VaapiH264Decoder::VAVDAH264DecoderFailure error) {
bool VaapiH264DecoderLoop::Initialize(base::FilePath input_file,
base::FilePath output_file) {
- x_display_ = XOpenDisplay(NULL);
+ x_display_ = XOpenDisplay(nullptr);
if (!x_display_) {
LOG(ERROR) << "Can't open X display";
return false;
@@ -151,7 +151,7 @@ bool VaapiH264DecoderLoop::Initialize(base::FilePath input_file,
// This creates or truncates output_file.
// Without it, AppendToFile() will not work.
if (!output_file.empty()) {
- if (base::WriteFile(output_file, NULL, 0) != 0) {
+ if (base::WriteFile(output_file, nullptr, 0) != 0) {
return false;
}
output_file_ = output_file;
« no previous file with comments | « content/common/gpu/media/vaapi_h264_decoder.cc ('k') | content/common/gpu/media/vaapi_video_decode_accelerator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698