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

core/src/fxge/skia/fx_skia_blitter_new.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/include/fxge/fx_ge.h"
 
 //#define _SKIA_SUPPORT_
 #if defined(_SKIA_SUPPORT_)
 #include "SkBlitter.h"
 #include "core/include/fxcodec/fx_codec.h"
 #include "fx_skia_blitter_new.h"
 
 // We use our own renderer here to make it simple
 void CFX_SkiaRenderer::blitAntiH(int x,
                                  int y,
                                  const SkAlpha antialias[],
                                  const int16_t runs[]) {
   FXSYS_assert(m_Alpha);
-  if (m_pOriDevice == NULL && composite_span == NULL)
+  if (!m_pOriDevice && !composite_span)
     return;
   if (y < m_ClipBox.top || y >= m_ClipBox.bottom)
     return;
   while (1) {
     int width = runs[0];
     SkASSERT(width >= 0);
     if (width <= 0)
       return;
     unsigned aa = antialias[0];
     if (aa)
@@ skipping 69 matching lines @@
   ASSERT(!m_pDevice->IsCmykImage());
   dest_scan = (uint8_t*)m_pDevice->GetScanline(span_top) + span_left / 8;
   int col_start = span_left < clip_left ? clip_left - span_left : 0;
   int col_end =
       (span_left + span_len) < clip_right ? span_len : (clip_right - span_left);
   if (col_end < col_start)
     return;  // do nothing.
   dest_scan += col_start / 8;
 
   int index = 0;
-  if (m_pDevice->GetPalette() == NULL)
-    index = ((uint8_t)m_Color == 0xff) ? 1 : 0;
-  else {
-    for (int i = 0; i < 2; i++)
+  if (m_pDevice->GetPalette()) {
+    for (int i = 0; i < 2; i++) {
       if (FXARGB_TODIB(m_pDevice->GetPalette()[i]) == m_Color)
         index = i;
+    }
+  } else {
+    index = ((uint8_t)m_Color == 0xff) ? 1 : 0;
   }
   uint8_t* dest_scan1 = dest_scan;
   int src_alpha = m_Alpha * cover_scan / 255;
   for (int col = col_start; col < col_end; col++) {
     if (src_alpha) {
       if (!index)
         *dest_scan1 &= ~(1 << (7 - (col + span_left) % 8));
       else
         *dest_scan1 |= 1 << (7 - (col + span_left) % 8);
     }
@@ skipping 18 matching lines @@
   clip_scan = (uint8_t*)m_pClipMask->GetScanline(span_top - clip_top) -
               clip_left + span_left;
   int col_start = span_left < clip_left ? clip_left - span_left : 0;
   int col_end =
       (span_left + span_len) < clip_right ? span_len : (clip_right - span_left);
   if (col_end < col_start)
     return;  // do nothing.
   dest_scan += col_start / 8;
 
   int index = 0;
-  if (m_pDevice->GetPalette() == NULL)
-    index = ((uint8_t)m_Color == 0xff) ? 1 : 0;
-  else {
-    for (int i = 0; i < 2; i++)
+  if (m_pDevice->GetPalette()) {
+    for (int i = 0; i < 2; i++) {
       if (FXARGB_TODIB(m_pDevice->GetPalette()[i]) == m_Color)
         index = i;
+    }
+  } else {
+    index = ((uint8_t)m_Color == 0xff) ? 1 : 0;
   }
   uint8_t* dest_scan1 = dest_scan;
   int src_alpha = m_Alpha * cover_scan / 255;
   for (int col = col_start; col < col_end; col++) {
     int src_alpha1 = src_alpha * clip_scan[col] / 255;
     if (src_alpha1) {
       if (!index)
         *dest_scan1 &= ~(1 << (7 - (col + span_left) % 8));
       else
         *dest_scan1 |= 1 << (7 - (col + span_left) % 8);
@@ skipping 1560 matching lines @@
     case 15:
       // TODO...
       break;
     case 10:
       composite_span = &CFX_SkiaRenderer::CompositeSpanRGB24_10;
       break;
     case 14:
       composite_span = &CFX_SkiaRenderer::CompositeSpanRGB24_14;
       break;
   }
-  if (composite_span == NULL)
-    return FALSE;
-  return TRUE;
+  return !!composite_span;
 }
 
 /*----------------------------------------------------------------------------------------------------*/
 void CFX_SkiaA8Renderer::blitAntiH(int x,
                                    int y,
                                    const SkAlpha antialias[],
                                    const int16_t runs[]) {
   FXSYS_assert(m_pDevice);
   int dst_y = y - m_Top;
   if (dst_y < 0 || dst_y >= m_pDevice->GetHeight())
@@ skipping 89 matching lines @@
   m_pDevice = pDevice;
   m_Left = Left;
   m_Top = Top;
   if (pDevice) {
     m_dstWidth = m_Left + pDevice->GetWidth();
     m_dstHeight = m_Top + pDevice->GetHeight();
   }
   return TRUE;
 }
 #endif