Merge to XFA: Get rid of most instance of 'foo == NULL'

TBR=tsepez@chromium.org

Review URL: https://codereview.chromium.org/1520063002 .

(cherry picked from commit e385244f8cd6ae376f6b3cf1265a0795d5d30eff)

Review URL: https://codereview.chromium.org/1528763003 .

1 files changed, 4 insertions, 4 deletions

diff --git a/core/src/fxge/ge/fx_ge_font.cpp b/core/src/fxge/ge/fx_ge_font.cpp
index 92dbf3adeb..4c0cef40c4 100644
--- a/core/src/fxge/ge/fx_ge_font.cpp
+++ b/core/src/fxge/ge/fx_ge_font.cpp
@@ -373,7 +373,7 @@ FX_BOOL CFX_Font::IsFixedWidth() const {
 }
 
 CFX_WideString CFX_Font::GetPsName() const {
-  if (m_Face == NULL) {
+  if (!m_Face) {
     return CFX_WideString();
   }
   CFX_WideString psName =
@@ -384,7 +384,7 @@ CFX_WideString CFX_Font::GetPsName() const {
   return psName;
 }
 CFX_ByteString CFX_Font::GetFamilyName() const {
-  if (m_Face == NULL && m_pSubstFont == NULL) {
+  if (!m_Face && !m_pSubstFont) {
     return CFX_ByteString();
   }
   if (m_Face) {
@@ -393,7 +393,7 @@ CFX_ByteString CFX_Font::GetFamilyName() const {
   return m_pSubstFont->m_Family;
 }
 CFX_ByteString CFX_Font::GetFaceName() const {
-  if (m_Face == NULL && m_pSubstFont == NULL) {
+  if (!m_Face && !m_pSubstFont) {
     return CFX_ByteString();
   }
   if (m_Face) {
@@ -411,7 +411,7 @@ CFX_ByteString CFX_Font::GetFaceName() const {
   return m_pSubstFont->m_Family;
 }
 FX_BOOL CFX_Font::GetBBox(FX_RECT& bbox) {
-  if (m_Face == NULL) {
+  if (!m_Face) {
     return FALSE;
   }
   int em = FXFT_Get_Face_UnitsPerEM(m_Face);