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

fpdfsdk/src/formfiller/FFL_IFormFiller.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_CheckBox.h"
 #include "fpdfsdk/include/formfiller/FFL_ComboBox.h"
 #include "fpdfsdk/include/formfiller/FFL_FormFiller.h"
 #include "fpdfsdk/include/formfiller/FFL_IFormFiller.h"
 #include "fpdfsdk/include/formfiller/FFL_ListBox.h"
 #include "fpdfsdk/include/formfiller/FFL_PushButton.h"
 #include "fpdfsdk/include/formfiller/FFL_RadioButton.h"
 #include "fpdfsdk/include/formfiller/FFL_TextField.h"
 
 #define FFL_MAXLISTBOXHEIGHT 140.0f
 
-// HHOOK CFFL_IFormFiller::m_hookSheet = NULL;
-// MSG CFFL_IFormFiller::g_Msg;
-
-/* ----------------------------- CFFL_IFormFiller -----------------------------
- */
-
 CFFL_IFormFiller::CFFL_IFormFiller(CPDFDoc_Environment* pApp)
     : m_pApp(pApp), m_bNotifying(FALSE) {}
 
 CFFL_IFormFiller::~CFFL_IFormFiller() {
   for (auto& it : m_Maps)
     delete it.second;
   m_Maps.clear();
 }
 
 FX_BOOL CFFL_IFormFiller::Annot_HitTest(CPDFSDK_PageView* pPageView,
                                         CPDFSDK_Annot* pAnnot,
                                         CPDF_Point point) {
   CPDF_Rect rc = pAnnot->GetRect();
   if (rc.Contains(point.x, point.y))
     return TRUE;
   return FALSE;
 }
 
 FX_RECT CFFL_IFormFiller::GetViewBBox(CPDFSDK_PageView* pPageView,
                                       CPDFSDK_Annot* pAnnot) {
   if (CFFL_FormFiller* pFormFiller = GetFormFiller(pAnnot, FALSE))
     return pFormFiller->GetViewBBox(pPageView, pAnnot);
 
-  ASSERT(pPageView != NULL);
+  ASSERT(pPageView);
 
   CPDF_Annot* pPDFAnnot = pAnnot->GetPDFAnnot();
   CPDF_Rect rcAnnot;
   pPDFAnnot->GetRect(rcAnnot);
 
   CPDF_Rect rcWin = CPWL_Utils::InflateRect(rcAnnot, 1);
   return rcWin.GetOutterRect();
 }
 
 void CFFL_IFormFiller::OnDraw(CPDFSDK_PageView* pPageView,
-                              /*HDC hDC,*/ CPDFSDK_Annot* pAnnot,
+                              CPDFSDK_Annot* pAnnot,
                               CFX_RenderDevice* pDevice,
                               CFX_Matrix* pUser2Device,
-                              /*const CRect& rcWindow,*/ FX_DWORD dwFlags) {
-  ASSERT(pPageView != NULL);
+                              FX_DWORD dwFlags) {
+  ASSERT(pPageView);
   CPDFSDK_Widget* pWidget = (CPDFSDK_Widget*)pAnnot;
 
   if (IsVisible(pWidget)) {
     if (CFFL_FormFiller* pFormFiller = GetFormFiller(pAnnot, FALSE)) {
       if (pFormFiller->IsValid()) {
         pFormFiller->OnDraw(pPageView, pAnnot, pDevice, pUser2Device, dwFlags);
         pAnnot->GetPDFPage();
 
         CPDFSDK_Document* pDocument = m_pApp->GetSDKDocument();
         if (pDocument->GetFocusAnnot() == pAnnot) {
@@ skipping 47 matching lines @@
   if (CFFL_FormFiller* pFormFiller = GetFormFiller(pAnnot, FALSE)) {
     pFormFiller->OnDelete(pAnnot);
   }
 
   UnRegisterFormFiller(pAnnot);
 }
 
 void CFFL_IFormFiller::OnMouseEnter(CPDFSDK_PageView* pPageView,
                                     CPDFSDK_Annot* pAnnot,
                                     FX_UINT nFlag) {
-  ASSERT(pAnnot != NULL);
   ASSERT(pAnnot->GetPDFAnnot()->GetSubType() == "Widget");
 
   if (!m_bNotifying) {
     CPDFSDK_Widget* pWidget = (CPDFSDK_Widget*)pAnnot;
     if (pWidget->GetAAction(CPDF_AAction::CursorEnter)) {
       m_bNotifying = TRUE;
 
       int nValueAge = pWidget->GetValueAge();
 
       pWidget->ClearAppModified();
 
-      ASSERT(pPageView != NULL);
+      ASSERT(pPageView);
 
       PDFSDK_FieldAction fa;
       fa.bModifier = m_pApp->FFI_IsCTRLKeyDown(nFlag);
       fa.bShift = m_pApp->FFI_IsSHIFTKeyDown(nFlag);
       pWidget->OnAAction(CPDF_AAction::CursorEnter, fa, pPageView);
       m_bNotifying = FALSE;
 
-      // if ( !IsValidAnnot(pPageView, pAnnot) ) return;
-
       if (pWidget->IsAppModified()) {
         if (CFFL_FormFiller* pFormFiller = GetFormFiller(pWidget, FALSE)) {
           pFormFiller->ResetPDFWindow(pPageView,
                                       pWidget->GetValueAge() == nValueAge);
         }
       }
     }
   }
 
   if (CFFL_FormFiller* pFormFiller = GetFormFiller(pAnnot, TRUE)) {
     pFormFiller->OnMouseEnter(pPageView, pAnnot);
   }
 }
 
 void CFFL_IFormFiller::OnMouseExit(CPDFSDK_PageView* pPageView,
                                    CPDFSDK_Annot* pAnnot,
                                    FX_UINT nFlag) {
-  ASSERT(pAnnot != NULL);
   ASSERT(pAnnot->GetPDFAnnot()->GetSubType() == "Widget");
 
   if (!m_bNotifying) {
     CPDFSDK_Widget* pWidget = (CPDFSDK_Widget*)pAnnot;
     if (pWidget->GetAAction(CPDF_AAction::CursorExit)) {
       m_bNotifying = TRUE;
       pWidget->GetAppearanceAge();
       int nValueAge = pWidget->GetValueAge();
       pWidget->ClearAppModified();
 
-      ASSERT(pPageView != NULL);
+      ASSERT(pPageView);
 
       PDFSDK_FieldAction fa;
       fa.bModifier = m_pApp->FFI_IsCTRLKeyDown(nFlag);
       fa.bShift = m_pApp->FFI_IsSHIFTKeyDown(nFlag);
 
       pWidget->OnAAction(CPDF_AAction::CursorExit, fa, pPageView);
       m_bNotifying = FALSE;
 
-      // if (!IsValidAnnot(pPageView, pAnnot)) return;
-
       if (pWidget->IsAppModified()) {
         if (CFFL_FormFiller* pFormFiller = GetFormFiller(pWidget, FALSE)) {
           pFormFiller->ResetPDFWindow(pPageView,
                                       nValueAge == pWidget->GetValueAge());
         }
       }
     }
   }
 
   if (CFFL_FormFiller* pFormFiller = GetFormFiller(pAnnot, FALSE)) {
     pFormFiller->OnMouseExit(pPageView, pAnnot);
   }
 }
 
 FX_BOOL CFFL_IFormFiller::OnLButtonDown(CPDFSDK_PageView* pPageView,
                                         CPDFSDK_Annot* pAnnot,
                                         FX_UINT nFlags,
                                         const CPDF_Point& point) {
-  ASSERT(pAnnot != NULL);
   ASSERT(pAnnot->GetPDFAnnot()->GetSubType() == "Widget");
 
   if (!m_bNotifying) {
     CPDFSDK_Widget* pWidget = (CPDFSDK_Widget*)pAnnot;
     if (Annot_HitTest(pPageView, pAnnot, point) &&
         pWidget->GetAAction(CPDF_AAction::ButtonDown)) {
       m_bNotifying = TRUE;
       pWidget->GetAppearanceAge();
       int nValueAge = pWidget->GetValueAge();
       pWidget->ClearAppModified();
 
-      ASSERT(pPageView != NULL);
+      ASSERT(pPageView);
 
       PDFSDK_FieldAction fa;
       fa.bModifier = m_pApp->FFI_IsCTRLKeyDown(nFlags);
       fa.bShift = m_pApp->FFI_IsSHIFTKeyDown(nFlags);
       pWidget->OnAAction(CPDF_AAction::ButtonDown, fa, pPageView);
       m_bNotifying = FALSE;
 
       if (!IsValidAnnot(pPageView, pAnnot))
         return TRUE;
 
@@ skipping 52 matching lines @@
 #endif  // PDF_ENABLE_XFA
   }
   return bRet;
 }
 
 void CFFL_IFormFiller::OnButtonUp(CPDFSDK_Widget* pWidget,
                                   CPDFSDK_PageView* pPageView,
                                   FX_BOOL& bReset,
                                   FX_BOOL& bExit,
                                   FX_UINT nFlag) {
-  ASSERT(pWidget != NULL);
+  ASSERT(pWidget);
 
   if (!m_bNotifying) {
     if (pWidget->GetAAction(CPDF_AAction::ButtonUp)) {
       m_bNotifying = TRUE;
       int nAge = pWidget->GetAppearanceAge();
       int nValueAge = pWidget->GetValueAge();
 
-      ASSERT(pPageView != NULL);
-      //          CReader_DocView* pDocView = pPageView->GetDocView();
-      //          ASSERT(pDocView != NULL);
+      ASSERT(pPageView);
 
       PDFSDK_FieldAction fa;
       fa.bModifier = m_pApp->FFI_IsCTRLKeyDown(nFlag);
       fa.bShift = m_pApp->FFI_IsSHIFTKeyDown(nFlag);
 
       pWidget->OnAAction(CPDF_AAction::ButtonUp, fa, pPageView);
       m_bNotifying = FALSE;
 
       if (!IsValidAnnot(pPageView, pWidget)) {
         bExit = TRUE;
         return;
       }
 
       if (nAge != pWidget->GetAppearanceAge()) {
         if (CFFL_FormFiller* pFormFiller = GetFormFiller(pWidget, FALSE)) {
           pFormFiller->ResetPDFWindow(pPageView,
                                       nValueAge == pWidget->GetValueAge());
         }
 
         bReset = TRUE;
       }
     }
   }
 }
 
 FX_BOOL CFFL_IFormFiller::OnLButtonDblClk(CPDFSDK_PageView* pPageView,
                                           CPDFSDK_Annot* pAnnot,
                                           FX_UINT nFlags,
                                           const CPDF_Point& point) {
-  ASSERT(pAnnot != NULL);
   ASSERT(pAnnot->GetPDFAnnot()->GetSubType() == "Widget");
 
   if (CFFL_FormFiller* pFormFiller = GetFormFiller(pAnnot, FALSE)) {
     return pFormFiller->OnLButtonDblClk(pPageView, pAnnot, nFlags, point);
   }
 
   return FALSE;
 }
 
 FX_BOOL CFFL_IFormFiller::OnMouseMove(CPDFSDK_PageView* pPageView,
                                       CPDFSDK_Annot* pAnnot,
                                       FX_UINT nFlags,
                                       const CPDF_Point& point) {
-  ASSERT(pAnnot != NULL);
   ASSERT(pAnnot->GetPDFAnnot()->GetSubType() == "Widget");
 
   // change cursor
   if (CFFL_FormFiller* pFormFiller = GetFormFiller(pAnnot, TRUE)) {
     return pFormFiller->OnMouseMove(pPageView, pAnnot, nFlags, point);
   }
 
   return FALSE;
 }
 
 FX_BOOL CFFL_IFormFiller::OnMouseWheel(CPDFSDK_PageView* pPageView,
                                        CPDFSDK_Annot* pAnnot,
                                        FX_UINT nFlags,
                                        short zDelta,
                                        const CPDF_Point& point) {
-  ASSERT(pAnnot != NULL);
   ASSERT(pAnnot->GetPDFAnnot()->GetSubType() == "Widget");
 
   if (CFFL_FormFiller* pFormFiller = GetFormFiller(pAnnot, FALSE)) {
     return pFormFiller->OnMouseWheel(pPageView, pAnnot, nFlags, zDelta, point);
   }
 
   return FALSE;
 }
 
 FX_BOOL CFFL_IFormFiller::OnRButtonDown(CPDFSDK_PageView* pPageView,
                                         CPDFSDK_Annot* pAnnot,
                                         FX_UINT nFlags,
                                         const CPDF_Point& point) {
-  ASSERT(pAnnot != NULL);
   ASSERT(pAnnot->GetPDFAnnot()->GetSubType() == "Widget");
 
   if (CFFL_FormFiller* pFormFiller = GetFormFiller(pAnnot, FALSE)) {
     return pFormFiller->OnRButtonDown(pPageView, pAnnot, nFlags, point);
   }
 
   return FALSE;
 }
 
 FX_BOOL CFFL_IFormFiller::OnRButtonUp(CPDFSDK_PageView* pPageView,
                                       CPDFSDK_Annot* pAnnot,
                                       FX_UINT nFlags,
                                       const CPDF_Point& point) {
-  ASSERT(pAnnot != NULL);
   ASSERT(pAnnot->GetPDFAnnot()->GetSubType() == "Widget");
 
   if (CFFL_FormFiller* pFormFiller = GetFormFiller(pAnnot, FALSE)) {
     return pFormFiller->OnRButtonUp(pPageView, pAnnot, nFlags, point);
   }
 
   return FALSE;
 }
 
 FX_BOOL CFFL_IFormFiller::OnKeyDown(CPDFSDK_Annot* pAnnot,
                                     FX_UINT nKeyCode,
                                     FX_UINT nFlags) {
-  ASSERT(pAnnot != NULL);
   ASSERT(pAnnot->GetPDFAnnot()->GetSubType() == "Widget");
 
   if (CFFL_FormFiller* pFormFiller = GetFormFiller(pAnnot, FALSE)) {
     return pFormFiller->OnKeyDown(pAnnot, nKeyCode, nFlags);
   }
 
   return FALSE;
 }
 
 FX_BOOL CFFL_IFormFiller::OnChar(CPDFSDK_Annot* pAnnot,
@@ skipping 18 matching lines @@
   if (!m_bNotifying) {
     CPDFSDK_Widget* pWidget = (CPDFSDK_Widget*)pAnnot;
     if (pWidget->GetAAction(CPDF_AAction::GetFocus)) {
       m_bNotifying = TRUE;
       pWidget->GetAppearanceAge();
 
       int nValueAge = pWidget->GetValueAge();
       pWidget->ClearAppModified();
 
       CPDFSDK_PageView* pPageView = pAnnot->GetPageView();
-      ASSERT(pPageView != NULL);
+      ASSERT(pPageView);
 
       PDFSDK_FieldAction fa;
       fa.bModifier = m_pApp->FFI_IsCTRLKeyDown(nFlag);
       fa.bShift = m_pApp->FFI_IsSHIFTKeyDown(nFlag);
 
       CFFL_FormFiller* pFormFiller = GetFormFiller(pWidget, TRUE);
       if (!pFormFiller)
         return FALSE;
       pFormFiller->GetActionData(pPageView, CPDF_AAction::GetFocus, fa);
       pWidget->OnAAction(CPDF_AAction::GetFocus, fa, pPageView);
@@ skipping 22 matching lines @@
   if (CFFL_FormFiller* pFormFiller = GetFormFiller(pAnnot, FALSE)) {
     pFormFiller->KillFocusForAnnot(pAnnot, nFlag);
 
     if (!m_bNotifying) {
       CPDFSDK_Widget* pWidget = (CPDFSDK_Widget*)pAnnot;
       if (pWidget->GetAAction(CPDF_AAction::LoseFocus)) {
         m_bNotifying = TRUE;
         pWidget->ClearAppModified();
 
         CPDFSDK_PageView* pPageView = pWidget->GetPageView();
-        ASSERT(pPageView != NULL);
+        ASSERT(pPageView);
 
         PDFSDK_FieldAction fa;
         fa.bModifier = m_pApp->FFI_IsCTRLKeyDown(nFlag);
         fa.bShift = m_pApp->FFI_IsSHIFTKeyDown(nFlag);
 
         pFormFiller->GetActionData(pPageView, CPDF_AAction::LoseFocus, fa);
 
         pWidget->OnAAction(CPDF_AAction::LoseFocus, fa, pPageView);
         m_bNotifying = FALSE;
       }
     }
   }
 
   return TRUE;
 }
 
 FX_BOOL CFFL_IFormFiller::IsVisible(CPDFSDK_Widget* pWidget) {
   return pWidget->IsVisible();
 }
 
 FX_BOOL CFFL_IFormFiller::IsReadOnly(CPDFSDK_Widget* pWidget) {
-  ASSERT(pWidget != NULL);
-
   int nFieldFlags = pWidget->GetFieldFlags();
-
   return (nFieldFlags & FIELDFLAG_READONLY) == FIELDFLAG_READONLY;
 }
 
 FX_BOOL CFFL_IFormFiller::IsFillingAllowed(CPDFSDK_Widget* pWidget) {
   if (pWidget->GetFieldType() == FIELDTYPE_PUSHBUTTON)
     return TRUE;
 
   CPDF_Page* pPage = pWidget->GetPDFPage();
   CPDF_Document* pDocument = pPage->m_pDocument;
   FX_DWORD dwPermissions = pDocument->GetUserPermissions();
@@ skipping 59 matching lines @@
 
   delete it->second;
   m_Maps.erase(it);
 }
 
 void CFFL_IFormFiller::QueryWherePopup(void* pPrivateData,
                                        FX_FLOAT fPopupMin,
                                        FX_FLOAT fPopupMax,
                                        int32_t& nRet,
                                        FX_FLOAT& fPopupRet) {
-  ASSERT(pPrivateData != NULL);
-
   CFFL_PrivateData* pData = (CFFL_PrivateData*)pPrivateData;
 
   CPDF_Rect rcPageView(0, 0, 0, 0);
   rcPageView.right = pData->pWidget->GetPDFPage()->GetPageWidth();
   rcPageView.bottom = pData->pWidget->GetPDFPage()->GetPageHeight();
   rcPageView.Normalize();
 
-  ASSERT(pData->pWidget != NULL);
   CPDF_Rect rcAnnot = pData->pWidget->GetRect();
 
   FX_FLOAT fTop = 0.0f;
   FX_FLOAT fBottom = 0.0f;
 
   CPDFSDK_Widget* pWidget = (CPDFSDK_Widget*)pData->pWidget;
   switch (pWidget->GetRotate() / 90) {
     default:
     case 0:
       fTop = rcPageView.top - rcAnnot.top;
@@ skipping 46 matching lines @@
   nRet = bBottom ? 0 : 1;
   fPopupRet = fFactHeight;
 }
 
 void CFFL_IFormFiller::OnKeyStrokeCommit(CPDFSDK_Widget* pWidget,
                                          CPDFSDK_PageView* pPageView,
                                          FX_BOOL& bRC,
                                          FX_BOOL& bExit,
                                          FX_DWORD nFlag) {
   if (!m_bNotifying) {
-    ASSERT(pWidget != NULL);
     if (pWidget->GetAAction(CPDF_AAction::KeyStroke)) {
       m_bNotifying = TRUE;
       pWidget->ClearAppModified();
 
-      ASSERT(pPageView != NULL);
+      ASSERT(pPageView);
 
       PDFSDK_FieldAction fa;
       fa.bModifier = m_pApp->FFI_IsCTRLKeyDown(nFlag);
       fa.bShift = m_pApp->FFI_IsSHIFTKeyDown(nFlag);
       fa.bWillCommit = TRUE;
       fa.bKeyDown = TRUE;
       fa.bRC = TRUE;
 
       CFFL_FormFiller* pFormFiller = GetFormFiller(pWidget, FALSE);
-      ASSERT(pFormFiller != NULL);
-
       pFormFiller->GetActionData(pPageView, CPDF_AAction::KeyStroke, fa);
       pFormFiller->SaveState(pPageView);
 
       PDFSDK_FieldAction faOld = fa;
       pWidget->OnAAction(CPDF_AAction::KeyStroke, fa, pPageView);
 
       bRC = fa.bRC;
-      //          bExit = !IsValidAnnot(m_pApp, pDocument, pDocView, pPageView,
-      //          pWidget);
-
       m_bNotifying = FALSE;
     }
   }
 }
 
 void CFFL_IFormFiller::OnValidate(CPDFSDK_Widget* pWidget,
                                   CPDFSDK_PageView* pPageView,
                                   FX_BOOL& bRC,
                                   FX_BOOL& bExit,
                                   FX_DWORD nFlag) {
   if (!m_bNotifying) {
-    ASSERT(pWidget != NULL);
     if (pWidget->GetAAction(CPDF_AAction::Validate)) {
       m_bNotifying = TRUE;
       pWidget->ClearAppModified();
 
-      ASSERT(pPageView != NULL);
-      //          CReader_DocView* pDocView = pPageView->GetDocView();
-      //          ASSERT(pDocView != NULL);
+      ASSERT(pPageView);
 
       PDFSDK_FieldAction fa;
       fa.bModifier = m_pApp->FFI_IsCTRLKeyDown(nFlag);
       fa.bShift = m_pApp->FFI_IsSHIFTKeyDown(nFlag);
       fa.bKeyDown = TRUE;
       fa.bRC = TRUE;
 
       CFFL_FormFiller* pFormFiller = GetFormFiller(pWidget, FALSE);
-      ASSERT(pFormFiller != NULL);
-
       pFormFiller->GetActionData(pPageView, CPDF_AAction::Validate, fa);
       pFormFiller->SaveState(pPageView);
 
       PDFSDK_FieldAction faOld = fa;
       pWidget->OnAAction(CPDF_AAction::Validate, fa, pPageView);
 
       bRC = fa.bRC;
-      //          bExit = !IsValidAnnot(m_pApp, pDocument, pDocView, pPageView,
-      //          pWidget);
-
       m_bNotifying = FALSE;
     }
   }
 }
 
 void CFFL_IFormFiller::OnCalculate(CPDFSDK_Widget* pWidget,
                                    CPDFSDK_PageView* pPageView,
                                    FX_BOOL& bExit,
                                    FX_DWORD nFlag) {
   if (!m_bNotifying) {
-    ASSERT(pWidget != NULL);
-    ASSERT(pPageView != NULL);
-    //      CReader_DocView* pDocView = pPageView->GetDocView();
-    //      ASSERT(pDocView != NULL);
+    ASSERT(pWidget);
     CPDFSDK_Document* pDocument = pPageView->GetSDKDocument();
-    ASSERT(pDocument != NULL);
-
     CPDFSDK_InterForm* pInterForm =
         (CPDFSDK_InterForm*)pDocument->GetInterForm();
-    ASSERT(pInterForm != NULL);
-
     pInterForm->OnCalculate(pWidget->GetFormField());
 
-    //      bExit = !IsValidAnnot(m_pApp, pDocument, pDocView, pPageView,
-    //      pWidget);
-
     m_bNotifying = FALSE;
   }
 }
 
 void CFFL_IFormFiller::OnFormat(CPDFSDK_Widget* pWidget,
                                 CPDFSDK_PageView* pPageView,
                                 FX_BOOL& bExit,
                                 FX_DWORD nFlag) {
   if (!m_bNotifying) {
-    ASSERT(pWidget != NULL);
-    ASSERT(pPageView != NULL);
-    //      CReader_DocView* pDocView = pPageView->GetDocView();
-    //      ASSERT(pDocView != NULL);
+    ASSERT(pWidget);
     CPDFSDK_Document* pDocument = pPageView->GetSDKDocument();
-    ASSERT(pDocument != NULL);
-
     CPDFSDK_InterForm* pInterForm =
         (CPDFSDK_InterForm*)pDocument->GetInterForm();
-    ASSERT(pInterForm != NULL);
 
     FX_BOOL bFormated = FALSE;
     CFX_WideString sValue =
         pInterForm->OnFormat(pWidget->GetFormField(), bFormated);
 
-    //      bExit = !IsValidAnnot(m_pApp, pDocument, pDocView, pPageView,
-    //      pWidget);
-
     if (bExit)
       return;
 
     if (bFormated) {
       pInterForm->ResetFieldAppearance(pWidget->GetFormField(), sValue.c_str(),
                                        TRUE);
       pInterForm->UpdateField(pWidget->GetFormField());
     }
 
     m_bNotifying = FALSE;
@@ skipping 194 matching lines @@
 
 void CFFL_IFormFiller::OnBeforeKeyStroke(void* pPrivateData,
                                          CFX_WideString& strChange,
                                          const CFX_WideString& strChangeEx,
                                          int nSelStart,
                                          int nSelEnd,
                                          FX_BOOL bKeyDown,
                                          FX_BOOL& bRC,
                                          FX_BOOL& bExit,
                                          FX_DWORD nFlag) {
-  ASSERT(pPrivateData != NULL);
   CFFL_PrivateData* pData = (CFFL_PrivateData*)pPrivateData;
-  ASSERT(pData->pWidget != NULL);
+  ASSERT(pData->pWidget);
 
   CFFL_FormFiller* pFormFiller = GetFormFiller(pData->pWidget, FALSE);

[Lei Zhang, 2015/12/15 02:27:18]

Conflict here

-  ASSERT(pFormFiller != NULL);
 
 #ifdef PDF_ENABLE_XFA
   if (pFormFiller->IsFieldFull(pData->pPageView)) {
     FX_BOOL bFullExit = FALSE;
     FX_BOOL bFullReset = FALSE;
     OnFull(pData->pWidget, pData->pPageView, bFullReset, bFullExit, nFlag);
 
     if (bFullReset || bFullExit) {
       bExit = TRUE;
       return;
     }
   }
 #endif  // PDF_ENABLE_XFA
 
   if (!m_bNotifying) {
     if (pData->pWidget->GetAAction(CPDF_AAction::KeyStroke)) {
       m_bNotifying = TRUE;
       int nAge = pData->pWidget->GetAppearanceAge();
       int nValueAge = pData->pWidget->GetValueAge();
 
-      ASSERT(pData->pPageView != NULL);
       CPDFSDK_Document* pDocument = pData->pPageView->GetSDKDocument();
 
       PDFSDK_FieldAction fa;
       fa.bModifier = m_pApp->FFI_IsCTRLKeyDown(nFlag);
       fa.bShift = m_pApp->FFI_IsSHIFTKeyDown(nFlag);
       fa.sChange = strChange;
       fa.sChangeEx = strChangeEx;
       fa.bKeyDown = bKeyDown;
       fa.bWillCommit = FALSE;
       fa.bRC = TRUE;
@@ skipping 36 matching lines @@
           bExit = TRUE;
           m_bNotifying = FALSE;
           return;
         }
       }
 
       m_bNotifying = FALSE;
     }
   }
 }