Changes to master to more closely match XFA.

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 "../../include/formfiller/FFL_FormFiller.h"
 #include "../../include/formfiller/FFL_IFormFiller.h"
 #include "../../include/formfiller/FFL_CheckBox.h"
 #include "../../include/formfiller/FFL_ComboBox.h"
@@ skipping 491 matching lines @@
 
 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) {
-  ASSERT(pWidget != NULL);
-
   if (pWidget->GetFieldType() == FIELDTYPE_PUSHBUTTON)
     return TRUE;
-  else {
-    CPDF_Page* pPage = pWidget->GetPDFPage();
-    ASSERT(pPage != NULL);
 
-    CPDF_Document* pDocument = pPage->m_pDocument;
-    ASSERT(pDocument != NULL);
-
-    FX_DWORD dwPermissions = pDocument->GetUserPermissions();
-    return (dwPermissions & FPDFPERM_FILL_FORM) ||
-           (dwPermissions & FPDFPERM_ANNOT_FORM) ||
-           (dwPermissions & FPDFPERM_MODIFY);
-  }
-  return TRUE;

[Lei Zhang, 2015/10/13 22:04:38]

uhhh

+  CPDF_Page* pPage = pWidget->GetPDFPage();
+  CPDF_Document* pDocument = pPage->m_pDocument;
+  FX_DWORD dwPermissions = pDocument->GetUserPermissions();
+  return (dwPermissions & FPDFPERM_FILL_FORM) ||
+         (dwPermissions & FPDFPERM_ANNOT_FORM) ||
+         (dwPermissions & FPDFPERM_MODIFY);
 }
 
 CFFL_FormFiller* CFFL_IFormFiller::GetFormFiller(CPDFSDK_Annot* pAnnot,
                                                  FX_BOOL bRegister) {
   auto it = m_Maps.find(pAnnot);
   if (it != m_Maps.end())
     return it->second;
 
   if (!bRegister)
     return nullptr;
@@ skipping 256 matching lines @@
                                        TRUE);
       pInterForm->UpdateField(pWidget->GetFormField());
     }
 
     m_bNotifying = FALSE;
   }
 }
 
 FX_BOOL CFFL_IFormFiller::IsValidAnnot(CPDFSDK_PageView* pPageView,
                                        CPDFSDK_Annot* pAnnot) {
-  ASSERT(pPageView != NULL);
-  ASSERT(pAnnot != NULL);
-
   if (pPageView)
     return pPageView->IsValidAnnot(pAnnot->GetPDFAnnot());
-  else
-    return FALSE;
+
+  return FALSE;
 }
 
 void CFFL_IFormFiller::OnBeforeKeyStroke(FX_BOOL bEditOrList,
                                          void* pPrivateData,
                                          int32_t nKeyCode,
                                          CFX_WideString& strChange,
                                          const CFX_WideString& strChangeEx,
                                          int nSelStart,
                                          int nSelEnd,
                                          FX_BOOL bKeyDown,
@@ skipping 76 matching lines @@
                                         FX_BOOL& bExit,
                                         FX_DWORD nFlag) {
   CFFL_PrivateData* pData = (CFFL_PrivateData*)pPrivateData;
   ASSERT(pData->pWidget);
 
   CFFL_FormFiller* pFormFiller = GetFormFiller(pData->pWidget, FALSE);
 
   if (!bEditOrList)
     pFormFiller->OnKeyStroke(bExit, nFlag);
 }