Merge to XFA: FX_BOOL combo patch.

core/src/fpdfapi/fpdf_page/pageint.h

 // 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
 
 #ifndef CORE_SRC_FPDFAPI_FPDF_PAGE_PAGEINT_H_
 #define CORE_SRC_FPDFAPI_FPDF_PAGE_PAGEINT_H_
 
 #include <map>
@@ skipping 291 matching lines @@
     FX_BOOL m_bReleaseLastDict;
     FX_BOOL m_bSameLastDict;
     FX_BOOL m_bColored;
     FX_FLOAT m_Type3Data[6];
     FX_BOOL m_bResourceMissing;
     CFX_PtrArray m_StateStack;
 };
 class CPDF_ContentParser
 {
 public:
+    enum ParseStatus {
+        Ready,
+        ToBeContinued,
+        Done
+    };
+
     CPDF_ContentParser();
     ~CPDF_ContentParser();
-    typedef enum { Ready, ToBeContinued, Done } ParseStatus;
+
     ParseStatus                 GetStatus()
     {
         return m_Status;
     }
     void                                Start(CPDF_Page* pPage, CPDF_ParseOptions* pOptions);
     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;
     CPDF_PageObjects*   m_pObjects;
     FX_BOOL                             m_bForm;
     CPDF_ParseOptions   m_Options;
     CPDF_Type3Char*             m_pType3Char;
     int                                 m_InternalStage;
     CPDF_StreamAcc*             m_pSingleStream;
     CPDF_StreamAcc**    m_pStreamArray;
@@ skipping 148 matching lines @@
                    FX_FLOAT& G,
                    FX_FLOAT& B) const override;
     CPDF_ColorSpace* GetBaseCS() const override;
 
 private:
     CPDF_ColorSpace* m_pBaseCS;
     CPDF_CountedColorSpace* m_pCountedBaseCS;
 };
 
 #endif  // CORE_SRC_FPDFAPI_FPDF_PAGE_PAGEINT_H_