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

TBR=tsepez@chromium.org

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

(cherry picked from commit e3c7c2b54348da4a6939f6672f6c6bff126815a7)

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

1 files changed, 0 insertions, 14 deletions

diff --git a/fpdfsdk/src/fsdk_baseannot.cpp b/fpdfsdk/src/fsdk_baseannot.cpp
index 82bbeb11ac..0f2aaf42cd 100644
--- a/fpdfsdk/src/fsdk_baseannot.cpp
+++ b/fpdfsdk/src/fsdk_baseannot.cpp
@@ -532,8 +532,6 @@ void CPDFSDK_Annot::SetTabOrder(int iTabOrder) {
 }
 
 CPDF_Dictionary* CPDFSDK_BAAnnot::GetAnnotDict() const {
-  ASSERT(m_pAnnot != NULL);
-
   return m_pAnnot->GetAnnotDict();
 }
 
@@ -545,17 +543,12 @@ void CPDFSDK_BAAnnot::SetRect(const CPDF_Rect& rect) {
 }
 
 CPDF_Rect CPDFSDK_BAAnnot::GetRect() const {
-  ASSERT(m_pAnnot != NULL);
-
   CPDF_Rect rect;
   m_pAnnot->GetRect(rect);
-
   return rect;
 }
 
 CFX_ByteString CPDFSDK_BAAnnot::GetType() const {
-  ASSERT(m_pAnnot != NULL);
-
   return m_pAnnot->GetSubType();
 }
 
@@ -567,9 +560,6 @@ void CPDFSDK_BAAnnot::DrawAppearance(CFX_RenderDevice* pDevice,
                                      const CFX_Matrix* pUser2Device,
                                      CPDF_Annot::AppearanceMode mode,
                                      const CPDF_RenderOptions* pOptions) {
-  ASSERT(m_pPageView != NULL);
-  ASSERT(m_pAnnot != NULL);
-
   m_pAnnot->DrawAppearance(m_pPageView->GetPDFPage(), pDevice, pUser2Device,
                            mode, pOptions);
 }
@@ -603,12 +593,10 @@ FX_BOOL CPDFSDK_BAAnnot::IsAppearanceValid(CPDF_Annot::AppearanceMode mode) {
 void CPDFSDK_BAAnnot::DrawBorder(CFX_RenderDevice* pDevice,
                                  const CFX_Matrix* pUser2Device,
                                  const CPDF_RenderOptions* pOptions) {
-  ASSERT(m_pAnnot != NULL);
   m_pAnnot->DrawBorder(pDevice, pUser2Device, pOptions);
 }
 
 void CPDFSDK_BAAnnot::ClearCachedAP() {
-  ASSERT(m_pAnnot != NULL);
   m_pAnnot->ClearCachedAP();
 }
 
@@ -948,8 +936,6 @@ CPDF_AAction CPDFSDK_BAAnnot::GetAAction() const {
 }
 
 void CPDFSDK_BAAnnot::SetAAction(const CPDF_AAction& aa) {
-  ASSERT(aa != NULL);
-
   if ((CPDF_AAction&)aa != m_pAnnot->GetAnnotDict()->GetDict("AA"))
     m_pAnnot->GetAnnotDict()->SetAt("AA", (CPDF_AAction&)aa);
 }