Index: content/common/font_config_ipc_linux.cc |
diff --git a/content/common/font_config_ipc_linux.cc b/content/common/font_config_ipc_linux.cc |
index fcb06ebac0def482978e79011532e8b59804bebd..3985e6d1cf09d20eac3557acdb4ad359fd85cc2b 100644 |
--- a/content/common/font_config_ipc_linux.cc |
+++ b/content/common/font_config_ipc_linux.cc |
@@ -23,11 +23,11 @@ |
namespace content { |
-// Return a stream from the file descriptor, or NULL on failure. |
+// Return a stream from the file descriptor, or nullptr on failure. |
SkStream* StreamFromFD(int fd) { |
skia::RefPtr<SkData> data = skia::AdoptRef(SkData::NewFromFD(fd)); |
if (!data) { |
- return NULL; |
+ return nullptr; |
} |
return new SkMemoryStream(data.get()); |
} |
@@ -62,7 +62,7 @@ bool FontConfigIPC::matchFamilyName(const char familyName[], |
uint8_t reply_buf[2048]; |
const ssize_t r = UnixDomainSocket::SendRecvMsg(fd_, reply_buf, |
- sizeof(reply_buf), NULL, |
+ sizeof(reply_buf), nullptr, |
request); |
if (r == -1) |
return false; |
@@ -107,7 +107,7 @@ SkStream* FontConfigIPC::openStream(const FontIdentity& identity) { |
&result_fd, request); |
if (r == -1) |
- return NULL; |
+ return nullptr; |
Pickle reply(reinterpret_cast<char*>(reply_buf), r); |
bool result; |
@@ -116,7 +116,7 @@ SkStream* FontConfigIPC::openStream(const FontIdentity& identity) { |
!result) { |
if (result_fd) |
CloseFD(result_fd); |
- return NULL; |
+ return nullptr; |
} |
SkStream* stream = StreamFromFD(result_fd); |