Merge to XFA: FX_BOOL combo patch.

core/src/fpdfapi/fpdf_page/fpdf_page.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "../../../include/fpdfapi/fpdf_page.h"
 #include "../../../include/fpdfapi/fpdf_module.h"
 #include "pageint.h"
 CPDF_PageObject* CPDF_PageObject::Create(int type)
@@ skipping 702 matching lines @@
 }
 void CPDF_FormObject::CalcBoundingBox()
 {
     CFX_FloatRect form_rect = m_pForm->CalcBoundingBox();
     form_rect.Transform(&m_FormMatrix);
     m_Left = form_rect.left;
     m_Bottom = form_rect.bottom;
     m_Right = form_rect.right;
     m_Top = form_rect.top;
 }
-CPDF_PageObjects::CPDF_PageObjects(FX_BOOL bReleaseMembers) : m_ObjectList(128)
+CPDF_PageObjects::CPDF_PageObjects(FX_BOOL bReleaseMembers)
+    : m_pFormDict(nullptr),
+      m_pFormStream(nullptr),
+      m_pDocument(nullptr),
+      m_pPageResources(nullptr),
+      m_pResources(nullptr),
+      m_Transparency(0),
+      m_ObjectList(128),
+      m_bBackgroundAlphaNeeded(FALSE),
+      m_bReleaseMembers(bReleaseMembers),
+      m_pParser(nullptr),
+      m_ParseState(CONTENT_NOT_PARSED)
 {
-    m_bBackgroundAlphaNeeded = FALSE;
-    m_bReleaseMembers = bReleaseMembers;
-    m_ParseState = PDF_CONTENT_NOT_PARSED;
-    m_pParser = NULL;
-    m_pFormStream = NULL;
-    m_pResources = NULL;
 }
 CPDF_PageObjects::~CPDF_PageObjects()
 {
     delete m_pParser;
     if (!m_bReleaseMembers) {
         return;
     }
     FX_POSITION pos = m_ObjectList.GetHeadPosition();
     while (pos) {
         delete (CPDF_PageObject*)m_ObjectList.GetNext(pos);
     }
 }
 void CPDF_PageObjects::ContinueParse(IFX_Pause* pPause)
 {
     if (m_pParser == NULL) {
         return;
     }
     m_pParser->Continue(pPause);
     if (m_pParser->GetStatus() == CPDF_ContentParser::Done) {
-        m_ParseState = PDF_CONTENT_PARSED;
+        m_ParseState = CONTENT_PARSED;
         delete m_pParser;
         m_pParser = NULL;
     }
 }
-int CPDF_PageObjects::EstimateParseProgress() const
-{
-    if (!m_pParser) {
-        return m_ParseState == PDF_CONTENT_PARSED ? 100 : 0;
-    }
-    return m_pParser->EstimateProgress();
-}
 FX_POSITION CPDF_PageObjects::InsertObject(FX_POSITION posInsertAfter, CPDF_PageObject* pNewObject)
 {
     if (!posInsertAfter) {
         return m_ObjectList.AddHead(pNewObject);
     }
     return m_ObjectList.InsertAfter(posInsertAfter, pNewObject);
 }
 int CPDF_PageObjects::GetObjectIndex(CPDF_PageObject* pObj) const
 {
     int index = 0;
@@ skipping 64 matching lines @@
     m_Transparency |= PDFTRANS_GROUP;
     if (pGroup->GetInteger(FX_BSTRC("I"))) {
         m_Transparency |= PDFTRANS_ISOLATED;
     }
     if (pGroup->GetInteger(FX_BSTRC("K"))) {
         m_Transparency |= PDFTRANS_KNOCKOUT;
     }
 }
 void CPDF_PageObjects::ClearCacheObjects()
 {
-    m_ParseState = PDF_CONTENT_NOT_PARSED;
+    m_ParseState = CONTENT_NOT_PARSED;
     delete m_pParser;
     m_pParser = NULL;
     if (m_bReleaseMembers) {
         FX_POSITION pos = m_ObjectList.GetHeadPosition();
         while (pos) {
             delete (CPDF_PageObject*)m_ObjectList.GetNext(pos);
         }
     }
     m_ObjectList.RemoveAll();
 }
@@ skipping 66 matching lines @@
             break;
     }
     m_Transparency = PDFTRANS_ISOLATED;
     LoadTransInfo();
 }
 void CPDF_Page::StartParse(CPDF_ParseOptions* pOptions, FX_BOOL bReParse)
 {
     if (bReParse) {
         ClearCacheObjects();
     }
-    if (m_ParseState == PDF_CONTENT_PARSED || m_ParseState == PDF_CONTENT_PARSING) {
+    if (m_ParseState == CONTENT_PARSED || m_ParseState == CONTENT_PARSING) {
         return;
     }
     m_pParser = new CPDF_ContentParser;
     m_pParser->Start(this, pOptions);
-    m_ParseState = PDF_CONTENT_PARSING;
+    m_ParseState = CONTENT_PARSING;
 }
 void CPDF_Page::ParseContent(CPDF_ParseOptions* pOptions, FX_BOOL bReParse)
 {
     StartParse(pOptions, bReParse);
     ContinueParse(NULL);
 }
 CPDF_Page::~CPDF_Page()
 {
     if (m_pPageRender) {
         IPDF_RenderModule* pModule = CPDF_ModuleMgr::Get()->GetRenderModule();
@@ skipping 38 matching lines @@
     }
     m_Transparency = 0;
     LoadTransInfo();
 }
 CPDF_Form::~CPDF_Form()
 {
 }
 void CPDF_Form::StartParse(CPDF_AllStates* pGraphicStates, CFX_AffineMatrix* pParentMatrix,
                            CPDF_Type3Char* pType3Char, CPDF_ParseOptions* pOptions, int level)
 {
-    if (m_ParseState == PDF_CONTENT_PARSED || m_ParseState == PDF_CONTENT_PARSING) {
+    if (m_ParseState == CONTENT_PARSED || m_ParseState == CONTENT_PARSING) {
         return;
     }
     m_pParser = new CPDF_ContentParser;
     m_pParser->Start(this, pGraphicStates, pParentMatrix, pType3Char, pOptions, level);
-    m_ParseState = PDF_CONTENT_PARSING;
+    m_ParseState = CONTENT_PARSING;
 }
 void CPDF_Form::ParseContent(CPDF_AllStates* pGraphicStates, CFX_AffineMatrix* pParentMatrix,
                              CPDF_Type3Char* pType3Char, CPDF_ParseOptions* pOptions, int level)
 {
     StartParse(pGraphicStates, pParentMatrix, pType3Char, pOptions, level);
     ContinueParse(NULL);
 }
 CPDF_Form* CPDF_Form::Clone() const
 {
     CPDF_Form* pClone = new CPDF_Form(m_pDocument, m_pPageResources, m_pFormStream, m_pResources);
@@ skipping 55 matching lines @@
     matrix = m_PageMatrix;
     matrix.Concat(display_matrix);
 }
 CPDF_ParseOptions::CPDF_ParseOptions()
 {
     m_bTextOnly = FALSE;
     m_bMarkedContent = TRUE;
     m_bSeparateForm = TRUE;
     m_bDecodeInlineImage = FALSE;
 }