Remove foo != NULL outside of xfa/

fpdfsdk/src/fsdk_annothandler.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 <algorithm>
 
 #include "fpdfsdk/include/formfiller/FFL_FormFiller.h"
 #include "fpdfsdk/include/fsdk_annothandler.h"
@@ skipping 54 matching lines @@
           GetAnnotHandler(pAnnot->GetSubType())) {
     return pAnnotHandler->NewAnnot(pAnnot, pPageView);
   }
 
   return new CPDFSDK_BAAnnot(pAnnot, pPageView);
 }
 
 #ifdef PDF_ENABLE_XFA
 CPDFSDK_Annot* CPDFSDK_AnnotHandlerMgr::NewAnnot(IXFA_Widget* pAnnot,
                                                  CPDFSDK_PageView* pPageView) {
-  ASSERT(pAnnot != NULL);
-  ASSERT(pPageView != NULL);
+  ASSERT(pAnnot);
+  ASSERT(pPageView);
 
   if (IPDFSDK_AnnotHandler* pAnnotHandler =
           GetAnnotHandler(FSDK_XFAWIDGET_TYPENAME)) {
     return pAnnotHandler->NewAnnot(pAnnot, pPageView);
   }
 
   return NULL;
 }
 #endif  // PDF_ENABLE_XFA
 
@@ skipping 284 matching lines @@
           XFA_TRAVERSEWAY_Tranvalse, XFA_WIDGETFILTER_Visible |
                                          XFA_WIDGETFILTER_Viewable |
                                          XFA_WIDGETFILTER_Field);
   if (pWidgetIterator == NULL)
     return NULL;
   if (pWidgetIterator->GetCurrentWidget() != pSDKAnnot->GetXFAWidget())
     pWidgetIterator->SetCurrentWidget(pSDKAnnot->GetXFAWidget());
   IXFA_Widget* hNextFocus = NULL;
   hNextFocus =
       bNext ? pWidgetIterator->MoveToNext() : pWidgetIterator->MoveToPrevious();
-  if (hNextFocus == NULL && pSDKAnnot != NULL)
+  if (!hNextFocus && pSDKAnnot)
     hNextFocus = pWidgetIterator->MoveToFirst();
 
   pWidgetIterator->Release();
   return pPageView->GetAnnotByXFAWidget(hNextFocus);
 #else   // PDF_ENABLE_XFA
   CBA_AnnotIterator ai(pSDKAnnot->GetPageView(), "Widget", "");
   return bNext ? ai.GetNextAnnot(pSDKAnnot) : ai.GetPrevAnnot(pSDKAnnot);
 #endif  // PDF_ENABLE_XFA
 }
 
@@ skipping 353 matching lines @@
 
 void CPDFSDK_XFAAnnotHandler::OnDraw(CPDFSDK_PageView* pPageView,
                                      CPDFSDK_Annot* pAnnot,
                                      CFX_RenderDevice* pDevice,
                                      CFX_Matrix* pUser2Device,
                                      FX_DWORD dwFlags) {
   ASSERT(pPageView != NULL);
   ASSERT(pAnnot != NULL);
 
   CPDFSDK_Document* pSDKDoc = pPageView->GetSDKDocument();
-  ASSERT(pSDKDoc != NULL);
-
   IXFA_WidgetHandler* pWidgetHandler = GetXFAWidgetHandler(pAnnot);
-  ASSERT(pWidgetHandler != NULL);
 
   CFX_Graphics gs;
   gs.Create(pDevice);
 
   CFX_Matrix mt;
   mt = *(CFX_Matrix*)pUser2Device;
 
   FX_BOOL bIsHighlight = FALSE;
   if (pSDKDoc->GetFocusAnnot() != pAnnot)
     bIsHighlight = TRUE;
 
   pWidgetHandler->RenderWidget(pAnnot->GetXFAWidget(), &gs, &mt, bIsHighlight);
 
   // to do highlight and shadow
 }
 
 void CPDFSDK_XFAAnnotHandler::ReleaseAnnot(CPDFSDK_Annot* pAnnot) {
-  ASSERT(pAnnot != NULL);
-
   CPDFSDK_XFAWidget* pWidget = (CPDFSDK_XFAWidget*)pAnnot;
   CPDFSDK_InterForm* pInterForm = pWidget->GetInterForm();
-  ASSERT(pInterForm != NULL);
-
   pInterForm->RemoveXFAMap(pWidget->GetXFAWidget());
 
   delete pWidget;
 }
 
 CPDF_Rect CPDFSDK_XFAAnnotHandler::GetViewBBox(CPDFSDK_PageView* pPageView,
                                                CPDFSDK_Annot* pAnnot) {
-  ASSERT(pAnnot != NULL);
+  ASSERT(pAnnot);
 
   IXFA_WidgetHandler* pWidgetHandler = GetXFAWidgetHandler(pAnnot);
-  ASSERT(pWidgetHandler != NULL);
-
   CFX_RectF rcBBox;
   XFA_ELEMENT eType =
       pWidgetHandler->GetDataAcc(pAnnot->GetXFAWidget())->GetUIType();
   if (eType == XFA_ELEMENT_Signature)
     pWidgetHandler->GetBBox(pAnnot->GetXFAWidget(), rcBBox,
                             XFA_WIDGETSTATUS_Visible, TRUE);
   else
     pWidgetHandler->GetBBox(pAnnot->GetXFAWidget(), rcBBox, 0);
 
   CFX_FloatRect rcWidget(rcBBox.left, rcBBox.top, rcBBox.left + rcBBox.width,
@@ skipping 32 matching lines @@
       pWidgetHandler->OnHitTest(pAnnot->GetXFAWidget(), point.x, point.y);
   return (dwHitTest != FWL_WGTHITTEST_Unknown);
 }
 
 void CPDFSDK_XFAAnnotHandler::OnMouseEnter(CPDFSDK_PageView* pPageView,
                                            CPDFSDK_Annot* pAnnot,
                                            FX_DWORD nFlag) {
   if (!pPageView || !pAnnot)
     return;
   IXFA_WidgetHandler* pWidgetHandler = GetXFAWidgetHandler(pAnnot);
-  ASSERT(pWidgetHandler != NULL);
-
   pWidgetHandler->OnMouseEnter(pAnnot->GetXFAWidget());
 }
 
 void CPDFSDK_XFAAnnotHandler::OnMouseExit(CPDFSDK_PageView* pPageView,
                                           CPDFSDK_Annot* pAnnot,
                                           FX_DWORD nFlag) {
   if (!pPageView || !pAnnot)
     return;
 
   IXFA_WidgetHandler* pWidgetHandler = GetXFAWidgetHandler(pAnnot);
-  ASSERT(pWidgetHandler != NULL);
-
   pWidgetHandler->OnMouseExit(pAnnot->GetXFAWidget());
 }
 
 FX_BOOL CPDFSDK_XFAAnnotHandler::OnLButtonDown(CPDFSDK_PageView* pPageView,
                                                CPDFSDK_Annot* pAnnot,
                                                FX_DWORD nFlags,
                                                const CPDF_Point& point) {
   if (!pPageView || !pAnnot)
     return FALSE;
 
   IXFA_WidgetHandler* pWidgetHandler = GetXFAWidgetHandler(pAnnot);
-  ASSERT(pWidgetHandler != NULL);
-
-  FX_BOOL bRet = FALSE;
-  bRet = pWidgetHandler->OnLButtonDown(pAnnot->GetXFAWidget(),
+  return pWidgetHandler->OnLButtonDown(pAnnot->GetXFAWidget(),
                                        GetFWLFlags(nFlags), point.x, point.y);
-
-  return bRet;
 }
 
 FX_BOOL CPDFSDK_XFAAnnotHandler::OnLButtonUp(CPDFSDK_PageView* pPageView,
                                              CPDFSDK_Annot* pAnnot,
                                              FX_DWORD nFlags,
                                              const CPDF_Point& point) {
   if (!pPageView || !pAnnot)
     return FALSE;
 
   IXFA_WidgetHandler* pWidgetHandler = GetXFAWidgetHandler(pAnnot);
-  ASSERT(pWidgetHandler != NULL);
-
-  FX_BOOL bRet = FALSE;
-  bRet = pWidgetHandler->OnLButtonUp(pAnnot->GetXFAWidget(),
+  return pWidgetHandler->OnLButtonUp(pAnnot->GetXFAWidget(),
                                      GetFWLFlags(nFlags), point.x, point.y);
-
-  return bRet;
 }
 
 FX_BOOL CPDFSDK_XFAAnnotHandler::OnLButtonDblClk(CPDFSDK_PageView* pPageView,
                                                  CPDFSDK_Annot* pAnnot,
                                                  FX_DWORD nFlags,
                                                  const CPDF_Point& point) {
   if (!pPageView || !pAnnot)
     return FALSE;
 
   IXFA_WidgetHandler* pWidgetHandler = GetXFAWidgetHandler(pAnnot);
-  ASSERT(pWidgetHandler != NULL);
-
-  FX_BOOL bRet = FALSE;
-  bRet = pWidgetHandler->OnLButtonDblClk(pAnnot->GetXFAWidget(),
+  return pWidgetHandler->OnLButtonDblClk(pAnnot->GetXFAWidget(),
                                          GetFWLFlags(nFlags), point.x, point.y);
-
-  return bRet;
 }
 
 FX_BOOL CPDFSDK_XFAAnnotHandler::OnMouseMove(CPDFSDK_PageView* pPageView,
                                              CPDFSDK_Annot* pAnnot,
                                              FX_DWORD nFlags,
                                              const CPDF_Point& point) {
   if (!pPageView || !pAnnot)
     return FALSE;
 
   IXFA_WidgetHandler* pWidgetHandler = GetXFAWidgetHandler(pAnnot);
-  ASSERT(pWidgetHandler != NULL);
-
-  FX_BOOL bRet = FALSE;
-  bRet = pWidgetHandler->OnMouseMove(pAnnot->GetXFAWidget(),
+  return pWidgetHandler->OnMouseMove(pAnnot->GetXFAWidget(),
                                      GetFWLFlags(nFlags), point.x, point.y);
-
-  return bRet;
 }
 
 FX_BOOL CPDFSDK_XFAAnnotHandler::OnMouseWheel(CPDFSDK_PageView* pPageView,
                                               CPDFSDK_Annot* pAnnot,
                                               FX_DWORD nFlags,
                                               short zDelta,
                                               const CPDF_Point& point) {
   if (!pPageView || !pAnnot)
     return FALSE;
 
   IXFA_WidgetHandler* pWidgetHandler = GetXFAWidgetHandler(pAnnot);
-  ASSERT(pWidgetHandler != NULL);
-
-  FX_BOOL bRet = FALSE;
-  bRet = pWidgetHandler->OnMouseWheel(
+  return pWidgetHandler->OnMouseWheel(
       pAnnot->GetXFAWidget(), GetFWLFlags(nFlags), zDelta, point.x, point.y);
-
-  return bRet;
 }
 
 FX_BOOL CPDFSDK_XFAAnnotHandler::OnRButtonDown(CPDFSDK_PageView* pPageView,
                                                CPDFSDK_Annot* pAnnot,
                                                FX_DWORD nFlags,
                                                const CPDF_Point& point) {
   if (!pPageView || !pAnnot)
     return FALSE;
 
   IXFA_WidgetHandler* pWidgetHandler = GetXFAWidgetHandler(pAnnot);
-  ASSERT(pWidgetHandler != NULL);
-
-  FX_BOOL bRet = FALSE;
-  bRet = pWidgetHandler->OnRButtonDown(pAnnot->GetXFAWidget(),
+  return pWidgetHandler->OnRButtonDown(pAnnot->GetXFAWidget(),
                                        GetFWLFlags(nFlags), point.x, point.y);
-
-  return bRet;
 }
 
 FX_BOOL CPDFSDK_XFAAnnotHandler::OnRButtonUp(CPDFSDK_PageView* pPageView,
                                              CPDFSDK_Annot* pAnnot,
                                              FX_DWORD nFlags,
                                              const CPDF_Point& point) {
   if (!pPageView || !pAnnot)
     return FALSE;
 
   IXFA_WidgetHandler* pWidgetHandler = GetXFAWidgetHandler(pAnnot);
-  ASSERT(pWidgetHandler != NULL);
-
-  FX_BOOL bRet = FALSE;
-  bRet = pWidgetHandler->OnRButtonUp(pAnnot->GetXFAWidget(),
+  return pWidgetHandler->OnRButtonUp(pAnnot->GetXFAWidget(),
                                      GetFWLFlags(nFlags), point.x, point.y);
-
-  return bRet;
 }
 
 FX_BOOL CPDFSDK_XFAAnnotHandler::OnRButtonDblClk(CPDFSDK_PageView* pPageView,
                                                  CPDFSDK_Annot* pAnnot,
                                                  FX_DWORD nFlags,
                                                  const CPDF_Point& point) {
   if (!pPageView || !pAnnot)
     return FALSE;
 
   IXFA_WidgetHandler* pWidgetHandler = GetXFAWidgetHandler(pAnnot);
-  ASSERT(pWidgetHandler != NULL);
-
-  FX_BOOL bRet = FALSE;
-  bRet = pWidgetHandler->OnRButtonDblClk(pAnnot->GetXFAWidget(),
+  return pWidgetHandler->OnRButtonDblClk(pAnnot->GetXFAWidget(),
                                          GetFWLFlags(nFlags), point.x, point.y);
-
-  return bRet;
 }
 
 FX_BOOL CPDFSDK_XFAAnnotHandler::OnChar(CPDFSDK_Annot* pAnnot,
                                         FX_DWORD nChar,
                                         FX_DWORD nFlags) {
   if (!pAnnot)
     return FALSE;
 
   IXFA_WidgetHandler* pWidgetHandler = GetXFAWidgetHandler(pAnnot);
-  ASSERT(pWidgetHandler != NULL);
-
-  FX_BOOL bRet = FALSE;
-  bRet = pWidgetHandler->OnChar(pAnnot->GetXFAWidget(), nChar,
+  return pWidgetHandler->OnChar(pAnnot->GetXFAWidget(), nChar,
                                 GetFWLFlags(nFlags));
-
-  return bRet;
 }
 
 FX_BOOL CPDFSDK_XFAAnnotHandler::OnKeyDown(CPDFSDK_Annot* pAnnot,
                                            int nKeyCode,
                                            int nFlag) {
   if (!pAnnot)
     return FALSE;
 
   IXFA_WidgetHandler* pWidgetHandler = GetXFAWidgetHandler(pAnnot);
-  ASSERT(pWidgetHandler != NULL);
-
-  FX_BOOL bRet = FALSE;
-  bRet = pWidgetHandler->OnKeyDown(pAnnot->GetXFAWidget(), nKeyCode,
+  return pWidgetHandler->OnKeyDown(pAnnot->GetXFAWidget(), nKeyCode,
                                    GetFWLFlags(nFlag));
-
-  return bRet;
 }
 
 FX_BOOL CPDFSDK_XFAAnnotHandler::OnKeyUp(CPDFSDK_Annot* pAnnot,
                                          int nKeyCode,
                                          int nFlag) {
   if (!pAnnot)
     return FALSE;
 
   IXFA_WidgetHandler* pWidgetHandler = GetXFAWidgetHandler(pAnnot);
-  ASSERT(pWidgetHandler != NULL);
-
-  FX_BOOL bRet = FALSE;
-  bRet = pWidgetHandler->OnKeyUp(pAnnot->GetXFAWidget(), nKeyCode,
+  return pWidgetHandler->OnKeyUp(pAnnot->GetXFAWidget(), nKeyCode,
                                  GetFWLFlags(nFlag));
-
-  return bRet;
 }
 
 FX_BOOL CPDFSDK_XFAAnnotHandler::OnSetFocus(CPDFSDK_Annot* pAnnot,
                                             FX_DWORD nFlag) {
   return TRUE;
 }
 
 FX_BOOL CPDFSDK_XFAAnnotHandler::OnKillFocus(CPDFSDK_Annot* pAnnot,
                                              FX_DWORD nFlag) {
   return TRUE;
@@ skipping 111 matching lines @@
 
 CPDFSDK_Annot* CPDFSDK_AnnotIterator::PrevAnnot() {
   if (m_pos < m_iteratorAnnotList.size())
     return m_iteratorAnnotList[m_iteratorAnnotList.size() - ++m_pos];
   return nullptr;
 }
 
 CPDFSDK_Annot* CPDFSDK_AnnotIterator::Next() {
   return m_bReverse ? PrevAnnot() : NextAnnot();
 }