diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-07-24 09:16:19 -0400 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-07-24 14:35:12 +0000 |
| commit | 72cc6c69b65b20c007032148c909c75cf1ae6564 (patch) | |
| tree | 887aa7bde2885dce3bc8d205e5a609c57047f2aa | |
| parent | 6b0158fdc229e7fc45fdb61c700b709bd82b2309 (diff) | |
| download | pdfium-72cc6c69b65b20c007032148c909c75cf1ae6564.tar.xz | |
Deprecated FPDF_RENDER_READER in favour of FPDF_RENDER_READY
The use of Ready makes more sense then Reader for the constants. Rename
and deprecate the old one.
Bug: pdfium:830
Change-Id: I80b970f29a21068b41993c1880d81d406c3108e0
Reviewed-on: https://pdfium-review.googlesource.com/8790
Reviewed-by: Henrique Nakashima <hnakashima@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
| -rw-r--r-- | core/fpdfapi/render/cpdf_progressiverenderer.h | 2 | ||||
| -rw-r--r-- | fpdfsdk/fpdf_progressive.cpp | 2 | ||||
| -rw-r--r-- | public/fpdf_progressive.h | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/core/fpdfapi/render/cpdf_progressiverenderer.h b/core/fpdfapi/render/cpdf_progressiverenderer.h index 5e5b69e733..b56727836d 100644 --- a/core/fpdfapi/render/cpdf_progressiverenderer.h +++ b/core/fpdfapi/render/cpdf_progressiverenderer.h @@ -25,7 +25,7 @@ class CPDF_ProgressiveRenderer { // cannot #include that header. fpdfsdk/fpdf_progressive.cpp has // static_asserts to make sure the two sets of values match. enum Status { - Ready, // FPDF_RENDER_READER + Ready, // FPDF_RENDER_READY ToBeContinued, // FPDF_RENDER_TOBECONTINUED Done, // FPDF_RENDER_DONE Failed // FPDF_RENDER_FAILED diff --git a/fpdfsdk/fpdf_progressive.cpp b/fpdfsdk/fpdf_progressive.cpp index abddcd43ad..1b10a119dc 100644 --- a/fpdfsdk/fpdf_progressive.cpp +++ b/fpdfsdk/fpdf_progressive.cpp @@ -20,7 +20,7 @@ #include "third_party/base/ptr_util.h" // These checks are here because core/ and public/ cannot depend on each other. -static_assert(CPDF_ProgressiveRenderer::Ready == FPDF_RENDER_READER, +static_assert(CPDF_ProgressiveRenderer::Ready == FPDF_RENDER_READY, "CPDF_ProgressiveRenderer::Ready value mismatch"); static_assert(CPDF_ProgressiveRenderer::ToBeContinued == FPDF_RENDER_TOBECONTINUED, diff --git a/public/fpdf_progressive.h b/public/fpdf_progressive.h index 2cffacb8bd..24b9ddbe8a 100644 --- a/public/fpdf_progressive.h +++ b/public/fpdf_progressive.h @@ -11,7 +11,8 @@ #include "fpdfview.h" // Flags for progressive process status. -#define FPDF_RENDER_READER 0 +#define FPDF_RENDER_READY 0 +#define FPDF_RENDER_READER 0 // Deprecated #define FPDF_RENDER_TOBECONTINUED 1 #define FPDF_RENDER_TOBECOUNTINUED 1 // Deprecated. #define FPDF_RENDER_DONE 2 |