Merge to XFA: Cleanup CPDF_ApSettings and CJS_Parameters.

fpdfsdk/src/javascript/Document.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 "Document.h"
 
 #include "../../include/fsdk_mgr.h"  // For CPDFDoc_Environment.
 #include "../../include/javascript/IJavaScript.h"
@@ skipping 549 matching lines @@
         m_pDocument->GetPermissions(FPDFPERM_ANNOT_FORM) ||
         m_pDocument->GetPermissions(FPDFPERM_FILL_FORM)))
     return FALSE;
 
   CPDFSDK_InterForm* pInterForm =
       (CPDFSDK_InterForm*)m_pDocument->GetInterForm();
   CPDF_InterForm* pPDFForm = pInterForm->GetInterForm();
   CJS_Runtime* pRuntime = CJS_Runtime::FromContext(cc);
   CJS_Array aName(pRuntime);
 
-  // TODO(thestig) Convert CJS_Parameters to a std::vector and use .empty().
-  if (params.size() <= 0) {
+  if (params.empty()) {
     pPDFForm->ResetForm(TRUE);
     m_pDocument->SetChangeMark();
     return TRUE;
   }
 
   switch (params[0].GetType()) {
     default:
       aName.Attach(params[0].ToV8Array());
       break;
     case CJS_Value::VT_string:
@@ skipping 933 matching lines @@
 
 FX_BOOL Document::getPageNthWord(IJS_Context* cc,
                                  const CJS_Parameters& params,
                                  CJS_Value& vRet,
                                  CFX_WideString& sError) {
   ASSERT(m_pDocument != NULL);
 
   if (!m_pDocument->GetPermissions(FPDFPERM_EXTRACT_ACCESS))
     return FALSE;
 
-  int nPageNo = params.GetSize() > 0 ? params[0].ToInt() : 0;
-  int nWordNo = params.GetSize() > 1 ? params[1].ToInt() : 0;
-  bool bStrip = params.GetSize() > 2 ? params[2].ToBool() : true;
+  int nPageNo = params.size() > 0 ? params[0].ToInt() : 0;
+  int nWordNo = params.size() > 1 ? params[1].ToInt() : 0;
+  bool bStrip = params.size() > 2 ? params[2].ToBool() : true;
 
   CPDF_Document* pDocument = m_pDocument->GetDocument()->GetPDFDoc();
   if (!pDocument)
     return FALSE;
 
   CJS_Context* pContext = static_cast<CJS_Context*>(cc);
   if (nPageNo < 0 || nPageNo >= pDocument->GetPageCount()) {
     sError = JSGetStringFromID(pContext, IDS_STRING_JSVALUEERROR);
     return FALSE;
   }
@@ skipping 51 matching lines @@
 
 FX_BOOL Document::getPageNumWords(IJS_Context* cc,
                                   const CJS_Parameters& params,
                                   CJS_Value& vRet,
                                   CFX_WideString& sError) {
   ASSERT(m_pDocument != NULL);
 
   if (!m_pDocument->GetPermissions(FPDFPERM_EXTRACT_ACCESS))
     return FALSE;
 
-  int nPageNo = params.GetSize() > 0 ? params[0].ToInt() : 0;
+  int nPageNo = params.size() > 0 ? params[0].ToInt() : 0;
 
   CPDF_Document* pDocument = m_pDocument->GetDocument()->GetPDFDoc();
   ASSERT(pDocument != NULL);
 
   CJS_Context* pContext = static_cast<CJS_Context*>(cc);
   if (nPageNo < 0 || nPageNo >= pDocument->GetPageCount()) {
     sError = JSGetStringFromID(pContext, IDS_STRING_JSVALUEERROR);
     return FALSE;
   }
 
@@ skipping 216 matching lines @@
   CFX_DWordArray DelArray;
 
   for (int j = DelArray.GetSize() - 1; j >= 0; j--) {
     m_DelayData.RemoveAt(DelArray[j]);
   }
 }
 
 CJS_Document* Document::GetCJSDoc() const {
   return static_cast<CJS_Document*>(m_pJSObject);
 }