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

Original Review URL: https://codereview.chromium.org/1635173003 .
(cherry picked from commit 0ec8bb4486ab315283f36d071be2ddc1b80998c3)

TBR=thestig@chromium.org

Review URL: https://codereview.chromium.org/1636133002 .

2 files changed, 29 insertions, 28 deletions

diff --git a/core/src/fpdfapi/fpdf_page/fpdf_page_parser.cpp b/core/src/fpdfapi/fpdf_page/fpdf_page_parser.cpp
index 152fac8c37..30480ca348 100644
--- a/core/src/fpdfapi/fpdf_page/fpdf_page_parser.cpp
+++ b/core/src/fpdfapi/fpdf_page/fpdf_page_parser.cpp
@@ -188,8 +188,8 @@ int CPDF_StreamContentParser::GetNextParamPos() {
     if (m_ParamStartPos == PARAM_BUF_SIZE) {
       m_ParamStartPos = 0;
     }
-    if (m_ParamBuf1[m_ParamStartPos].m_Type == 0) {
-      if (CPDF_Object* pObject = m_ParamBuf1[m_ParamStartPos].m_pObject)
+    if (m_ParamBuf[m_ParamStartPos].m_Type == 0) {
+      if (CPDF_Object* pObject = m_ParamBuf[m_ParamStartPos].m_pObject)
         pObject->Release();
     }
     return m_ParamStartPos;
@@ -205,39 +205,39 @@ int CPDF_StreamContentParser::GetNextParamPos() {
 void CPDF_StreamContentParser::AddNameParam(const FX_CHAR* name, int len) {
   int index = GetNextParamPos();
   if (len > 32) {
-    m_ParamBuf1[index].m_Type = 0;
-    m_ParamBuf1[index].m_pObject =
+    m_ParamBuf[index].m_Type = ContentParam::OBJECT;
+    m_ParamBuf[index].m_pObject =
         new CPDF_Name(PDF_NameDecode(CFX_ByteStringC(name, len)));
   } else {
-    m_ParamBuf1[index].m_Type = CPDF_Object::NAME;
+    m_ParamBuf[index].m_Type = ContentParam::NAME;
     if (!FXSYS_memchr(name, '#', len)) {
-      FXSYS_memcpy(m_ParamBuf1[index].m_Name.m_Buffer, name, len);
-      m_ParamBuf1[index].m_Name.m_Len = len;
+      FXSYS_memcpy(m_ParamBuf[index].m_Name.m_Buffer, name, len);
+      m_ParamBuf[index].m_Name.m_Len = len;
     } else {
       CFX_ByteString str = PDF_NameDecode(CFX_ByteStringC(name, len));
-      FXSYS_memcpy(m_ParamBuf1[index].m_Name.m_Buffer, str.c_str(),
+      FXSYS_memcpy(m_ParamBuf[index].m_Name.m_Buffer, str.c_str(),
                    str.GetLength());
-      m_ParamBuf1[index].m_Name.m_Len = str.GetLength();
+      m_ParamBuf[index].m_Name.m_Len = str.GetLength();
     }
   }
 }
 
 void CPDF_StreamContentParser::AddNumberParam(const FX_CHAR* str, int len) {
   int index = GetNextParamPos();
-  m_ParamBuf1[index].m_Type = CPDF_Object::NUMBER;
-  FX_atonum(CFX_ByteStringC(str, len), m_ParamBuf1[index].m_Number.m_bInteger,
-            &m_ParamBuf1[index].m_Number.m_Integer);
+  m_ParamBuf[index].m_Type = ContentParam::NUMBER;
+  FX_atonum(CFX_ByteStringC(str, len), m_ParamBuf[index].m_Number.m_bInteger,
+            &m_ParamBuf[index].m_Number.m_Integer);
 }
 void CPDF_StreamContentParser::AddObjectParam(CPDF_Object* pObj) {
   int index = GetNextParamPos();
-  m_ParamBuf1[index].m_Type = 0;
-  m_ParamBuf1[index].m_pObject = pObj;
+  m_ParamBuf[index].m_Type = ContentParam::OBJECT;
+  m_ParamBuf[index].m_pObject = pObj;
 }
 void CPDF_StreamContentParser::ClearAllParams() {
   FX_DWORD index = m_ParamStartPos;
   for (FX_DWORD i = 0; i < m_ParamCount; i++) {
-    if (m_ParamBuf1[index].m_Type == 0) {
-      if (CPDF_Object* pObject = m_ParamBuf1[index].m_pObject)
+    if (m_ParamBuf[index].m_Type == 0) {
+      if (CPDF_Object* pObject = m_ParamBuf[index].m_pObject)
         pObject->Release();
     }
     index++;
@@ -257,24 +257,24 @@ CPDF_Object* CPDF_StreamContentParser::GetObject(FX_DWORD index) {
   if (real_index >= PARAM_BUF_SIZE) {
     real_index -= PARAM_BUF_SIZE;
   }
-  ContentParam& param = m_ParamBuf1[real_index];
-  if (param.m_Type == CPDF_Object::NUMBER) {
+  ContentParam& param = m_ParamBuf[real_index];
+  if (param.m_Type == ContentParam::NUMBER) {
     CPDF_Number* pNumber = param.m_Number.m_bInteger
                                ? new CPDF_Number(param.m_Number.m_Integer)
                                : new CPDF_Number(param.m_Number.m_Float);
 
-    param.m_Type = 0;
+    param.m_Type = ContentParam::OBJECT;
     param.m_pObject = pNumber;
     return pNumber;
   }
-  if (param.m_Type == CPDF_Object::NAME) {
+  if (param.m_Type == ContentParam::NAME) {
     CPDF_Name* pName = new CPDF_Name(
         CFX_ByteString(param.m_Name.m_Buffer, param.m_Name.m_Len));
-    param.m_Type = 0;
+    param.m_Type = ContentParam::OBJECT;
     param.m_pObject = pName;
     return pName;
   }
-  if (param.m_Type == 0) {
+  if (param.m_Type == ContentParam::OBJECT) {
     return param.m_pObject;
   }
   ASSERT(FALSE);
@@ -289,8 +289,8 @@ CFX_ByteString CPDF_StreamContentParser::GetString(FX_DWORD index) {
   if (real_index >= PARAM_BUF_SIZE) {
     real_index -= PARAM_BUF_SIZE;
   }
-  ContentParam& param = m_ParamBuf1[real_index];
-  if (param.m_Type == CPDF_Object::NAME) {
+  ContentParam& param = m_ParamBuf[real_index];
+  if (param.m_Type == ContentParam::NAME) {
     return CFX_ByteString(param.m_Name.m_Buffer, param.m_Name.m_Len);
   }
   if (param.m_Type == 0 && param.m_pObject) {
@@ -307,8 +307,8 @@ FX_FLOAT CPDF_StreamContentParser::GetNumber(FX_DWORD index) {
   if (real_index >= PARAM_BUF_SIZE) {
     real_index -= PARAM_BUF_SIZE;
   }
-  ContentParam& param = m_ParamBuf1[real_index];
-  if (param.m_Type == CPDF_Object::NUMBER) {
+  ContentParam& param = m_ParamBuf[real_index];
+  if (param.m_Type == ContentParam::NUMBER) {
     return param.m_Number.m_bInteger ? (FX_FLOAT)param.m_Number.m_Integer
                                      : param.m_Number.m_Float;
   }
diff --git a/core/src/fpdfapi/fpdf_page/pageint.h b/core/src/fpdfapi/fpdf_page/pageint.h
index 3d33387e2d..9c8946b721 100644
--- a/core/src/fpdfapi/fpdf_page/pageint.h
+++ b/core/src/fpdfapi/fpdf_page/pageint.h
@@ -68,7 +68,8 @@ class CPDF_StreamParser {
 
 #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;
@@ -240,7 +241,7 @@ class CPDF_StreamContentParser {
   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;