diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-11-20 14:55:19 -0800 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-11-20 14:55:19 -0800 |
| commit | 87d7b4fc58b4ec5fe097de5862490c5720c3ec09 (patch) | |
| tree | d1f71eee62f3a2c602a29c3fa95dece9d668d72d /core/include | |
| parent | b8ec0a3405c6f184e4b9811870081295cae078c9 (diff) | |
| download | pdfium-87d7b4fc58b4ec5fe097de5862490c5720c3ec09.tar.xz | |
Make XFA core/ look like master (part N).
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1463173003 .
Diffstat (limited to 'core/include')
| -rw-r--r-- | core/include/fpdfapi/fpdf_parser.h | 9 | ||||
| -rw-r--r-- | core/include/fpdftext/fpdf_text.h | 4 | ||||
| -rw-r--r-- | core/include/fxge/fx_font.h | 1 |
3 files changed, 4 insertions, 10 deletions
diff --git a/core/include/fpdfapi/fpdf_parser.h b/core/include/fpdfapi/fpdf_parser.h index 3d10726a4e..efb955be21 100644 --- a/core/include/fpdfapi/fpdf_parser.h +++ b/core/include/fpdfapi/fpdf_parser.h @@ -11,7 +11,6 @@ #include "core/include/fxcrt/fx_system.h" #include "fpdf_objects.h" -#include "public/fpdf_dataavail.h" #include "third_party/base/nonstd_unique_ptr.h" class CFDF_Document; @@ -912,19 +911,19 @@ class IPDF_DataAvail { FormNotExist = 2, // PDF_FORM_NOTEXIST }; -static IPDF_DataAvail* Create(IFX_FileAvail* pFileAvail, + static IPDF_DataAvail* Create(IFX_FileAvail* pFileAvail, IFX_FileRead* pFileRead); virtual ~IPDF_DataAvail() {} IFX_FileAvail* GetFileAvail() const { return m_pFileAvail; } IFX_FileRead* GetFileRead() const { return m_pFileRead; } - virtual int IsDocAvail(IFX_DownloadHints* pHints) = 0; + virtual DocAvailStatus IsDocAvail(IFX_DownloadHints* pHints) = 0; virtual void SetDocument(CPDF_Document* pDoc) = 0; virtual int IsPageAvail(int iPage, IFX_DownloadHints* pHints) = 0; virtual FX_BOOL IsLinearized() = 0; - virtual int IsFormAvail(IFX_DownloadHints* pHints) = 0; - virtual int IsLinearizedPDF() = 0; + virtual DocFormStatus IsFormAvail(IFX_DownloadHints* pHints) = 0; + virtual DocLinearizationStatus IsLinearizedPDF() = 0; virtual void GetLinearizedMainXRefInfo(FX_FILESIZE* pPos, FX_DWORD* pSize) = 0; diff --git a/core/include/fpdftext/fpdf_text.h b/core/include/fpdftext/fpdf_text.h index 1671861fbb..360e256ce6 100644 --- a/core/include/fpdftext/fpdf_text.h +++ b/core/include/fpdftext/fpdf_text.h @@ -76,10 +76,6 @@ class CPDFText_ParseOptions { class IPDF_TextPage { public: static IPDF_TextPage* CreateTextPage(const CPDF_Page* pPage, int flags = 0); - static IPDF_TextPage* CreateTextPage(const CPDF_Page* pPage, - CPDFText_ParseOptions ParserOptions); - static IPDF_TextPage* CreateTextPage(const CPDF_PageObjects* pObjs, - int flags = 0); static IPDF_TextPage* CreateReflowTextPage(IPDF_ReflowedPage* pRefPage); virtual ~IPDF_TextPage() {} diff --git a/core/include/fxge/fx_font.h b/core/include/fxge/fx_font.h index 42b0e902c6..d2b1d5459a 100644 --- a/core/include/fxge/fx_font.h +++ b/core/include/fxge/fx_font.h @@ -373,7 +373,6 @@ class CFX_FolderFontInfo : public IFX_SystemFontInfo { public: CFX_FolderFontInfo(); ~CFX_FolderFontInfo() override; - void AddPath(const CFX_ByteStringC& path); // IFX_SytemFontInfo: |