Merge to XFA: Endless tidying in pageint.h

core/src/fpdfapi/fpdf_page/fpdf_page_parser.cpp

Index: core/src/fpdfapi/fpdf_page/fpdf_page_parser.cpp
diff --git a/core/src/fpdfapi/fpdf_page/fpdf_page_parser.cpp b/core/src/fpdfapi/fpdf_page/fpdf_page_parser.cpp
index 264b6fb36f2e6fd386ab77a266b3c1139f21f03e..99d0c5adc09a713e280ae4b1dc98a2e52e46e8f4 100644
--- a/core/src/fpdfapi/fpdf_page/fpdf_page_parser.cpp
+++ b/core/src/fpdfapi/fpdf_page/fpdf_page_parser.cpp
@@ -162,7 +162,7 @@ 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];
+  ContentParam& param = m_ParamBuf1[real_index];
   if (param.m_Type == PDFOBJ_NUMBER) {
     CPDF_Number* pNumber = param.m_Number.m_bInteger
                                ? new CPDF_Number(param.m_Number.m_Integer)
@@ -193,7 +193,7 @@ 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];
+  ContentParam& param = m_ParamBuf1[real_index];
   if (param.m_Type == PDFOBJ_NAME) {
     return CFX_ByteString(param.m_Name.m_Buffer, param.m_Name.m_Len);
   }
@@ -210,7 +210,7 @@ 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];
+  ContentParam& param = m_ParamBuf1[real_index];
   if (param.m_Type == PDFOBJ_NUMBER) {
     return param.m_Number.m_bInteger ? (FX_FLOAT)param.m_Number.m_Integer
                                      : param.m_Number.m_Float;