diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-10-14 13:54:22 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-10-14 13:54:22 -0700 |
| commit | eca866c64ec0319d4723798290a3155957fa733e (patch) | |
| tree | 59c7bb72df8d4df62934ab4002108a57bf2df37e /fpdfsdk/include | |
| parent | ae2d47b22d213cb36a66326c3167cfbbae90b9d4 (diff) | |
| download | pdfium-eca866c64ec0319d4723798290a3155957fa733e.tar.xz | |
Next round of master changes to match XFA
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1401423004 .
Diffstat (limited to 'fpdfsdk/include')
| -rw-r--r-- | fpdfsdk/include/fsdk_define.h | 4 | ||||
| -rw-r--r-- | fpdfsdk/include/fsdk_mgr.h | 1 |
2 files changed, 1 insertions, 4 deletions
diff --git a/fpdfsdk/include/fsdk_define.h b/fpdfsdk/include/fsdk_define.h index d2af1e17f7..12e3f2732d 100644 --- a/fpdfsdk/include/fsdk_define.h +++ b/fpdfsdk/include/fsdk_define.h @@ -10,7 +10,6 @@ #include "../../core/include/fpdfapi/fpdf_module.h" #include "../../core/include/fpdfapi/fpdf_pageobj.h" #include "../../core/include/fpdfapi/fpdf_parser.h" -#include "../../core/include/fpdfapi/fpdf_parser.h" #include "../../core/include/fpdfapi/fpdf_render.h" #include "../../core/include/fpdfapi/fpdf_serial.h" #include "../../core/include/fpdfapi/fpdfapi.h" @@ -48,10 +47,9 @@ class CPDF_CustomAccess final : public IFX_FileRead { CPDF_CustomAccess(FPDF_FILEACCESS* pFileAccess); ~CPDF_CustomAccess() override {} + // IFX_FileRead FX_FILESIZE GetSize() override { return m_FileAccess.m_FileLen; } - void Release() override { delete this; } - FX_BOOL ReadBlock(void* buffer, FX_FILESIZE offset, size_t size) override; private: diff --git a/fpdfsdk/include/fsdk_mgr.h b/fpdfsdk/include/fsdk_mgr.h index ca9a8cc263..5ddc8e6c57 100644 --- a/fpdfsdk/include/fsdk_mgr.h +++ b/fpdfsdk/include/fsdk_mgr.h @@ -325,7 +325,6 @@ class CPDFSDK_PageView final { int GetPageIndex(); void LoadFXAnnots(); - void SetValid(FX_BOOL bValid) { m_bValid = bValid; } FX_BOOL IsValid() { return m_bValid; } void SetLock(FX_BOOL bLocked) { m_bLocked = bLocked; } |