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

core/src/fpdfdoc/doc_ocg.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.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "core/include/fpdfdoc/fpdf_doc.h"
 
 static int32_t FPDFDOC_OCG_FindGroup(const CPDF_Object* pObject,
                                      const CPDF_Dictionary* pGroupDict) {
   if (!pObject || !pGroupDict)
     return -1;
 
   if (const CPDF_Array* pArray = pObject->AsArray()) {
     FX_DWORD dwCount = pArray->GetCount();
     for (FX_DWORD i = 0; i < dwCount; i++) {
       if (pArray->GetDict(i) == pGroupDict)
         return i;
     }
     return -1;
   }
   return pObject->GetDict() == pGroupDict ? 0 : -1;
 }
 static FX_BOOL FPDFDOC_OCG_HasIntent(const CPDF_Dictionary* pDict,
                                      const CFX_ByteStringC& csElement,
                                      const CFX_ByteStringC& csDef = "") {
-  FXSYS_assert(pDict != NULL);
   CPDF_Object* pIntent = pDict->GetElementValue("Intent");
   if (pIntent == NULL) {
     return csElement == csDef;
   }
   CFX_ByteString bsIntent;
   if (CPDF_Array* pArray = pIntent->AsArray()) {
     FX_DWORD dwCount = pArray->GetCount();
     for (FX_DWORD i = 0; i < dwCount; i++) {
       bsIntent = pArray->GetString(i);
       if (bsIntent == "All" || bsIntent == csElement)
@@ skipping 44 matching lines @@
   if (eType == CPDF_OCContext::Design) {
     csState = "Design";
   } else if (eType == CPDF_OCContext::Print) {
     csState = "Print";
   } else if (eType == CPDF_OCContext::Export) {
     csState = "Export";
   }
   return csState;
 }
 CPDF_OCContext::CPDF_OCContext(CPDF_Document* pDoc, UsageType eUsageType) {
-  FXSYS_assert(pDoc != NULL);
+  FXSYS_assert(pDoc);
   m_pDocument = pDoc;
   m_eUsageType = eUsageType;
 }
 CPDF_OCContext::~CPDF_OCContext() {
   m_OCGStates.clear();
 }
 FX_BOOL CPDF_OCContext::LoadOCGStateFromConfig(const CFX_ByteStringC& csConfig,
                                                const CPDF_Dictionary* pOCGDict,
                                                FX_BOOL& bValidConfig) const {
   CPDF_Dictionary* pConfig =
@@ skipping 125 matching lines @@
           bValue = bValue && bItem;
         }
       }
     }
     return bValue;
   }
   return FALSE;
 }
 FX_BOOL CPDF_OCContext::LoadOCMDState(const CPDF_Dictionary* pOCMDDict,
                                       FX_BOOL bFromConfig) {
-  FXSYS_assert(pOCMDDict != NULL);
   CPDF_Array* pVE = pOCMDDict->GetArray("VE");
-  if (pVE != NULL) {
+  if (pVE) {
     return GetOCGVE(pVE, bFromConfig);
   }
   CFX_ByteString csP = pOCMDDict->GetString("P", "AnyOn");
   CPDF_Object* pOCGObj = pOCMDDict->GetElementValue("OCGs");
   if (!pOCGObj)
     return TRUE;
   if (const CPDF_Dictionary* pDict = pOCGObj->AsDictionary())
     return bFromConfig ? LoadOCGState(pDict) : GetOCGVisible(pDict);
 
   CPDF_Array* pArray = pOCGObj->AsArray();
@@ skipping 24 matching lines @@
   }
   CFX_ByteString csType = pOCGDict->GetString("Type", "OCG");
   if (csType == "OCG") {
     return GetOCGVisible(pOCGDict);
   }
   return LoadOCMDState(pOCGDict, FALSE);
 }
 void CPDF_OCContext::ResetOCContext() {
   m_OCGStates.clear();
 }