From f1e7c461dfabbff6b65a072f24f6711b34159361 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Thu, 23 Jul 2015 13:36:00 -0700 Subject: Revert "FX_BOOL considered harmful, part 2." This reverts commit 320b2313d19869333ed453af546e61a9fc2b81c9. Reason for revert: build failure. TBR=thestig@chromium.org Review URL: https://codereview.chromium.org/1255693002 . --- core/include/fpdfapi/fpdf_page.h | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'core/include/fpdfapi/fpdf_page.h') diff --git a/core/include/fpdfapi/fpdf_page.h b/core/include/fpdfapi/fpdf_page.h index d76920ad1a..7aed626fae 100644 --- a/core/include/fpdfapi/fpdf_page.h +++ b/core/include/fpdfapi/fpdf_page.h @@ -31,7 +31,7 @@ class CPDF_PageObjects { public: - CPDF_PageObjects(bool bReleaseMembers = true); + CPDF_PageObjects(FX_BOOL bReleaseMembers = TRUE); ~CPDF_PageObjects(); @@ -45,7 +45,7 @@ public: return m_ParseState; } - bool IsParsed() const + FX_BOOL IsParsed() const { return m_ParseState == PDF_CONTENT_PARSED; } @@ -97,7 +97,7 @@ public: void Transform(const CFX_AffineMatrix& matrix); - bool BackgroundAlphaNeeded() const + FX_BOOL BackgroundAlphaNeeded() const { return m_bBackgroundAlphaNeeded; } @@ -125,15 +125,15 @@ protected: CFX_PtrList m_ObjectList; - bool m_bBackgroundAlphaNeeded; + FX_BOOL m_bBackgroundAlphaNeeded; - bool m_bReleaseMembers; + FX_BOOL m_bReleaseMembers; void LoadTransInfo(); void ClearCacheObjects(); CPDF_ContentParser* m_pParser; - bool m_ParseState; + FX_BOOL m_ParseState; }; class CPDF_Page : public CPDF_PageObjects, public CFX_PrivateData { @@ -143,11 +143,11 @@ public: ~CPDF_Page(); - void Load(CPDF_Document* pDocument, CPDF_Dictionary* pPageDict, bool bPageCache = true); + void Load(CPDF_Document* pDocument, CPDF_Dictionary* pPageDict, FX_BOOL bPageCache = TRUE); - void StartParse(CPDF_ParseOptions* pOptions = NULL, bool bReParse = false); + void StartParse(CPDF_ParseOptions* pOptions = NULL, FX_BOOL bReParse = FALSE); - void ParseContent(CPDF_ParseOptions* pOptions = NULL, bool bReParse = false); + void ParseContent(CPDF_ParseOptions* pOptions = NULL, FX_BOOL bReParse = FALSE); void GetDisplayMatrix(CFX_AffineMatrix& matrix, int xPos, int yPos, int xSize, int ySize, int iRotate) const; @@ -200,13 +200,13 @@ public: CPDF_ParseOptions(); - bool m_bTextOnly; + FX_BOOL m_bTextOnly; - bool m_bMarkedContent; + FX_BOOL m_bMarkedContent; - bool m_bSeparateForm; + FX_BOOL m_bSeparateForm; - bool m_bDecodeInlineImage; + FX_BOOL m_bDecodeInlineImage; }; class CPDF_Form : public CPDF_PageObjects { @@ -229,7 +229,7 @@ class CPDF_PageContentGenerate public: CPDF_PageContentGenerate(CPDF_Page* pPage); ~CPDF_PageContentGenerate(); - bool InsertPageObject(CPDF_PageObject* pPageObject); + FX_BOOL InsertPageObject(CPDF_PageObject* pPageObject); void GenerateContent(); void TransformContent(CFX_Matrix& matrix); protected: -- cgit v1.2.3