summaryrefslogtreecommitdiff
path: root/core/include/fpdfapi/fpdf_page.h
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2015-07-27 11:55:29 -0700
committerTom Sepez <tsepez@chromium.org>2015-07-27 11:55:29 -0700
commitff46aaf499edcf153ee2f57c7016587aa96dcfa0 (patch)
tree0a0d92713af476897899b126d180cc6294433d10 /core/include/fpdfapi/fpdf_page.h
parentaafeff816e22c1333c17d8a0eb4fe8927c28142d (diff)
downloadpdfium-ff46aaf499edcf153ee2f57c7016587aa96dcfa0.tar.xz
FX Bool considered harmful, part 3
Try to reland this patch after fixing underlying issues that caused it to be reverted. fx_system.h is the only manual edit. R=thestig@chromium.org Review URL: https://codereview.chromium.org/1258093002 .
Diffstat (limited to 'core/include/fpdfapi/fpdf_page.h')
-rw-r--r--core/include/fpdfapi/fpdf_page.h26
1 files changed, 13 insertions, 13 deletions
diff --git a/core/include/fpdfapi/fpdf_page.h b/core/include/fpdfapi/fpdf_page.h
index bd8b5c9878..2fc9de8566 100644
--- a/core/include/fpdfapi/fpdf_page.h
+++ b/core/include/fpdfapi/fpdf_page.h
@@ -28,12 +28,12 @@ class CPDF_StreamContentParser;
class CPDF_PageObjects
{
public:
- CPDF_PageObjects(FX_BOOL bReleaseMembers = TRUE);
+ CPDF_PageObjects(bool bReleaseMembers = true);
~CPDF_PageObjects();
void ContinueParse(IFX_Pause* pPause);
- FX_BOOL IsParsed() const
+ bool IsParsed() const
{
return m_ParseState == CONTENT_PARSED;
}
@@ -76,7 +76,7 @@ public:
void Transform(const CFX_AffineMatrix& matrix);
- FX_BOOL BackgroundAlphaNeeded() const
+ bool BackgroundAlphaNeeded() const
{
return m_bBackgroundAlphaNeeded;
}
@@ -106,8 +106,8 @@ protected:
void ClearCacheObjects();
CFX_PtrList m_ObjectList;
- FX_BOOL m_bBackgroundAlphaNeeded;
- FX_BOOL m_bReleaseMembers;
+ bool m_bBackgroundAlphaNeeded;
+ bool m_bReleaseMembers;
CPDF_ContentParser* m_pParser;
ParseState m_ParseState;
};
@@ -120,11 +120,11 @@ public:
~CPDF_Page();
- void Load(CPDF_Document* pDocument, CPDF_Dictionary* pPageDict, FX_BOOL bPageCache = TRUE);
+ void Load(CPDF_Document* pDocument, CPDF_Dictionary* pPageDict, bool bPageCache = true);
- void StartParse(CPDF_ParseOptions* pOptions = NULL, FX_BOOL bReParse = FALSE);
+ void StartParse(CPDF_ParseOptions* pOptions = NULL, bool bReParse = false);
- void ParseContent(CPDF_ParseOptions* pOptions = NULL, FX_BOOL bReParse = FALSE);
+ void ParseContent(CPDF_ParseOptions* pOptions = NULL, bool bReParse = false);
void GetDisplayMatrix(CFX_AffineMatrix& matrix, int xPos, int yPos,
int xSize, int ySize, int iRotate) const;
@@ -177,13 +177,13 @@ public:
CPDF_ParseOptions();
- FX_BOOL m_bTextOnly;
+ bool m_bTextOnly;
- FX_BOOL m_bMarkedContent;
+ bool m_bMarkedContent;
- FX_BOOL m_bSeparateForm;
+ bool m_bSeparateForm;
- FX_BOOL m_bDecodeInlineImage;
+ bool m_bDecodeInlineImage;
};
class CPDF_Form : public CPDF_PageObjects
{
@@ -206,7 +206,7 @@ class CPDF_PageContentGenerate
public:
CPDF_PageContentGenerate(CPDF_Page* pPage);
~CPDF_PageContentGenerate();
- FX_BOOL InsertPageObject(CPDF_PageObject* pPageObject);
+ bool InsertPageObject(CPDF_PageObject* pPageObject);
void GenerateContent();
void TransformContent(CFX_Matrix& matrix);
protected: