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

fpdfsdk/src/formfiller/FFL_FormFiller.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 "fpdfsdk/include/formfiller/FFL_CBA_Fontmap.h"
 #include "fpdfsdk/include/formfiller/FFL_FormFiller.h"
 
 #define GetRed(rgb) ((uint8_t)(rgb))
@@ skipping 31 matching lines @@
 CPDF_Rect CFFL_FormFiller::GetWindowRect(CPDFSDK_PageView* pPageView) {
   if (CPWL_Wnd* pWnd = GetPDFWindow(pPageView, FALSE)) {
     return pWnd->GetWindowRect();
   }
 
   return CPDF_Rect(0, 0, 0, 0);
 }
 
 FX_RECT CFFL_FormFiller::GetViewBBox(CPDFSDK_PageView* pPageView,
                                      CPDFSDK_Annot* pAnnot) {
-  ASSERT(pPageView != NULL);
-  ASSERT(pAnnot != NULL);
+  ASSERT(pPageView);
+  ASSERT(pAnnot);
 
   CPDF_Rect rcAnnot = m_pWidget->GetRect();
 
   if (CPWL_Wnd* pWnd = GetPDFWindow(pPageView, FALSE)) {
     CPDF_Rect rcWindow = pWnd->GetWindowRect();
     rcAnnot = PWLtoFFL(rcWindow);
   }
 
   CPDF_Rect rcWin = rcAnnot;
 
@@ skipping 38 matching lines @@
 void CFFL_FormFiller::OnLoad(CPDFSDK_Annot* pAnnot) {}
 
 void CFFL_FormFiller::OnDelete(CPDFSDK_Annot* pAnnot) {}
 
 void CFFL_FormFiller::OnMouseEnter(CPDFSDK_PageView* pPageView,
                                    CPDFSDK_Annot* pAnnot) {}
 
 void CFFL_FormFiller::OnMouseExit(CPDFSDK_PageView* pPageView,
                                   CPDFSDK_Annot* pAnnot) {
   EndTimer();
-  ASSERT(m_pWidget != NULL);
+  ASSERT(m_pWidget);
 }
 
 FX_BOOL CFFL_FormFiller::OnLButtonDown(CPDFSDK_PageView* pPageView,
                                        CPDFSDK_Annot* pAnnot,
                                        FX_UINT nFlags,
                                        const CPDF_Point& point) {
   if (CPWL_Wnd* pWnd = GetPDFWindow(pPageView, TRUE)) {
     m_bValid = TRUE;
     FX_RECT rect = GetViewBBox(pPageView, pAnnot);
     InvalidateRect(rect.left, rect.top, rect.right, rect.bottom);
@@ skipping 86 matching lines @@
   }
 
   return FALSE;
 }
 
 FX_BOOL CFFL_FormFiller::OnKeyDown(CPDFSDK_Annot* pAnnot,
                                    FX_UINT nKeyCode,
                                    FX_UINT nFlags) {
   if (IsValid()) {
     CPDFSDK_PageView* pPageView = GetCurPageView();
-    ASSERT(pPageView != NULL);
+    ASSERT(pPageView);
 
     if (CPWL_Wnd* pWnd = GetPDFWindow(pPageView, FALSE)) {
       return pWnd->OnKeyDown(nKeyCode, nFlags);
     }
   }
 
   return FALSE;
 }
 
 FX_BOOL CFFL_FormFiller::OnChar(CPDFSDK_Annot* pAnnot,
                                 FX_UINT nChar,
                                 FX_UINT nFlags) {
   if (IsValid()) {
     CPDFSDK_PageView* pPageView = GetCurPageView();
-    ASSERT(pPageView != NULL);
+    ASSERT(pPageView);
 
     if (CPWL_Wnd* pWnd = GetPDFWindow(pPageView, FALSE)) {
       return pWnd->OnChar(nChar, nFlags);
     }
   }
 
   return FALSE;
 }
 
 void CFFL_FormFiller::SetFocusForAnnot(CPDFSDK_Annot* pAnnot, FX_UINT nFlag) {
@@ skipping 32 matching lines @@
       bDestroyPDFWindow = FALSE;
   }
   EscapeFiller(pPageView, bDestroyPDFWindow);
 }
 
 FX_BOOL CFFL_FormFiller::IsValid() const {
   return m_bValid;
 }
 
 PWL_CREATEPARAM CFFL_FormFiller::GetCreateParam() {
-  ASSERT(m_pApp != NULL);
+  ASSERT(m_pApp);
 
   PWL_CREATEPARAM cp;
   cp.pParentWnd = NULL;
   cp.pProvider = this;
   cp.rcRectWnd = GetPDFWindowRect();
 
   FX_DWORD dwCreateFlags = PWS_BORDER | PWS_BACKGROUND | PWS_VISIBLE;
   FX_DWORD dwFieldFlag = m_pWidget->GetFieldFlags();
   if (dwFieldFlag & FIELDFLAG_READONLY) {
     dwCreateFlags |= PWS_READONLY;
@@ skipping 110 matching lines @@
 
       return mt;
     }
   }
   return CFX_Matrix(1, 0, 0, 1, 0, 0);
 }
 
 CFX_Matrix CFFL_FormFiller::GetCurMatrix() {
   CFX_Matrix mt;
 
-  ASSERT(m_pWidget != NULL);
-
   CPDF_Rect rcDA;
   m_pWidget->GetPDFAnnot()->GetRect(rcDA);
 
   switch (m_pWidget->GetRotate()) {
     default:
     case 0:
       mt = CFX_Matrix(1, 0, 0, 1, 0, 0);
       break;
     case 90:
       mt = CFX_Matrix(0, 1, -1, 0, rcDA.right - rcDA.left, 0);
       break;
     case 180:
       mt = CFX_Matrix(-1, 0, 0, -1, rcDA.right - rcDA.left,
                       rcDA.top - rcDA.bottom);
       break;
     case 270:
       mt = CFX_Matrix(0, -1, 1, 0, 0, rcDA.top - rcDA.bottom);
       break;
   }
   mt.e += rcDA.left;
   mt.f += rcDA.bottom;
 
   return mt;
 }
 
 CFX_WideString CFFL_FormFiller::LoadPopupMenuString(int nIndex) {
-  ASSERT(m_pApp != NULL);
+  ASSERT(m_pApp);
 
   return L"";
 }
 
 CPDF_Rect CFFL_FormFiller::GetPDFWindowRect() const {
   CPDF_Rect rectAnnot;
   m_pWidget->GetPDFAnnot()->GetRect(rectAnnot);
 
   FX_FLOAT fWidth = rectAnnot.right - rectAnnot.left;
   FX_FLOAT fHeight = rectAnnot.top - rectAnnot.bottom;
@@ skipping 179 matching lines @@
   InvalidateRect(rect.left, rect.top, rect.right, rect.bottom);
 }
 
 void CFFL_Button::OnMouseExit(CPDFSDK_PageView* pPageView,
                               CPDFSDK_Annot* pAnnot) {
   m_bMouseIn = FALSE;
 
   FX_RECT rect = GetViewBBox(pPageView, pAnnot);
   InvalidateRect(rect.left, rect.top, rect.right, rect.bottom);
   EndTimer();
-  ASSERT(m_pWidget != NULL);
+  ASSERT(m_pWidget);
 }
 
 FX_BOOL CFFL_Button::OnLButtonDown(CPDFSDK_PageView* pPageView,
                                    CPDFSDK_Annot* pAnnot,
                                    FX_UINT nFlags,
                                    const CPDF_Point& point) {
   CPDF_Rect rcAnnot = pAnnot->GetRect();
   if (!rcAnnot.Contains(point.x, point.y))
     return FALSE;
 
@@ skipping 17 matching lines @@
 
   FX_RECT rect = GetViewBBox(pPageView, pAnnot);
   InvalidateRect(rect.left, rect.top, rect.right, rect.bottom);
   return TRUE;
 }
 
 FX_BOOL CFFL_Button::OnMouseMove(CPDFSDK_PageView* pPageView,
                                  CPDFSDK_Annot* pAnnot,
                                  FX_UINT nFlags,
                                  const CPDF_Point& point) {
-  ASSERT(m_pApp != NULL);
+  ASSERT(m_pApp);
 
   return TRUE;
 }
 
 void CFFL_Button::OnDraw(CPDFSDK_PageView* pPageView,
                          CPDFSDK_Annot* pAnnot,
                          CFX_RenderDevice* pDevice,
                          CFX_Matrix* pUser2Device,
                          FX_DWORD dwFlags) {
-  ASSERT(pPageView != NULL);
+  ASSERT(pPageView);
   CPDFSDK_Widget* pWidget = (CPDFSDK_Widget*)pAnnot;
   CPDF_FormControl* pCtrl = pWidget->GetFormControl();
   CPDF_FormControl::HighlightingMode eHM = pCtrl->GetHighlightingMode();
 
   if (eHM == CPDF_FormControl::Push) {
     if (m_bMouseDown) {
       if (pWidget->IsWidgetAppearanceValid(CPDF_Annot::Down))
         pWidget->DrawAppearance(pDevice, pUser2Device, CPDF_Annot::Down, NULL);
       else
         pWidget->DrawAppearance(pDevice, pUser2Device, CPDF_Annot::Normal,
@@ skipping 12 matching lines @@
     pWidget->DrawAppearance(pDevice, pUser2Device, CPDF_Annot::Normal, NULL);
 }
 
 void CFFL_Button::OnDrawDeactive(CPDFSDK_PageView* pPageView,
                                  CPDFSDK_Annot* pAnnot,
                                  CFX_RenderDevice* pDevice,
                                  CFX_Matrix* pUser2Device,
                                  FX_DWORD dwFlags) {
   OnDraw(pPageView, pAnnot, pDevice, pUser2Device, dwFlags);
 }