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/include/fpdfapi | |
| 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/include/fpdfapi')
| -rw-r--r-- | core/include/fpdfapi/fpdf_page.h | 47 |
1 files changed, 12 insertions, 35 deletions
diff --git a/core/include/fpdfapi/fpdf_page.h b/core/include/fpdfapi/fpdf_page.h index 7aed626fae..bd8b5c9878 100644 --- a/core/include/fpdfapi/fpdf_page.h +++ b/core/include/fpdfapi/fpdf_page.h @@ -24,37 +24,20 @@ class CPDF_StreamContentParser; #define PDFTRANS_GROUP 0x0100 #define PDFTRANS_ISOLATED 0x0200 #define PDFTRANS_KNOCKOUT 0x0400 -#define PDF_CONTENT_NOT_PARSED 0 -#define PDF_CONTENT_PARSING 1 -#define PDF_CONTENT_PARSED 2 + class CPDF_PageObjects { public: - CPDF_PageObjects(FX_BOOL bReleaseMembers = TRUE); - ~CPDF_PageObjects(); - - - void ContinueParse(IFX_Pause* pPause); - int GetParseState() const - { - return m_ParseState; - } - FX_BOOL IsParsed() const { - return m_ParseState == PDF_CONTENT_PARSED; + return m_ParseState == CONTENT_PARSED; } - int EstimateParseProgress() const; - - - - FX_POSITION GetFirstObjectPosition() const { return m_ObjectList.GetHeadPosition(); @@ -89,10 +72,6 @@ public: CPDF_PageObject* GetObjectByIndex(int index) const; - - - - FX_POSITION InsertObject(FX_POSITION posInsertAfter, CPDF_PageObject* pNewObject); void Transform(const CFX_AffineMatrix& matrix); @@ -105,17 +84,11 @@ public: CFX_FloatRect CalcBoundingBox() const; CPDF_Dictionary* m_pFormDict; - CPDF_Stream* m_pFormStream; - CPDF_Document* m_pDocument; - CPDF_Dictionary* m_pPageResources; - CPDF_Dictionary* m_pResources; - CFX_FloatRect m_BBox; - int m_Transparency; protected: @@ -123,18 +96,22 @@ protected: friend class CPDF_StreamContentParser; friend class CPDF_AllStates; - CFX_PtrList m_ObjectList; - - FX_BOOL m_bBackgroundAlphaNeeded; + enum ParseState { + CONTENT_NOT_PARSED, + CONTENT_PARSING, + CONTENT_PARSED + }; - FX_BOOL m_bReleaseMembers; void LoadTransInfo(); void ClearCacheObjects(); + CFX_PtrList m_ObjectList; + FX_BOOL m_bBackgroundAlphaNeeded; + FX_BOOL m_bReleaseMembers; CPDF_ContentParser* m_pParser; - - FX_BOOL m_ParseState; + ParseState m_ParseState; }; + class CPDF_Page : public CPDF_PageObjects, public CFX_PrivateData { public: |