Merge to XFA: Endless tidying in pageint.h

core/src/fpdfapi/fpdf_page/fpdf_page_parser.cpp

 // 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
 
 #include "pageint.h"
 
 #include "core/include/fpdfapi/fpdf_module.h"
 #include "core/include/fpdfapi/fpdf_page.h"
@@ skipping 144 matching lines @@
   m_ParamCount = 0;
 }
 CPDF_Object* CPDF_StreamContentParser::GetObject(FX_DWORD index) {
   if (index >= m_ParamCount) {
     return NULL;
   }
   int real_index = m_ParamStartPos + m_ParamCount - index - 1;
   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)
                                : new CPDF_Number(param.m_Number.m_Float);
 
     param.m_Type = 0;
     param.m_pObject = pNumber;
     return pNumber;
   }
   if (param.m_Type == PDFOBJ_NAME) {
@@ skipping 10 matching lines @@
   return NULL;
 }
 CFX_ByteString CPDF_StreamContentParser::GetString(FX_DWORD index) {
   if (index >= m_ParamCount) {
     return CFX_ByteString();
   }
   int real_index = m_ParamStartPos + m_ParamCount - index - 1;
   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);
   }
   if (param.m_Type == 0 && param.m_pObject) {
     return param.m_pObject->GetString();
   }
   return CFX_ByteString();
 }
 FX_FLOAT CPDF_StreamContentParser::GetNumber(FX_DWORD index) {
   if (index >= m_ParamCount) {
     return 0;
   }
   int real_index = m_ParamStartPos + m_ParamCount - index - 1;
   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;
   }
   if (param.m_Type == 0 && param.m_pObject) {
     return param.m_pObject->GetNumber();
   }
   return 0;
 }
 FX_FLOAT CPDF_StreamContentParser::GetNumber16(FX_DWORD index) {
@@ skipping 1296 matching lines @@
     m_pObjectList->m_ObjectList.AddTail(pPathObj);
   }
   if (PathClipType) {
     if (!matrix.IsIdentity()) {
       Path.Transform(&matrix);
       matrix.SetIdentity();
     }
     m_pCurStates->m_ClipPath.AppendPath(Path, PathClipType, TRUE);
   }
 }