diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-10-14 14:17:26 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-10-14 14:17:26 -0700 |
| commit | dfbf8e7ba55695c4e6cb30eadbe9c6a2955815ba (patch) | |
| tree | 58eef2a1e6763f71926524827da0f220f761f960 /fpdfsdk/include | |
| parent | 758ae14e113c07285126274577d7a5cab559fa65 (diff) | |
| download | pdfium-dfbf8e7ba55695c4e6cb30eadbe9c6a2955815ba.tar.xz | |
Next round of XFA changes to match master.
This contains a missed merge of the Document:delay fixes.
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1398703009 .
Diffstat (limited to 'fpdfsdk/include')
| -rw-r--r-- | fpdfsdk/include/fsdk_define.h | 1 | ||||
| -rw-r--r-- | fpdfsdk/include/fsdk_mgr.h | 5 | ||||
| -rw-r--r-- | fpdfsdk/include/javascript/IJavaScript.h | 1 |
3 files changed, 3 insertions, 4 deletions
diff --git a/fpdfsdk/include/fsdk_define.h b/fpdfsdk/include/fsdk_define.h index 43283c143c..8bf64bbe8d 100644 --- a/fpdfsdk/include/fsdk_define.h +++ b/fpdfsdk/include/fsdk_define.h @@ -61,6 +61,7 @@ class CPDF_CustomAccess final : public IFX_FileRead { virtual FX_BOOL GetByte(FX_DWORD pos, uint8_t& ch); virtual FX_BOOL GetBlock(FX_DWORD pos, uint8_t* pBuf, FX_DWORD size); + private: FPDF_FILEACCESS m_FileAccess; uint8_t m_Buffer[512]; FX_DWORD m_BufferOffset; diff --git a/fpdfsdk/include/fsdk_mgr.h b/fpdfsdk/include/fsdk_mgr.h index 01579dcc7a..4c0ce1ea27 100644 --- a/fpdfsdk/include/fsdk_mgr.h +++ b/fpdfsdk/include/fsdk_mgr.h @@ -35,9 +35,9 @@ class IFX_SystemHandler; class CPDFDoc_Environment final { public: CPDFDoc_Environment(CPDFXFA_Document* pDoc, FPDF_FORMFILLINFO* pFFinfo); - virtual ~CPDFDoc_Environment(); + ~CPDFDoc_Environment(); - virtual void Release() { + void Release() { if (m_pInfo && m_pInfo->Release) m_pInfo->Release(m_pInfo); delete this; @@ -551,7 +551,6 @@ class CPDFSDK_PageView final { CPDFSDK_Annot* AddAnnot(CPDF_Annot* pPDFAnnot); CPDFSDK_Annot* AddAnnot(IXFA_Widget* pPDFAnnot); FX_BOOL DeleteAnnot(CPDFSDK_Annot* pAnnot); - int CountAnnots(); CPDFSDK_Annot* GetAnnot(int nIndex); CPDFSDK_Annot* GetAnnotByDict(CPDF_Dictionary* pDict); diff --git a/fpdfsdk/include/javascript/IJavaScript.h b/fpdfsdk/include/javascript/IJavaScript.h index c8962bd343..291b8f1d1d 100644 --- a/fpdfsdk/include/javascript/IJavaScript.h +++ b/fpdfsdk/include/javascript/IJavaScript.h @@ -144,7 +144,6 @@ class IJS_Runtime { virtual void ReleaseContext(IJS_Context* pContext) = 0; virtual IJS_Context* GetCurrentContext() = 0; virtual void SetReaderDocument(CPDFSDK_Document* pReaderDoc) = 0; - virtual CPDFSDK_Document* GetReaderDocument() = 0; virtual int Execute(IJS_Context* cc, const wchar_t* script, |