From 8fec3e42ed57a988ad5e7faae5e6a83847a3267e Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Wed, 4 Nov 2015 15:32:02 -0800 Subject: 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 . --- fpdfsdk/DEPS | 2 +- fpdfsdk/src/fpdf_progressive.cpp | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) (limited to 'fpdfsdk') 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, -- cgit v1.2.3