summaryrefslogtreecommitdiff
path: root/fpdfsdk/include
diff options
context:
space:
mode:
authorLei Zhang <thestig@chromium.org>2015-11-10 09:38:57 -0800
committerLei Zhang <thestig@chromium.org>2015-11-10 09:38:57 -0800
commitd88a364c1c79b294b980c20ebc9356ea42635bff (patch)
treebb44b0a75a3671ba3e305e3d812dcc098144e851 /fpdfsdk/include
parentb553bcb6a8e69de61f3b4abd257ee3161aa752c6 (diff)
downloadpdfium-d88a364c1c79b294b980c20ebc9356ea42635bff.tar.xz
Merge to XFA: Remove CFX_PtrArray usage in fpdfsdk.
TBR=tsepez@chromium.org Review URL: https://codereview.chromium.org/1430213002 . (cherry picked from commit 8deeacd23872ecc132a0a678e344a018b5114a3a) Review URL: https://codereview.chromium.org/1416113010 .
Diffstat (limited to 'fpdfsdk/include')
-rw-r--r--fpdfsdk/include/fsdk_baseform.h13
-rw-r--r--fpdfsdk/include/jsapi/fxjs_v8.h8
2 files changed, 14 insertions, 7 deletions
diff --git a/fpdfsdk/include/fsdk_baseform.h b/fpdfsdk/include/fsdk_baseform.h
index dd119b56b3..788ba5fade 100644
--- a/fpdfsdk/include/fsdk_baseform.h
+++ b/fpdfsdk/include/fsdk_baseform.h
@@ -242,8 +242,10 @@ class CPDFSDK_InterForm : public CPDF_FormNotify {
CPDFSDK_Widget* GetSibling(CPDFSDK_Widget* pWidget, FX_BOOL bNext) const;
CPDFSDK_Widget* GetWidget(CPDF_FormControl* pControl) const;
- void GetWidgets(const CFX_WideString& sFieldName, CFX_PtrArray& widgets);
- void GetWidgets(CPDF_FormField* pField, CFX_PtrArray& widgets);
+ void GetWidgets(const CFX_WideString& sFieldName,
+ std::vector<CPDFSDK_Widget*>* widgets) const;
+ void GetWidgets(CPDF_FormField* pField,
+ std::vector<CPDFSDK_Widget*>* widgets) const;
void AddMap(CPDF_FormControl* pControl, CPDFSDK_Widget* pWidget);
void RemoveMap(CPDF_FormControl* pControl);
@@ -284,15 +286,16 @@ class CPDFSDK_InterForm : public CPDF_FormNotify {
FX_BOOL DoAction_ResetForm(const CPDF_Action& action);
FX_BOOL DoAction_ImportData(const CPDF_Action& action);
- void GetFieldFromObjects(const CFX_PtrArray& objects, CFX_PtrArray& fields);
+ std::vector<CPDF_FormField*> GetFieldFromObjects(
+ const std::vector<CPDF_Object*>& objects) const;
FX_BOOL IsValidField(CPDF_Dictionary* pFieldDict);
FX_BOOL SubmitFields(const CFX_WideString& csDestination,
- const CFX_PtrArray& fields,
+ const std::vector<CPDF_FormField*>& fields,
FX_BOOL bIncludeOrExclude,
FX_BOOL bUrlEncoded);
FX_BOOL SubmitForm(const CFX_WideString& sDestination, FX_BOOL bUrlEncoded);
FX_BOOL ExportFormToFDFTextBuf(CFX_ByteTextBuf& textBuf);
- FX_BOOL ExportFieldsToFDFTextBuf(const CFX_PtrArray& fields,
+ FX_BOOL ExportFieldsToFDFTextBuf(const std::vector<CPDF_FormField*>& fields,
FX_BOOL bIncludeOrExclude,
CFX_ByteTextBuf& textBuf);
CFX_WideString GetTemporaryFileName(const CFX_WideString& sFileExt);
diff --git a/fpdfsdk/include/jsapi/fxjs_v8.h b/fpdfsdk/include/jsapi/fxjs_v8.h
index 00eb704d93..70518406cb 100644
--- a/fpdfsdk/include/jsapi/fxjs_v8.h
+++ b/fpdfsdk/include/jsapi/fxjs_v8.h
@@ -16,7 +16,11 @@
#include <v8.h>
-#include "core/include/fxcrt/fx_basic.h"
+#include <vector>
+
+#include "core/include/fxcrt/fx_string.h"
+
+class CFXJS_ObjDefinition;
// FXJS_V8 places no restrictions on these two classes; it merely passes them
// on to caller-provided methods.
@@ -44,7 +48,7 @@ class FXJS_PerIsolateData {
static void SetUp(v8::Isolate* pIsolate);
static FXJS_PerIsolateData* Get(v8::Isolate* pIsolate);
- CFX_PtrArray m_ObjectDefnArray;
+ std::vector<CFXJS_ObjDefinition*> m_ObjectDefnArray;
CFXJSE_RuntimeData* m_pFXJSERuntimeData;
protected: