diff options
author | Tom Sepez <tsepez@chromium.org> | 2015-07-23 16:07:32 -0700 |
---|---|---|
committer | Tom Sepez <tsepez@chromium.org> | 2015-07-23 16:07:32 -0700 |
commit | 1f3442ce5c035d22e2cc9fffc203892f2f749373 (patch) | |
tree | 7c66063cf1e29cc48c81ca84e9d766a2e23f4b95 /core/src/fpdfapi/fpdf_page/pageint.h | |
parent | 2f2ffece124e4ed4b96d2846263015d4b5ad6c00 (diff) | |
download | pdfium-1f3442ce5c035d22e2cc9fffc203892f2f749373.tar.xz |
Merge to XFA: FX_BOOL combo patch.
Original Review URL: https://codereview.chromium.org/1257503002
Original Review URL: https://codereview.chromium.org/1253603002
Manual merge for:
core/include/fxge/fx_font.h
core/src/fxcodec/codec/codec_int.h
fpdfsdk/src/javascript/PublicMethods.cpp
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1248153004 .
Diffstat (limited to 'core/src/fpdfapi/fpdf_page/pageint.h')
-rw-r--r-- | core/src/fpdfapi/fpdf_page/pageint.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/core/src/fpdfapi/fpdf_page/pageint.h b/core/src/fpdfapi/fpdf_page/pageint.h index 5d8ded062e..5f5d767afd 100644 --- a/core/src/fpdfapi/fpdf_page/pageint.h +++ b/core/src/fpdfapi/fpdf_page/pageint.h @@ -309,9 +309,15 @@ protected: class CPDF_ContentParser { public: + enum ParseStatus { + Ready, + ToBeContinued, + Done + }; + CPDF_ContentParser(); ~CPDF_ContentParser(); - typedef enum { Ready, ToBeContinued, Done } ParseStatus; + ParseStatus GetStatus() { return m_Status; @@ -320,7 +326,7 @@ public: void Start(CPDF_Form* pForm, CPDF_AllStates* pGraphicStates, CFX_AffineMatrix* pParentMatrix, CPDF_Type3Char* pType3Char, CPDF_ParseOptions* pOptions, int level); void Continue(IFX_Pause* pPause); - int EstimateProgress(); + protected: void Clear(); ParseStatus m_Status; |