Merge to XFA: Move struct ContentParam off of CPDF_Object's enums

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 50 matching lines @@
   uint8_t m_WordBuffer[256];
   FX_DWORD m_WordSize;
   CPDF_Object* m_pLastObj;
 
  private:
   bool PositionIsInBounds() const;
 };
 
 #define PARAM_BUF_SIZE 16
 struct ContentParam {
-  int m_Type;
+  enum Type { OBJECT = 0, NUMBER, NAME };
+  Type m_Type;
   union {
     struct {
       FX_BOOL m_bInteger;
       union {
         int m_Integer;
         FX_FLOAT m_Float;
       };
     } m_Number;
     CPDF_Object* m_pObject;
     struct {
@@ skipping 151 matching lines @@
 
   CPDF_Document* const m_pDocument;
   CPDF_Dictionary* m_pPageResources;
   CPDF_Dictionary* m_pParentResources;
   CPDF_Dictionary* m_pResources;
   CPDF_PageObjectList* m_pObjectList;
   int m_Level;
   CFX_Matrix m_mtContentToUser;
   CFX_FloatRect m_BBox;
   CPDF_ParseOptions m_Options;
-  ContentParam m_ParamBuf1[PARAM_BUF_SIZE];
+  ContentParam m_ParamBuf[PARAM_BUF_SIZE];
   FX_DWORD m_ParamStartPos;
   FX_DWORD m_ParamCount;
   CPDF_StreamParser* m_pSyntax;
   std::unique_ptr<CPDF_AllStates> m_pCurStates;
   CPDF_ContentMark m_CurContentMark;
   CFX_ArrayTemplate<CPDF_TextObject*> m_ClipTextList;
   CPDF_TextObject* m_pLastTextObject;
   FX_FLOAT m_DefFontSize;
   int m_CompatCount;
   FX_PATHPOINT* m_pPathPoints;
@@ skipping 198 matching lines @@
 
  private:
   CPDF_ColorSpace* m_pBaseCS;
   CPDF_CountedColorSpace* m_pCountedBaseCS;
 };
 
 void PDF_ReplaceAbbr(CPDF_Object* pObj);
 bool IsPathOperator(const uint8_t* buf, size_t len);
 
 #endif  // CORE_SRC_FPDFAPI_FPDF_PAGE_PAGEINT_H_