diff options
| author | Lei Zhang <thestig@chromium.org> | 2015-11-04 15:32:02 -0800 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2015-11-04 15:32:02 -0800 |
| commit | 8fec3e42ed57a988ad5e7faae5e6a83847a3267e (patch) | |
| tree | 3ef518c1976775211bbdd2d3feb5c77565565d44 /core | |
| parent | 67169d36072caf571e165a903570088357577918 (diff) | |
| download | pdfium-8fec3e42ed57a988ad5e7faae5e6a83847a3267e.tar.xz | |
Merge to XFA: Make checkdeps --resolve-dotdot succeed.
This is just a straight-forward, partial merge. It does not
actually make checkdeps succeed.
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1419373005 .
(cherry picked from commit 79f5a32175293620abe456554e10efb7c3f4e7c6)
Review URL: https://codereview.chromium.org/1409153007 .
Diffstat (limited to 'core')
| -rw-r--r-- | core/include/fpdfapi/fpdf_render.h | 13 | ||||
| -rw-r--r-- | core/include/fxcodec/DEPS | 3 | ||||
| -rw-r--r-- | core/src/fpdfapi/fpdf_parser/fpdf_parser_decode_embeddertest.cpp | 1 | ||||
| -rw-r--r-- | core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp | 7 |
4 files changed, 11 insertions, 13 deletions
diff --git a/core/include/fpdfapi/fpdf_render.h b/core/include/fpdfapi/fpdf_render.h index 3c1d95aa8a..bda5d6d805 100644 --- a/core/include/fpdfapi/fpdf_render.h +++ b/core/include/fpdfapi/fpdf_render.h @@ -8,7 +8,6 @@ #define CORE_INCLUDE_FPDFAPI_FPDF_RENDER_H_ #include "../../../third_party/base/nonstd_unique_ptr.h" -#include "../../../public/fpdf_progressive.h" #include "../fxge/fx_ge.h" #include "fpdf_page.h" @@ -134,12 +133,14 @@ class CPDF_RenderContext { class CPDF_ProgressiveRenderer { public: - // Must match FDF_RENDER_* definitions in fpdf_progressive.h. + // Must match FDF_RENDER_* definitions in public/fpdf_progressive.h, but + // cannot #include that header. fpdfsdk/src/fpdf_progressive.cpp has + // static_asserts to make sure the two sets of values match. enum Status { - Ready = FPDF_RENDER_READER, - ToBeContinued = FPDF_RENDER_TOBECOUNTINUED, - Done = FPDF_RENDER_DONE, - Failed = FPDF_RENDER_FAILED + Ready, // FPDF_RENDER_READER, + ToBeContinued, // FPDF_RENDER_TOBECOUNTINUED, + Done, // FPDF_RENDER_DONE, + Failed, // FPDF_RENDER_FAILED }; static int ToFPDFStatus(Status status) { return static_cast<int>(status); } diff --git a/core/include/fxcodec/DEPS b/core/include/fxcodec/DEPS new file mode 100644 index 0000000000..548eb61a3b --- /dev/null +++ b/core/include/fxcodec/DEPS @@ -0,0 +1,3 @@ +include_rules = [ + '+third_party/zlib_v128/zlib.h', +] diff --git a/core/src/fpdfapi/fpdf_parser/fpdf_parser_decode_embeddertest.cpp b/core/src/fpdfapi/fpdf_parser/fpdf_parser_decode_embeddertest.cpp index 3da522da4e..bcade63831 100644 --- a/core/src/fpdfapi/fpdf_parser/fpdf_parser_decode_embeddertest.cpp +++ b/core/src/fpdfapi/fpdf_parser/fpdf_parser_decode_embeddertest.cpp @@ -5,7 +5,6 @@ #include <cstring> #include <string> -#include "../../../../public/fpdfview.h" #include "../../../../testing/fx_string_testhelpers.h" #include "../../../include/fpdfapi/fpdf_parser.h" #include "../../../include/fxcrt/fx_basic.h" diff --git a/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp b/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp index 2aea614226..f6a2158c53 100644 --- a/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp +++ b/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp @@ -2675,18 +2675,13 @@ class CPDF_DataAvail final : public IPDF_DataAvail { CPDF_DataAvail(IFX_FileAvail* pFileAvail, IFX_FileRead* pFileRead); ~CPDF_DataAvail() override; + // IPDF_DataAvail: FX_BOOL IsDocAvail(IFX_DownloadHints* pHints) override; - void SetDocument(CPDF_Document* pDoc) override; - FX_BOOL IsPageAvail(int iPage, IFX_DownloadHints* pHints) override; - int32_t IsFormAvail(IFX_DownloadHints* pHints) override; - int32_t IsLinearizedPDF() override; - FX_BOOL IsLinearized() override { return m_bLinearized; } - void GetLinearizedMainXRefInfo(FX_FILESIZE* pPos, FX_DWORD* pSize) override; protected: |