Rename CPDF_ProgressiveRenderer::Status enum values.
Change the values from "Foo" to "kFoo", to match the style guide. Also
initialize some members in the header.
Change-Id: Id95c8f4a0d4599a338fb5d7849d66bc73287eeeb
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/65272
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
diff --git a/core/fpdfapi/render/cpdf_progressiverenderer.cpp b/core/fpdfapi/render/cpdf_progressiverenderer.cpp
index ccecc7b..6e5fc36 100644
--- a/core/fpdfapi/render/cpdf_progressiverenderer.cpp
+++ b/core/fpdfapi/render/cpdf_progressiverenderer.cpp
@@ -21,12 +21,7 @@
CPDF_RenderContext* pContext,
CFX_RenderDevice* pDevice,
const CPDF_RenderOptions* pOptions)
- : m_Status(Ready),
- m_pContext(pContext),
- m_pDevice(pDevice),
- m_pOptions(pOptions),
- m_LayerIndex(0),
- m_pCurrentLayer(nullptr) {}
+ : m_pContext(pContext), m_pDevice(pDevice), m_pOptions(pOptions) {}
CPDF_ProgressiveRenderer::~CPDF_ProgressiveRenderer() {
if (m_pRenderStatus) {
@@ -36,19 +31,19 @@
}
void CPDF_ProgressiveRenderer::Start(PauseIndicatorIface* pPause) {
- if (!m_pContext || !m_pDevice || m_Status != Ready) {
- m_Status = Failed;
+ if (!m_pContext || !m_pDevice || m_Status != kReady) {
+ m_Status = kFailed;
return;
}
- m_Status = ToBeContinued;
+ m_Status = kToBeContinued;
Continue(pPause);
}
void CPDF_ProgressiveRenderer::Continue(PauseIndicatorIface* pPause) {
- while (m_Status == ToBeContinued) {
+ while (m_Status == kToBeContinued) {
if (!m_pCurrentLayer) {
if (m_LayerIndex >= m_pContext->CountLayers()) {
- m_Status = Done;
+ m_Status = kDone;
return;
}
m_pCurrentLayer = m_pContext->GetLayer(m_LayerIndex);
diff --git a/core/fpdfapi/render/cpdf_progressiverenderer.h b/core/fpdfapi/render/cpdf_progressiverenderer.h
index d9d2e27..4a554c0 100644
--- a/core/fpdfapi/render/cpdf_progressiverenderer.h
+++ b/core/fpdfapi/render/cpdf_progressiverenderer.h
@@ -25,10 +25,10 @@
// 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_READY
- ToBeContinued, // FPDF_RENDER_TOBECONTINUED
- Done, // FPDF_RENDER_DONE
- Failed // FPDF_RENDER_FAILED
+ kReady, // FPDF_RENDER_READY
+ kToBeContinued, // FPDF_RENDER_TOBECONTINUED
+ kDone, // FPDF_RENDER_DONE
+ kFailed // FPDF_RENDER_FAILED
};
static int ToFPDFStatus(Status status) { return static_cast<int>(status); }
@@ -46,14 +46,14 @@
// Maximum page objects to render before checking for pause.
static const int kStepLimit = 100;
- Status m_Status;
+ Status m_Status = kReady;
UnownedPtr<CPDF_RenderContext> const m_pContext;
UnownedPtr<CFX_RenderDevice> const m_pDevice;
const CPDF_RenderOptions* const m_pOptions;
std::unique_ptr<CPDF_RenderStatus> m_pRenderStatus;
CFX_FloatRect m_ClipRect;
- uint32_t m_LayerIndex;
- CPDF_RenderContext::Layer* m_pCurrentLayer;
+ uint32_t m_LayerIndex = 0;
+ CPDF_RenderContext::Layer* m_pCurrentLayer = nullptr;
CPDF_PageObjectHolder::const_iterator m_LastObjectRendered;
};
diff --git a/fpdfsdk/fpdf_progressive.cpp b/fpdfsdk/fpdf_progressive.cpp
index ac83405..6ce6dc1 100644
--- a/fpdfsdk/fpdf_progressive.cpp
+++ b/fpdfsdk/fpdf_progressive.cpp
@@ -19,15 +19,15 @@
#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_READY,
- "CPDF_ProgressiveRenderer::Ready value mismatch");
-static_assert(CPDF_ProgressiveRenderer::ToBeContinued ==
+static_assert(CPDF_ProgressiveRenderer::kReady == FPDF_RENDER_READY,
+ "CPDF_ProgressiveRenderer::kReady value mismatch");
+static_assert(CPDF_ProgressiveRenderer::kToBeContinued ==
FPDF_RENDER_TOBECONTINUED,
- "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");
+ "CPDF_ProgressiveRenderer::kToBeContinued value mismatch");
+static_assert(CPDF_ProgressiveRenderer::kDone == FPDF_RENDER_DONE,
+ "CPDF_ProgressiveRenderer::kDone value mismatch");
+static_assert(CPDF_ProgressiveRenderer::kFailed == FPDF_RENDER_FAILED,
+ "CPDF_ProgressiveRenderer::kFailed value mismatch");
FPDF_EXPORT int FPDF_CALLCONV FPDF_RenderPageBitmap_Start(FPDF_BITMAP bitmap,
FPDF_PAGE page,
