Merge to XFA: FX_BOOL combo patch.

core/include/fpdfapi/fpdf_page.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_INCLUDE_FPDFAPI_FPDF_PAGE_H_
 #define CORE_INCLUDE_FPDFAPI_FPDF_PAGE_H_
 
 #include "../fxge/fx_dib.h"
 #include "fpdf_parser.h"
 #include "fpdf_resource.h"
 
 class CPDF_PageObjects;
 class CPDF_Page;
 class CPDF_Form;
 class CPDF_ParseOptions;
 class CPDF_PageObject;
 class CPDF_PageRenderCache;
 class CPDF_StreamFilter;
 class CPDF_AllStates;
 class CPDF_ContentParser;
 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();
     }
 
     FX_POSITION                 GetLastObjectPosition() const
     {
         return m_ObjectList.GetTailPosition();
     }
 
@@ skipping 14 matching lines @@
 
     FX_DWORD                    CountObjects() const
     {
         return m_ObjectList.GetCount();
     }
 
     int                                 GetObjectIndex(CPDF_PageObject* pObj) const;
 
     CPDF_PageObject*    GetObjectByIndex(int index) const;
 
-
-
-
-
     FX_POSITION                 InsertObject(FX_POSITION posInsertAfter, CPDF_PageObject* pNewObject);
 
     void                                Transform(const CFX_AffineMatrix& matrix);
 
     FX_BOOL                             BackgroundAlphaNeeded() const
     {
         return m_bBackgroundAlphaNeeded;
     }
 
     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:
     friend class                CPDF_ContentParser;
     friend class                CPDF_StreamContentParser;
     friend class                CPDF_AllStates;
 
-    CFX_PtrList                 m_ObjectList;
+    enum ParseState {
+        CONTENT_NOT_PARSED,
+        CONTENT_PARSING,
+        CONTENT_PARSED
+    };
 
-    FX_BOOL                             m_bBackgroundAlphaNeeded;
-
-    FX_BOOL                             m_bReleaseMembers;
     void                                LoadTransInfo();
     void                ClearCacheObjects();
 
+    CFX_PtrList                 m_ObjectList;
+    FX_BOOL                             m_bBackgroundAlphaNeeded;
+    FX_BOOL                             m_bReleaseMembers;
     CPDF_ContentParser* m_pParser;
+    ParseState                  m_ParseState;
+};
 
-    FX_BOOL                             m_ParseState;
-};
 class CPDF_Page : public CPDF_PageObjects, public CFX_PrivateData
 {
 public:
 
     CPDF_Page();
 
     ~CPDF_Page();
 
     void                                Load(CPDF_Document* pDocument, CPDF_Dictionary* pPageDict, FX_BOOL bPageCache = TRUE);
 
@@ skipping 88 matching lines @@
     void            ProcessImage(CFX_ByteTextBuf& buf, CPDF_ImageObject* pImageObj);
     void            ProcessForm(CFX_ByteTextBuf& buf, const uint8_t* data, FX_DWORD size, CFX_Matrix& matrix);
     CFX_ByteString  RealizeResource(CPDF_Object* pResourceObj, const FX_CHAR* szType);
 private:
     CPDF_Page*      m_pPage;
     CPDF_Document*  m_pDocument;
     CFX_PtrArray    m_pageObjects;
 };
 
 #endif  // CORE_INCLUDE_FPDFAPI_FPDF_PAGE_H_