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 /fpdfsdk | |
| 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 'fpdfsdk')
| -rw-r--r-- | fpdfsdk/DEPS | 2 | ||||
| -rw-r--r-- | fpdfsdk/src/fpdf_progressive.cpp | 11 |
2 files changed, 12 insertions, 1 deletions
diff --git a/fpdfsdk/DEPS b/fpdfsdk/DEPS index 44beeca888..488a3963c1 100644 --- a/fpdfsdk/DEPS +++ b/fpdfsdk/DEPS @@ -1,6 +1,6 @@ include_rules = [ '+core/include', - '+javascript', + '+javascript/IJavaScript.h', '+public', '+v8', '+xfa/include', diff --git a/fpdfsdk/src/fpdf_progressive.cpp b/fpdfsdk/src/fpdf_progressive.cpp index b7bed3902c..b125b1cffe 100644 --- a/fpdfsdk/src/fpdf_progressive.cpp +++ b/fpdfsdk/src/fpdf_progressive.cpp @@ -9,6 +9,17 @@ #include "../include/fsdk_define.h" #include "../include/fsdk_rendercontext.h" +// These checks are here because core/ and public/ cannot depend on each other. +static_assert(CPDF_ProgressiveRenderer::Ready == FPDF_RENDER_READER, + "CPDF_ProgressiveRenderer::Ready value mismatch"); +static_assert(CPDF_ProgressiveRenderer::ToBeContinued == + FPDF_RENDER_TOBECOUNTINUED, + "CPDF_ProgressiveRenderer::ToBeContinued value mismatch"); +static_assert(CPDF_ProgressiveRenderer::Done == FPDF_RENDER_DONE, + "CPDF_ProgressiveRenderer::Done value mismatch"); +static_assert(CPDF_ProgressiveRenderer::Failed == FPDF_RENDER_FAILED, + "CPDF_ProgressiveRenderer::Failed value mismatch"); + DLLEXPORT int STDCALL FPDF_RenderPageBitmap_Start(FPDF_BITMAP bitmap, FPDF_PAGE page, int start_x, |